From bef360f5bbeca59359fd18552f3e0951cb69abb3 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 23 Feb 2014 07:33:53 +0000
Subject: [PATCH] Response message updates, removed language redundancy.

---
 app/ivr_menu/app_languages.php        | 18 +-----------------
 app/ivr_menu/ivr_menu_copy.php        |  8 ++------
 app/ivr_menu/ivr_menu_edit.php        | 10 +++-------
 app/ivr_menu/ivr_menu_option_edit.php |  2 +-
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/app/ivr_menu/app_languages.php b/app/ivr_menu/app_languages.php
index f51b9121e4..3fab082dd9 100644
--- a/app/ivr_menu/app_languages.php
+++ b/app/ivr_menu/app_languages.php
@@ -66,7 +66,7 @@
 	$text['description-option_add_edit']['fr-fr'] = "Le guide vocal présente les options possibles à l'appelant. Ces options correspondent aux digits (DTMF) émises par l'appelant et lui permettant de choisir une destination.";
 
 	$text['label-name']['en-us'] = "Name";
-	$text['label-name']['en-us'] = "Nombre";
+	$text['label-name']['es-cl'] = "Nombre";
 	$text['label-name']['pt-pt'] = "Nome";
 	$text['label-name']['fr-fr'] = "Nom";
 
@@ -412,20 +412,4 @@
 	$text['message-message']['pt-pt'] = "Mensagem";
 	$text['message-message']['fr-fr'] = "Message";
 
-	$text['message-add']['en-us'] = "Add Completed";
-	$text['message-add']['pt-pt'] = "Adição Efectuada";
-	$text['message-add']['fr-fr'] = "Ajouté";
-
-	$text['message-update']['en-us'] = "Update Completed";
-	$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']['pt-pt'] = "Remoção Efectuada";
-	$text['message-delete']['fr-fr'] = "Supprimé";
-
-	$text['message-copy']['en-us'] = "Copy Completed";
-	$text['message-copy']['pt-pt'] = "Cópia Efectuada";
-	$text['message-copy']['fr-fr'] = "Copié";
-
 ?>
diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php
index 2393ded27e..52c6640561 100644
--- a/app/ivr_menu/ivr_menu_copy.php
+++ b/app/ivr_menu/ivr_menu_copy.php
@@ -185,12 +185,8 @@ else {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=ivr_menus.php\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-copy']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-copy'];
+	header("Location: ivr_menus.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index af6c1ca4aa..ef739f9b98 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -286,13 +286,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				//redirect the user
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"0;url=ivr_menu_edit.php?id=$ivr_menu_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo $text['message-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+			//redirect the user
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: ivr_menu_edit.php?id=".$ivr_menu_uuid);
 				return;
 
 		} //if ($_POST["persistformvar"] != "true")
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index ba7b0de2dc..0cd27aa3a1 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -133,7 +133,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$ivr->update();
 
 				//redirect the user
-					$_SESSION['message'] = $text['message-add'];
+					$_SESSION['message'] = $text['message-update'];
 					header('Location: ivr_menu_edit.php?id='.$ivr_menu_uuid);
 					return;
 			} //if ($action == "update")