From d23281344f8b003c7281006a9ba0737aeec5fc28 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Tue, 15 Apr 2014 00:54:01 +0000
Subject: [PATCH] Fixed default select box values (Extensions)

---
 app/extensions/app_languages.php  | 17 +++++++++++------
 app/extensions/extension_edit.php | 20 +++++++-------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index a852533a4e..1af085e944 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -322,6 +322,11 @@
 	$text['description-user_record']['pt-pt'] = "Selecione inbound, outbound ou para gravar todas as chamadas.";
 	$text['description-user_record']['fr-fr'] = "Sélectionnez entrants, sortants ou à enregistrer tous les appels.";
 
+	$text['label-user_record_none']['en-us'] = "Disabled";
+	$text['label-user_record_none']['es-cl'] = "Ninguno";
+	$text['label-user_record_none']['pt-pt'] = "Nenhum";
+	$text['label-user_record_none']['fr-fr'] = "Aucun";
+
 	$text['label-user_record_all']['en-us'] = "All";
 	$text['label-user_record_all']['es-cl'] = "Todo";
 	$text['label-user_record_all']['pt-pt'] = "Tudo";
@@ -502,14 +507,14 @@
 	$text['description-description']['pt-pt'] = "Descrição";
 	$text['description-description']['fr-fr'] = "";
 
-	$text['label-true']['en-us'] = "true";
-	$text['label-true']['es-cl'] = "verdadero";
-	$text['label-true']['pt-pt'] = "sim";
+	$text['label-true']['en-us'] = "True";
+	$text['label-true']['es-cl'] = "Verdadero";
+	$text['label-true']['pt-pt'] = "Sim";
 	$text['label-true']['fr-fr'] = "Oui";
 
-	$text['label-false']['en-us'] = "false";
-	$text['label-false']['es-cl'] = "falso";
-	$text['label-false']['pt-pt'] = "não";
+	$text['label-false']['en-us'] = "False";
+	$text['label-false']['es-cl'] = "Falso";
+	$text['label-false']['pt-pt'] = "Não";
 	$text['label-false']['fr-fr'] = "Non";
 
 	$text['button-add']['en-us'] = "Add";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 6c19d88023..676817e23d 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -980,7 +980,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
 		if (count($result) > 0) {
 			echo "	<select name='outbound_caller_id_name' id='outbound_caller_id_name' class='formfld'>\n";
-			echo "	<option></option>\n";
+			echo "	<option value=''></option>\n";
 			foreach ($result as &$row) {
 				if ($outbound_caller_id_name == $row["destination_caller_id_name"]) {
 					echo "		<option value='".$row["destination_caller_id_name"]."' selected='selected'>".$row["destination_caller_id_name"]."</option>\n";
@@ -1021,7 +1021,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
 		if (count($result) > 0) {
 			echo "	<select name='outbound_caller_id_number' id='outbound_caller_id_number' class='formfld'>\n";
-			echo "	<option></option>\n";
+			echo "	<option value=''></option>\n";
 			foreach ($result as &$row) {
 				if ($outbound_caller_id_number == $row["destination_caller_id_number"]) {
 					echo "		<option value='".$row["destination_caller_id_number"]."' selected='selected'>".$row["destination_caller_id_number"]."</option>\n";
@@ -1075,8 +1075,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='directory_visible'>\n";
-	echo "    <option value=''></option>\n";
-	if ($directory_visible == "true" || $directory_visible == "") {
+	if ($directory_visible == "true") {
 		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
 	else {
@@ -1101,8 +1100,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='directory_exten_visible'>\n";
-	echo "    <option value=''></option>\n";
-	if ($directory_exten_visible == "true" || $directory_exten_visible == "") {
+	if ($directory_exten_visible == "true") {
 		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
 	else {
@@ -1350,8 +1348,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='vm_enabled'>\n";
-		echo "    <option value=''></option>\n";
-		if ($vm_enabled == "true" || $vm_enabled == "") {
+		if ($vm_enabled == "true") {
 			echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
@@ -1386,7 +1383,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='vm_attach_file'>\n";
-		echo "    <option value=''></option>\n";
 		if ($vm_attach_file == "true") {
 			echo "    <option value='true' selected >".$text['label-true']."</option>\n";
 		}
@@ -1411,7 +1407,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='vm_keep_local_after_email'>\n";
-		echo "    <option value=''></option>\n";
 		if ($vm_keep_local_after_email == "true") {
 			echo "    <option value='true' selected >".$text['label-true']."</option>\n";
 		}
@@ -1472,7 +1467,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='user_record'>\n";
-	echo "    <option value=''></option>\n";
+	echo "    <option value=''>".$text['label-user_record_none']."</option>\n";
 	if ($user_record == "all") {
 		echo "    <option value='all' selected='selected'>".$text['label-user_record_all']."</option>\n";
 	}
@@ -1683,8 +1678,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "    <select class='formfld' name='enabled'>\n";
-		echo "    <option value=''></option>\n";
-		if ($enabled == "true" || strlen($enabled) == 0) {
+		if ($enabled == "true") {
 			echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {