From d82374638e55db834fdefbe4c872a518c25ba0d1 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Tue, 9 Sep 2014 04:10:34 +0000
Subject: [PATCH] Fax Server: Restored page count detection.

---
 app/fax/app_languages.php |  5 +++++
 app/fax/fax_send.php      | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index c84e23f4d1..eb82b55e7d 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -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";
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 233e5b6780..76916a99e3 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -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 "		}";