From 31a866aa3d69b8a82fd7ce75729aa51bac17de86 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 23 Feb 2014 06:06:34 +0000
Subject: [PATCH] Response message updates.

---
 app/dialplan/dialplan_add.php                 | 11 ++----
 app/dialplan/dialplan_copy.php                | 37 +++++++------------
 app/dialplan/dialplan_delete.php              | 35 ++++++------------
 app/dialplan/dialplan_detail_edit.php         | 16 ++------
 app/dialplan_inbound/dialplan_inbound_add.php | 11 ++----
 .../dialplan_outbound_add.php                 | 11 ++----
 6 files changed, 38 insertions(+), 83 deletions(-)

diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index f1a6d8369d..6113c6e639 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -256,14 +256,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 		}
 
-	//redirect the browser
-		require_once "resources/header.php";
-		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php\">\n";
-		echo "<div align='center'>\n";
-		echo $text['message-update']."\n";
-		echo "</div>\n";
-		require_once "resources/footer.php";
-		return;
+	$_SESSION["message"] = $text['message-update'];
+	header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php");
+	return;
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 ?><script type="text/javascript">
diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php
index bcd92def3d..05788f57ca 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -158,29 +158,18 @@ else {
 			$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 		}
 
-	//redirect the user
-		require_once "resources/header.php";
-		switch ($app_uuid) {
-			case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
-				//inbound routes
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=$app_uuid\">\n";
-				break;
-			case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3":
-				//outbound routes
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=$app_uuid\">\n";
-				break;
-			case "4b821450-926b-175a-af93-a03c441818b1":
-				//time conditions
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=$app_uuid\">\n";
-				break;
-			default:
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php\">\n";
-				break;
-		}
-		echo "<div align='center'>\n";
-		echo $text['message-copy']."\n";
-		echo "</div>\n";
-		require_once "resources/footer.php";
-		return;
+
+	$_SESSION["message"] = $text['message-copy'];
+	switch ($app_uuid) {
+		case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes
+		case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes
+		case "4b821450-926b-175a-af93-a03c441818b1": //time conditions
+			$redirect_url = PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=".$app_uuid;
+			break;
+		default:
+			$redirect_url = PROJECT_PATH."/app/dialplan/dialplans.php";
+	}
+	header("Location: ".$redirect_url);
+	return;
 
 ?>
diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php
index b8ad596ba1..36734e0434 100644
--- a/app/dialplan/dialplan_delete.php
+++ b/app/dialplan/dialplan_delete.php
@@ -95,29 +95,18 @@ if (strlen($dialplan_uuid) > 0) {
 		}
 }
 
-//redirect the user
 
-//save the message to a session variable
-	$_SESSION['message'] = $text['message-delete'];
-
-	require_once "resources/header.php";
-	switch ($app_uuid) {
-		case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4":
-			//inbound routes
-			header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=".$app_uuid);
-			break;
-		case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3":
-			//outbound routes
-			header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=".$app_uuid);
-			break;
-		case "4b821450-926b-175a-af93-a03c441818b1":
-			//time conditions
-			header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=".$app_uuid);
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=\">\n";
-			break;
-		default:
-			header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php);
-			break;
-	}
+$_SESSION["message"] = $text['message-delete'];
+switch ($app_uuid) {
+	case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes
+	case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes
+	case "4b821450-926b-175a-af93-a03c441818b1": //time conditions
+		$redirect_url = PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=".$app_uuid;
+		break;
+	default:
+		$redirect_url = PROJECT_PATH."/app/dialplan/dialplans.php";
+}
+header("Location: ".$redirect_url);
+return;
 
 ?>
\ No newline at end of file
diff --git a/app/dialplan/dialplan_detail_edit.php b/app/dialplan/dialplan_detail_edit.php
index 050a45fc8b..c753f7e249 100644
--- a/app/dialplan/dialplan_detail_edit.php
+++ b/app/dialplan/dialplan_detail_edit.php
@@ -145,12 +145,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_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: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
 				return;
 			} //if ($action == "add")
 
@@ -184,12 +180,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				}
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_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: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
 				return;
 		   } //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true") {
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index f61b6cf3c4..ec0bbf020f 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -539,14 +539,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//synchronize the xml config
 		save_dialplan_xml();
 
-	//redirect the user
-		require_once "resources/header.php";
-		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4\">\n";
-		echo "<div align='center'>\n";
-		echo "".$text['confirm-update-complete']."\n";
-		echo "</div>\n";
-		require_once "resources/footer.php";
-		return;
+	$_SESSION["message"] = $text['confirm-update-complete'];
+	header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4");
+	return;
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 ?>
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 26ed7f6212..7655f842ef 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -488,14 +488,9 @@ else {
 		//synchronize the xml config
 			save_dialplan_xml();
 
-		//redirect the user
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
-			return;
+		$_SESSION["message"] = $text['message-update'];
+		header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3");
+		return;
 	} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 ?>