From 949ffdfb51d26451b1084c804812ab150685f23a Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Mon, 13 Oct 2014 20:56:36 +0000
Subject: [PATCH] Fax Server: Added clear (reset) buttons to file input fields.

---
 app/fax/app_languages.php |  8 ++++----
 app/fax/fax_send.php      | 38 ++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 7128b9ce80..736f4b6b21 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -135,10 +135,10 @@
 	$text['button-save']['pt-pt'] = "Guardar";
 	$text['button-save']['fr-fr'] = "Sauvegarder";
 
-	$text['button-file_additional']['en-us'] = "Add Additional File";
-	$text['button-file_additional']['es-cl'] = "Añadir Archivo Adicional";
-	$text['button-file_additional']['pt-pt'] = "Adicionar Arquivo Adicionais";
-	$text['button-file_additional']['fr-fr'] = "Ajouter un Fichier Supplémentaire";
+	$text['button-clear']['en-us'] = "Clear";
+	$text['button-clear']['es-cl'] = "Limpiar";
+	$text['button-clear']['pt-pt'] = "Apagar";
+	$text['button-clear']['fr-fr'] = "Nettoyer";
 
 	//fax_copy
 	$text['confirm-copy']['en-us'] = "Copy Complete";
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 76916a99e3..123a8a322a 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -594,7 +594,9 @@ else {
 	require_once "resources/header.php";
 
 //javascript to toggle input/select boxes
-	echo "<script type='text/javascript'>";
+	echo "<script language='JavaScript' type='text/javascript' src='".PROJECT_PATH."/resources/javascript/reset_file_input.js'></script>\n";
+	echo "<script language='JavaScript' type='text/javascript'>";
+
 	echo "	function toggle(field) {";
 	echo "		if (field == 'fax_recipient') {";
 	echo "			document.getElementById('fax_recipient_select').selectedIndex = 0;";
@@ -614,6 +616,22 @@ else {
 	echo "		$('#fax_recipient').css({width: '50%'});";
 	echo "		$('#fax_number').css({width: '120px'});";
 	echo "	}";
+
+	echo "	function list_selected_files(file_input_number) {";
+	echo "		var inp = document.getElementById('fax_files_'+file_input_number);";
+	echo "		var files_selected = [];";
+	echo "		for (var i = 0; i < inp.files.length; ++i) {";
+  	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>".$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 "		}";
+	echo "	}";
+
 	echo "</script>";
 
 //fax extension form
@@ -738,25 +756,9 @@ else {
 	echo "	".$text['label-fax_files']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<script>";
-	echo "	function list_selected_files(file_input_number) {";
-	echo "		var inp = document.getElementById('fax_files_'+file_input_number);";
-	echo "		var files_selected = [];";
-	echo "		for (var i = 0; i < inp.files.length; ++i) {";
-  	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>".$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 "		}";
-	echo "	}";
-	echo "	</script>";
 	for ($f = 1; $f <= 3; $f++) {
 		echo "	<span id='fax_file_".$f."' ".(($f > 1) ? "style='display: none;'" : null).">";
-		echo "	<input name='fax_files[]' id='fax_files_".$f."' type='file' class='formfld fileinput' ".(($f > 1) ? "style='margin-top: 3px;'" : null)." onchange=\"".(($f < 3) ? "document.getElementById('fax_file_".($f+1)."').style.display='';" : null)." list_selected_files(".$f.");\" multiple='multiple'><br />";
+		echo "	<input name='fax_files[]' id='fax_files_".$f."' type='file' class='formfld fileinput' style='margin-right: 3px; ".(($f > 1) ? "margin-top: 3px;" : null)."' onchange=\"".(($f < 3) ? "document.getElementById('fax_file_".($f+1)."').style.display='';" : null)." list_selected_files(".$f.");\" multiple='multiple'><input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('fax_files_".$f."'); document.getElementById('file_list_".$f."').innerHTML='';\"><br />";
 		echo "	<span id='file_list_".$f."'></span>";
 		echo "	</span>\n";
 	}