nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fax Server: Restored page count detection.

Browse Source
This commit is contained in:
Nate Jones
2014-09-09 04:10:34 +00:00
parent 25e31bc95c
commit d82374638e
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/fax/app_languages.php
View File

@@ -85,6 +85,11 @@
$text['description-fax_files']['pt-pt'] = "Selecione o ficheiro a carregar para enviar por fax.";
$text['description-fax_files']['fr-fr'] = "Choisir un fichier à télécharger pour être émis en tant que Fax.";
$text['label-selected']['en-us'] = "Selected";
$text['label-selected']['es-cl'] = "Seleccionado";
$text['label-selected']['pt-pt'] = "Selecionado";
$text['label-selected']['fr-fr'] = "Sélectionné";
$text['button-edit']['en-us'] = "Edit";
$text['button-edit']['es-cl'] = "Editar";
$text['button-edit']['pt-pt'] = "Editar";

15
app/fax/fax_send.php
View File

@@ -212,6 +212,7 @@ else {
}
// process uploaded files, if any
$fax_page_count = 0;
foreach ($_FILES['fax_files']['tmp_name'] as $index => $fax_tmp_name) {
if (
is_uploaded_file($fax_tmp_name)
@@ -283,6 +284,11 @@ else {
@unlink($dir_fax_temp.'/'.$fax_name.'.pdf');
}
$tif_page_count = exec("tiffinfo ".$dir_fax_temp.'/'.$fax_name.".tif | grep \"Page Number\" | grep -c \"P\"");
if ($tif_page_count != '') {
$fax_page_count += $tif_page_count;
}
//add file to array
$tif_files[] = $dir_fax_temp.'/'.$fax_name.'.tif';
} //if
@@ -381,7 +387,7 @@ else {
if ($fax_sender != '' || $fax_caller_id_number != '') {
$pdf -> Text($x + 0.5, $y + 2.3, strtoupper($text['label-fax-sender']).":");
}
if ($page_count > 0) {
if ($fax_page_count > 0) {
$pdf -> Text($x + 0.5, $y + 2.6, strtoupper($text['label-fax-attached']).":");
}
if ($fax_subject != '') {
@@ -414,8 +420,8 @@ else {
$pdf -> Write(0.3, format_phone($fax_caller_id_number));
}
}
if ($page_count > 0) {
$pdf -> Text($x + 2.0, $y + 2.6, $page_count.' '.$text['label-fax-page'.(($page_count > 1) ? 's' : null)]);
if ($fax_page_count > 0) {
$pdf -> Text($x + 2.0, $y + 2.6, $fax_page_count.' '.$text['label-fax-page'.(($fax_page_count > 1) ? 's' : null)]);
}
if ($fax_subject != '') {
$pdf -> Text($x + 2.0, $y + 2.9, $fax_subject);
@@ -740,8 +746,9 @@ else {
echo " var file_name = inp.files.item(i).name;";
echo " files_selected.push(file_name);";
echo " }";
echo " document.getElementById('file_list_'+file_input_number).innerHTML = '';";
echo " if (files_selected.length > 1) {";
echo " document.getElementById('file_list_'+file_input_number).innerHTML = '<strong>Selected</strong>: ';";
echo " document.getElementById('file_list_'+file_input_number).innerHTML = '<strong>".$text['label-selected']."</strong>: ';";
echo " document.getElementById('file_list_'+file_input_number).innerHTML += files_selected.join(', ');";
echo " document.getElementById('file_list_'+file_input_number).innerHTML += '<br />';";
echo " }";