From 0419a8613621580619d821ad0260c0e4d3786949 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 23 Feb 2014 07:48:21 +0000
Subject: [PATCH] Response message updates.

---
 app/ring_groups/ring_group_delete.php          |  8 ++------
 .../ring_group_destination_edit.php            | 18 +++++-------------
 app/ring_groups/ring_group_edit.php            |  4 ++--
 app/ring_groups/ring_group_forward_edit.php    |  8 ++------
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/app/ring_groups/ring_group_delete.php b/app/ring_groups/ring_group_delete.php
index daa19a4b33..fbbe78796b 100644
--- a/app/ring_groups/ring_group_delete.php
+++ b/app/ring_groups/ring_group_delete.php
@@ -104,12 +104,8 @@ else {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_groups.php\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: ring_groups.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php
index 72d5ed14e9..0a0631c149 100644
--- a/app/ring_groups/ring_group_destination_edit.php
+++ b/app/ring_groups/ring_group_destination_edit.php
@@ -134,12 +134,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_group_edit.php?id=$ring_group_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo "	".$text['message-add']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-add'];
+				header("Location: ring_group_edit.php?id=".$ring_group_uuid);
 				return;
 			} //if ($action == "add")
 
@@ -159,15 +155,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=ring_group_edit.php?id=$ring_group_uuid\">\n";
-				echo "<div align='center'>\n";
-				echo "	".$text['message-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: ring_group_edit.php?id=".$ring_group_uuid);
 				return;
 			} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true") 
+		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 85af19c9e6..2de2abc3c4 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -53,7 +53,7 @@ else {
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
 		//save the message to a session variable
-			$_SESSION['message'] = $text['message-add'];
+			$_SESSION['message'] = $text['message-delete'];
 		//redirect the browser
 			header("Location: ring_group_edit.php?id=$ring_group_uuid");
 			exit;
@@ -219,7 +219,7 @@ else {
 						$ring_group_uuid = $message['uuid'];
 						$_GET["id"] = $ring_group_uuid;
 					}
-			} 
+			}
 
 		//delete the dialplan details
 			$sql = "delete from v_dialplan_details ";
diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php
index f270c36b18..e105ad6e8a 100644
--- a/app/ring_groups/ring_group_forward_edit.php
+++ b/app/ring_groups/ring_group_forward_edit.php
@@ -86,12 +86,8 @@ require_once "resources/check_auth.php";
 			unset($sql);
 
 		//redirect the user
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"3;url=".PROJECT_PATH."/app/ring_groups/ring_group_forward.php\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."<br />\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: ".PROJECT_PATH."/app/ring_groups/ring_group_forward.php");
 			return;
 	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)