From 1d5987acc448b5cd452876d1a22ed15cceca8a16 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 23 Feb 2014 09:26:30 +0000 Subject: [PATCH] Response message updates. --- core/menu/menu_delete.php | 8 ++------ core/menu/menu_edit.php | 16 ++++----------- core/menu/menu_item_delete.php | 8 ++------ core/menu/menu_item_edit.php | 28 +++++++++----------------- core/menu/menu_item_move_down.php | 8 ++------ core/menu/menu_item_move_up.php | 8 ++------ core/menu/menu_restore_all_default.php | 14 +++++++------ core/menu/menu_restore_default.php | 8 ++------ 8 files changed, 32 insertions(+), 66 deletions(-) diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php index edf1eb9fa3..da1632bfc5 100644 --- a/core/menu/menu_delete.php +++ b/core/menu/menu_delete.php @@ -78,12 +78,8 @@ if (strlen($id)>0) { } //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo $text['message-delete']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-delete']; + header("Location: menu.php"); return; ?> \ No newline at end of file diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 57312346bb..60e39e95e1 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -113,12 +113,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $menu->restore(); //redirect the user back to the main menu - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo $text['message-add']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-add']; + header("Location: menu.php"); return; } //if ($action == "add") @@ -133,12 +129,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //redirect the user back to the main menu - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo $text['message-update']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-update']; + header("Location: menu.php"); return; } //if ($action == "update") } //if ($_POST["persistformvar"] != "true") diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php index 550f233407..2986b22eed 100644 --- a/core/menu/menu_item_delete.php +++ b/core/menu/menu_item_delete.php @@ -70,12 +70,8 @@ if (count($_GET)>0) { unset($sql); //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
"; - echo $text['message-delete']; - echo "
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-delete']; + header("Location: menu_edit.php?id=".$menu_uuid); return; } diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index b078aed486..9b5c0e4316 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -54,12 +54,8 @@ else { $sql .= "and group_name = '".$group_name."' "; $db->exec(check_sql($sql)); //redirect the browser - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo $text['message-delete']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-delete']; + header("Location: menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$menu_item_uuid."&menu_uuid=".$menu_uuid); return; } @@ -265,18 +261,14 @@ else { } //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - if ($action == "add") { - echo $text['message-add']."\n"; - } - if ($action == "update") { - echo $text['message-update']."\n"; - } - echo "
\n"; - require_once "resources/footer.php"; - return; + if ($action == "add") { + $_SESSION["message"] = $text['message-add']; + } + if ($action == "update") { + $_SESSION["message"] = $text['message-update']; + } + header("Location: menu_edit.php?id=".$menu_uuid); + return; } //if ($_POST["persistformvar"] != "true") } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php index e16dae2096..ab8d78545e 100644 --- a/core/menu/menu_item_move_down.php +++ b/core/menu/menu_item_move_down.php @@ -82,12 +82,8 @@ if (count($_GET)>0) { } //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
"; - echo $text['message-moved_down']; - echo "
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-moved_down']; + header("Location: menu_list.php?menu_item_id=".$menu_item_id); return; } diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php index 6f242dd706..f2a5a9ee3e 100644 --- a/core/menu/menu_item_move_up.php +++ b/core/menu/menu_item_move_up.php @@ -69,12 +69,8 @@ if (count($_GET)>0) { } //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
"; - echo $text['message-moved_up']; - echo "
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-moved_up']; + header("Location: menu_list.php?menu_item_id=".$menu_item_id); return; } diff --git a/core/menu/menu_restore_all_default.php b/core/menu/menu_restore_all_default.php index 55378682b5..cc252c840b 100644 --- a/core/menu/menu_restore_all_default.php +++ b/core/menu/menu_restore_all_default.php @@ -34,6 +34,12 @@ else { return; } +//add multi-lingual support + require_once "app_languages.php"; + foreach($text as $key => $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + //get the http value and set as a php variable $menu_uuid = check_str($_REQUEST["menu_uuid"]); $menu_language = check_str($_REQUEST["menu_language"]); @@ -54,12 +60,8 @@ else { $_SESSION["template_content"] = ''; //show a message to the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "Restore Complete\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-restore']; + header("Location: /core/menu/menu_edit.php?id=".$menu_uuid); return; ?> diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index 944da9ccd1..79326b2fd3 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -60,12 +60,8 @@ else { $_SESSION["template_content"] = ''; //show a message to the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo $text['message-restore']."\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-restore']; + header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".$menu_uuid); return; ?> \ No newline at end of file