From 034e2971c5e0ea5679ac8160d1ea0bee806adca9 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Fri, 21 Feb 2014 03:56:30 +0000
Subject: [PATCH] Response message updates, language fixes.

---
 app/conference_centers/app_languages.php      | 22 +++++---
 .../conference_center_delete.php              | 18 ++++---
 .../conference_center_edit.php                | 28 ++++-------
 .../conference_room_delete.php                | 18 ++++---
 .../conference_room_edit.php                  | 50 +++++++++----------
 app/conference_centers/conference_rooms.php   |  8 +--
 6 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 9f80ad400d..10213b688d 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 
 	//conference centers
 		$text['title-conference-centers']['en-us'] = "Conference Centers";
@@ -173,16 +173,26 @@
 		$text['button-back']['pt-pt'] = "Voltar";
 		$text['button-back']['fr-fr'] = "Retour";
 
-		$text['confirm-update']['en-us'] = "Update Complete";
-		$text['confirm-update']['es-cl'] = "Actualización Completa";
-		$text['confirm-update']['pt-pt'] = "Actualização Efectuada";
-		$text['confirm-update']['fr-fr'] = "Mis à jour";
-
 		$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
 		$text['confirm-delete']['es-cl'] = "&iquest;Realmente desea eliminar esto?";
 		$text['confirm-delete']['pt-pt'] = "Deseja realmente remover isto?";
 		$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
+		$text['message-add']['en-us'] = "Add Completed";
+		$text['message-add']['es-cl'] = "Agregar Completado";
+		$text['message-add']['pt-pt'] = "Adição Efectuada";
+		$text['message-add']['fr-fr'] = "Ajouté";
+
+		$text['message-update']['en-us'] = "Update Completed";
+		$text['message-update']['es-cl'] = "Actualización Completada";
+		$text['message-update']['pt-pt'] = "Actualização Efectuada";
+		$text['message-update']['fr-fr'] = "Mis à jour";
+
+		$text['message-delete']['en-us'] = "Delete Completed";
+		$text['message-delete']['es-cl'] = "Eliminación Completada";
+		$text['message-delete']['pt-pt'] = "Remoção Efectuada";
+		$text['message-delete']['fr-fr'] = "Supprimé";
+
 		$text['label-conference-name']['en-us'] = "Conference Name";
 		$text['label-conference-name']['es-cl'] = "Nombre de la conferencia";
 		$text['label-conference-name']['pt-pt'] = "Nome da Conferência";
diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php
index 73d489f141..41c7faf005 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -34,6 +34,12 @@ else {
 	exit;
 }
 
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	}
+
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
 }
@@ -86,13 +92,9 @@ if (strlen($id)>0) {
 		$_SESSION["reload_xml"] = true;
 }
 
-//redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
-	echo "<div align='center'>\n";
-	echo "Delete Complete\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
-	return;
+
+$_SESSION["message"] = $text['message-delete'];
+header("Location: conference_centers.php");
+return;
 
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 2b76b3df9e..f2261561af 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -201,14 +201,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//save the xml
 					save_dialplan_xml();
 
-				//redirect the browser
-					require_once "resources/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
-					echo "<div align='center'>\n";
-					echo "Add Complete\n";
-					echo "</div>\n";
-					require_once "resources/footer.php";
-					return;
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: conference_centers.php");
+				return;
 			} //if ($action == "add")
 
 			if ($action == "update") {
@@ -271,16 +266,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//save the xml
 					save_dialplan_xml();
 
-				//redirect the browser
-					require_once "resources/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_centers.php\">\n";
-					echo "<div align='center'>\n";
-					echo "Update Complete\n";
-					echo "</div>\n";
-					require_once "resources/footer.php";
-					return;
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: conference_centers.php");
+				return;
 			} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true") 
+		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
@@ -378,13 +368,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='conference_center_enabled'>\n";
 	echo "	<option value=''></option>\n";
-	if ($conference_center_enabled == "true") { 
+	if ($conference_center_enabled == "true") {
 		echo "	<option value='true' selected='selected'>true</option>\n";
 	}
 	else {
 		echo "	<option value='true'>true</option>\n";
 	}
-	if ($conference_center_enabled == "false") { 
+	if ($conference_center_enabled == "false") {
 		echo "	<option value='false' selected='selected'>false</option>\n";
 	}
 	else {
diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php
index 6078bcb174..c48dc372e5 100644
--- a/app/conference_centers/conference_room_delete.php
+++ b/app/conference_centers/conference_room_delete.php
@@ -34,6 +34,12 @@ else {
 	exit;
 }
 
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	}
+
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
 }
@@ -87,13 +93,9 @@ if (strlen($id)>0) {
 		unset($sql);
 }
 
-//redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_rooms.php\">\n";
-	echo "<div align='center'>\n";
-	echo "Delete Complete\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
-	return;
+
+$_SESSION["message"] = $text['message-delete'];
+header("Location: conference_rooms.php");
+return;
 
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index d25a2833f1..58f5521e62 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -151,12 +151,10 @@ else {
 				$db->exec(check_sql($sql));
 				unset($sql);
 		}
-		//redirect the browser
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_room_edit.php?id=$conference_room_uuid\">\n";
-			echo "<div align='center'>Delete Complete</div>";
-			require_once "resources/footer.php";
-			return;
+
+		$_SESSION["message"] = $text['message-delete'];
+		header("Location: conference_room_edit.php?id=".$conference_room_uuid);
+		return;
 	}
 
 
@@ -333,6 +331,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 						$db->exec(check_sql($sql));
 						unset($sql);
 					}
+
+				$_SESSION["message"] = $text['message-add'];
 			} //if ($action == "add")
 
 			if ($action == "update" && permission_exists('conference_room_edit')) {
@@ -394,6 +394,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$sql .= "and conference_room_uuid = '$conference_room_uuid' ";
 					$db->exec(check_sql($sql));
 					unset($sql);
+
+				$_SESSION["message"] = $text['message-update'];
 			} //if ($action == "update")
 
 			//assign the user to the meeting
@@ -416,16 +418,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					//echo $sql; //exit;
 					$db->exec(check_sql($sql));
 					unset($sql);
+
+					$_SESSION["message"] = $text['message-add'];
 				}
 
-			//redirect the user
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=conference_room_edit.php?id=$conference_room_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo $text['confirm-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
+			header("Location: conference_room_edit.php?id=".$conference_room_uuid);
+			return;
 
 		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -630,13 +628,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='record'>\n";
 		echo "	<option value=''></option>\n";
-		if ($record == "true") { 
+		if ($record == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($record == "false") { 
+		if ($record == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
@@ -670,13 +668,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='wait_mod'>\n";
 		echo "	<option value=''></option>\n";
-		if ($wait_mod == "true") { 
+		if ($wait_mod == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($wait_mod == "false") { 
+		if ($wait_mod == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
@@ -697,13 +695,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='announce'>\n";
 		echo "	<option value=''></option>\n";
-		if ($announce == "true") { 
+		if ($announce == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($announce == "false") { 
+		if ($announce == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
@@ -735,13 +733,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='mute'>\n";
 		echo "	<option value=''></option>\n";
-		if ($mute == "true") { 
+		if ($mute == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($mute == "false") { 
+		if ($mute == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
@@ -793,13 +791,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='enabled'>\n";
 		echo "	<option value=''></option>\n";
-		if ($enabled == "true") { 
+		if ($enabled == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($enabled == "false") { 
+		if ($enabled == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
@@ -820,13 +818,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<select class='formfld' name='sounds'>\n";
 		echo "	<option value=''></option>\n";
-		if ($sounds == "true") { 
+		if ($sounds == "true") {
 			echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 		}
 		else {
 			echo "	<option value='true'>".$text['label-true']."</option>\n";
 		}
-		if ($sounds == "false") { 
+		if ($sounds == "false") {
 			echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
 		}
 		else {
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 8c5a100db7..457a3f745f 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -187,8 +187,8 @@ else {
 		$param = "";
 		$page = check_str($_GET['page']);
 		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-		list($paging_controls, $rows_per_page, $var3) = paging($row_count, $param, $rows_per_page); 
-		$offset = $rows_per_page * $page; 
+		list($paging_controls, $rows_per_page, $var3) = paging($row_count, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;
 
 	//get the conference rooms
 		$conference_center->rows_per_page = $rows_per_page;
@@ -342,10 +342,10 @@ else {
 				echo "	<td valign='top' align='right' nowrap='nowrap'>\n";
 				echo "		&nbsp;\n";
 				if (permission_exists('conference_room_edit')) {
-					echo "		<a href='conference_room_edit.php?id=".$row['conference_room_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
+					echo "		<a href='conference_room_edit.php?id=".$row['conference_room_uuid']."' alt='".$text['label-edit']."'>$v_link_label_edit</a>\n";
 				}
 				if (permission_exists('conference_room_delete')) {
-					echo "		<a href='conference_room_delete.php?id=".$row['conference_room_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+					echo "		<a href='conference_room_delete.php?id=".$row['conference_room_uuid']."' alt='".$text['label-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 				}
 				echo "	</td>\n";