From 80b546406e92f9ff62dada7bfc9fa84aa72bb7ad Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 23 Feb 2014 09:39:12 +0000 Subject: [PATCH] Response message updates. --- core/user_settings/user_edit.php | 10 ++++------ core/users/groupadd.php | 8 ++------ core/users/permissions_copy.php | 23 +++++------------------ core/users/permissions_default.php | 8 ++------ core/users/signup.php | 6 ++---- core/users/usersupdate.php | 14 +++++--------- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php index 173da4e9b6..f7a8239d5a 100644 --- a/core/user_settings/user_edit.php +++ b/core/user_settings/user_edit.php @@ -49,7 +49,7 @@ else { //required to be a superadmin to update an account that is a member of the superadmin group $superadmin_list = superadmin_list($db); if (if_superadmin($superadmin_list, $user_uuid)) { - if (!if_group("superadmin")) { + if (!if_group("superadmin")) { echo "access denied"; return; } @@ -105,7 +105,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") { return; } - //get the number of rows in v_user_settings + //get the number of rows in v_user_settings $sql = "select count(*) as num_rows from v_user_settings "; $sql .= "where user_setting_category = 'domain' "; $sql .= "and user_setting_subcategory = 'time_zone' "; @@ -199,10 +199,8 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") { //$_SESSION["template_content"] = ''; //redirect the browser - require_once "resources/header.php"; - echo "\n"; - echo "
".$text['confirm-update']."
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['confirm-update']; + header("Location: ".PROJECT_PATH."/core/user_settings/user_edit.php"); return; } else { diff --git a/core/users/groupadd.php b/core/users/groupadd.php index c96a1478d6..58a64c3b97 100644 --- a/core/users/groupadd.php +++ b/core/users/groupadd.php @@ -71,12 +71,8 @@ if (strlen($group_name) > 0) { } //redirect the user - 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: groups.php"); return; } diff --git a/core/users/permissions_copy.php b/core/users/permissions_copy.php index 459071a278..84641646fb 100644 --- a/core/users/permissions_copy.php +++ b/core/users/permissions_copy.php @@ -46,7 +46,7 @@ else { $group_name = check_str($_REQUEST["id"]); $group_new = check_str($_REQUEST["ext"]); } - + //get the groups data $sql = "select * from v_groups "; $sql .= "where domain_uuid = '$domain_uuid' "; @@ -60,7 +60,7 @@ else { $group_name = $row["group_name"]; } unset ($prep_statement); - + //copy the groups $group_uuid = uuid(); $sql = "insert into v_groups "; @@ -100,7 +100,7 @@ else { $sql .= "group_permission_uuid, "; $sql .= "domain_uuid, "; $sql .= "permission_name, "; - $sql .= "group_name "; + $sql .= "group_name "; $sql .= ")"; $sql .= "values "; $sql .= "("; @@ -115,21 +115,8 @@ else { unset ($prep_statement); //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
\n"; - echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
".$text['message-message']."
".$text['message-copy']."
\n"; - echo "
\n"; - echo "
\n"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-copy']; + header("Location: groups.php"); return; ?> \ No newline at end of file diff --git a/core/users/permissions_default.php b/core/users/permissions_default.php index 0621527181..ac79271442 100644 --- a/core/users/permissions_default.php +++ b/core/users/permissions_default.php @@ -47,12 +47,8 @@ else { $permission->restore(); //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: groups.php"); return; ?> \ No newline at end of file diff --git a/core/users/signup.php b/core/users/signup.php index c114708986..3cc3074e33 100644 --- a/core/users/signup.php +++ b/core/users/signup.php @@ -166,10 +166,8 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") { //$log_type = 'user'; $log_status='add'; $log_add_user=$_SESSION["username"]; $log_desc= "username: ".$username." user added."; //log_add($db, $log_type, $log_status, $log_desc, $log_add_user, $_SERVER["REMOTE_ADDR"]); - require_once "resources/header.php"; - echo "\n"; - echo "
".$text['message-add']."
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-add']; + header("Location: index.php"); return; } diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php index 1e0dffdd3c..0cead3d854 100644 --- a/core/users/usersupdate.php +++ b/core/users/usersupdate.php @@ -85,10 +85,8 @@ else { $sql .= "and user_uuid = '$user_uuid' "; $db->exec(check_sql($sql)); //redirect the user - require_once "resources/header.php"; - echo "\n"; - echo "
".$text['message-update']."
"; - require_once "resources/footer.php"; + $_SESSION["message"] = $text['message-update']; + header("Location: usersupdate.php?id=".$user_uuid); return; } @@ -285,15 +283,13 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") { //$_SESSION["template_content"] = ''; //redirect the browser - require_once "resources/header.php"; + $_SESSION["message"] = $text['message-update']; if (if_group("admin")) { - echo "\n"; + header("Location: usersupdate.php?id=".$user_uuid); } else { - echo "\n"; + header("Location: usersupdate.php"); } - echo "
".$text['message-update']."
"; - require_once "resources/footer.php"; return; } else {