Enhance - More messages::add updates (#2662)

convert more messages over to messsagse::add

core/apps/apps_delete.php

@@ -89,7 +89,7 @@ if (strlen($id) > 0) {
 }
 
 //redirect the browser
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: apps.php");
 	return;
 

core/apps/apps_edit.php

@@ -88,7 +88,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//$db->exec(check_sql($sql));
 				unset($sql);
 
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: apps.php");
 				return;
 			} //if ($action == "add")
@@ -100,7 +100,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				//$db->exec(check_sql($sql));
 				unset($sql);
 
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				header("Location: apps.php");
 				return;
 			} //if ($action == "update")

core/databases/database_delete.php

@@ -54,7 +54,7 @@ else {
 	}
 
 //redirect the browser
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: databases.php");
 	return;
 

core/databases/database_edit.php

@@ -141,7 +141,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: databases.php");
 				return;
 		} //if ($action == "add")
@@ -167,7 +167,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "app_defaults.php";
 
 			//redirect the browser
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				header("Location: databases.php");
 				return;
 		} //if ($action == "update")

core/default_settings/default_setting_edit.php

@@ -150,7 +150,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#".$default_setting_category);
 				return;
 			} //if ($action == "add")
@@ -168,7 +168,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#".$default_setting_category);
 				return;
 			} //if ($action == "update")

core/default_settings/default_settings.php

@@ -53,7 +53,7 @@ else {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			$_SESSION["message"] = $text['message-update'];
+			messages::add($text['message-update']);
 			header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#".$category);
 			exit;
 		}
@@ -162,7 +162,7 @@ else {
 			}
 			else {
 				// set message
-				$_SESSION["message"] = $text['message-copy_failed'];
+				messages::add($text['message-copy_failed']);
 			}
 
 			header("Location: default_settings.php".(($search != '') ? "?search=".$search : null));
@@ -185,8 +185,7 @@ else {
 			}
 			else {
 				// set message
-				$_SESSION["message"] = $text['message-delete_failed'];
-				$_SESSION["message_mood"] = "negative";
+				messages::add($text['message-delete_failed'], 'negative');
 			}
 
 			header("Location: default_settings.php".(($search != '') ? "?search=".$search : null));

core/default_settings/default_settings_reload.php

@@ -45,7 +45,7 @@ $domain = new domains();
 $domain->db = $db;
 $domain->set();
 
-$_SESSION["message"] = $text['message-settings_reloaded'];
+messages::add($text['message-settings_reloaded']);
 header("Location: default_settings.php".(($search != '') ? "?search=".$search : null));
 
 ?>

core/domain_settings/domain_delete.php

@@ -210,7 +210,7 @@ if (strlen($id) > 0) {
 	}
 
 //redirect the browser
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: domains.php");
 	return;
 

core/domain_settings/domain_edit.php

@@ -583,7 +583,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 		//redirect the browser
 			if ($action == "update") {
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				if (!permission_exists('domain_add')) { //admin, updating own domain
 					header("Location: domain_edit.php");
 				}
@@ -592,7 +592,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 			}
 			if ($action == "add") {
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: domains.php");
 			}
 			return;

core/domain_settings/domain_setting_delete.php

@@ -56,7 +56,7 @@ else {
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: domain_edit.php?id=".$domain_uuid);
 	return;
 

core/domain_settings/domain_setting_edit.php

@@ -313,10 +313,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 			//redirect the browser
 				if ($action == "update") {
-					$_SESSION["message"] = $text['message-update'];
+					messages::add($text['message-update']);
 				}
 				if ($action == "add") {
-					$_SESSION["message"] = $text['message-add'];
+					messages::add($text['message-add']);
 				}
 				header("Location: domain_edit.php?id=".$domain_uuid);
 				return;

core/domain_settings/domain_settings.php

@@ -52,7 +52,7 @@ if (sizeof($_REQUEST) > 1) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			$_SESSION["message"] = $text['message-update'];
+			messages::add($text['message-update']);
 			header("Location: domain_edit.php?id=".$domain_uuid);
 			exit;
 		}
@@ -76,8 +76,7 @@ if (sizeof($_REQUEST) > 1) {
 			}
 			else {
 				// set message
-				$_SESSION["message"] = $text['message-delete_failed'];
-				$_SESSION["message_mood"] = "negative";
+				messages::add($text['message-delete_failed'], 'negative');
 			}
 
 			header("Location: domain_edit.php?id=".check_str($_REQUEST["domain_uuid"]));

core/groups/group_permissions.php

@@ -314,7 +314,7 @@
 				}
 			}
 
-		$_SESSION["message"] = $text['message-update'];
+		messages::add($text['message-update']);
 		header("Location: groups.php");
 		return;
 	}

core/groups/groupadd.php

@@ -95,12 +95,11 @@
 					// $info[2] is the driver specific error string
 				}
 
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: groups.php");
 			}
 			else {
-				$_SESSION['message_mood'] = 'negative';
-				$_SESSION["message"] = $text['message-group_exists'];
+				messages::add($text['message-group_exists'], 'negative');
 				header("Location: groupadd.php");
 			}
 

core/groups/groupdelete.php

@@ -92,7 +92,7 @@
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: groups.php");
 
 ?>

core/groups/groupedit.php

@@ -188,12 +188,11 @@
 						}
 				}
 
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				header("Location: groups.php");
 			}
 			else {
-				$_SESSION['message_mood'] = 'negative';
-				$_SESSION["message"] = $text['message-group_exists'];
+				messages::add($text['message-group_exists'], 'negative');
 				header("Location: groupedit.php?id=".$group_uuid);
 			}
 

core/groups/groupmemberadd.php

@@ -81,7 +81,7 @@
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-update'];
+	messages::add($text['message-update']);
 	header("Location: groupmembers.php?group_uuid=".$group_uuid."&group_name=".$group_name);
 
 ?>

core/groups/groupmemberdelete.php

@@ -64,7 +64,7 @@
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: groupmembers.php?group_uuid=".$group_uuid."&group_name=".$group_name);
 
 ?>

core/groups/groups.php

@@ -62,7 +62,7 @@
 		$db->exec(check_sql($sql));
 		unset($sql);
 
-		$_SESSION["message"] = $text['message-update'];
+		messages::add($text['message-update']);
 	}
 
 //get the groups

core/groups/permissions_copy.php

@@ -115,7 +115,7 @@
 			unset ($prep_statement);
 
 		//redirect the user
-			$_SESSION["message"] = $text['message-copy'];
+			messages::add($text['message-copy']);
 	}
 
 //redirect

core/groups/permissions_default.php

@@ -51,7 +51,7 @@
 //redirect the users
 	if (!$included) {
 		//show a message to the user
-		$_SESSION["message"] = $text['message-restore'];
+		messages::add($text['message-restore']);
 		header("Location: groups.php");
 		return;
 	}

core/menu/menu_delete.php

@@ -85,7 +85,7 @@ else {
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: menu.php");
 	return;
 

core/menu/menu_edit.php

@@ -112,7 +112,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$menu->restore();
 
 			//redirect the user back to the main menu
-				$_SESSION["message"] = $text['message-add'];
+				messages::add($text['message-add']);
 				header("Location: menu.php");
 				return;
 		} //if ($action == "add")
@@ -128,7 +128,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				unset($sql);
 
 			//redirect the user back to the main menu
-				$_SESSION["message"] = $text['message-update'];
+				messages::add($text['message-update']);
 				header("Location: menu.php");
 				return;
 		} //if ($action == "update")

core/menu/menu_item_delete.php

@@ -68,7 +68,7 @@ if (count($_GET)>0) {
 		unset($sql);
 
 	//redirect the user
-		$_SESSION["message"] = $text['message-delete'];
+		messages::add($text['message-delete']);
 		header("Location: menu_edit.php?id=".$menu_uuid);
 		return;
 }

core/menu/menu_item_edit.php

@@ -51,7 +51,7 @@ else {
 			$sql .= "where menu_item_group_uuid = '".$menu_item_group_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the browser
-			$_SESSION["message"] = $text['message-delete'];
+			messages::add($text['message-delete']);
 			header("Location: menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$menu_item_uuid."&menu_uuid=".$menu_uuid);
 			return;
 	}
@@ -280,10 +280,10 @@ else {
 
 			//set response message
 				if ($action == "add") {
-					$_SESSION["message"] = $text['message-add'];
+					messages::add($text['message-add']);
 				}
 				if ($action == "update") {
-					$_SESSION["message"] = $text['message-update'];
+					messages::add($text['message-update']);
 				}
 
 			//redirect the user

core/menu/menu_item_move_down.php

@@ -80,7 +80,7 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		$_SESSION["message"] = $text['message-moved_down'];
+		messages::add($text['message-moved_down']);
 		header("Location: menu_list.php?menu_item_id=".$menu_item_id);
 		return;
 }

core/menu/menu_item_move_up.php

@@ -67,7 +67,7 @@ if (count($_GET)>0) {
 	}
 
 	//redirect the user
-		$_SESSION["message"] = $text['message-moved_up'];
+		messages::add($text['message-moved_up']);
 		header("Location: menu_list.php?menu_item_id=".$menu_item_id);
 		return;
 }

core/menu/menu_restore_default.php

@@ -66,7 +66,7 @@
 //redirect
 	if (!$included) {
 		//show a message to the user
-		$_SESSION["message"] = $text['message-restore'];
+		messages::add($text['message-restore']);
 		header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".$menu_uuid);
 		return;
 	}

core/notifications/notification_edit.php

@@ -138,7 +138,7 @@ else {
 
 			if ($response['result'] == 'submitted') {
 				// set message
-				$_SESSION["message"] = $text['message-demographics_submitted'];
+				messages::add($text['message-demographics_submitted']);
 			}
 
 			header("Location: notification_edit.php");
@@ -196,7 +196,7 @@ else {
 				}
 			}
 			// redirect
-			$_SESSION["message"] = $text['message-update'];
+			messages::add($text['message-update']);
 			header("Location: notification_edit.php");
 			exit;
 		}
@@ -208,8 +208,7 @@ else {
 				($project_notification_method == 'email' && $project_notification_recipient == '')
 				) {
 					$_SESSION["postback"] = $_POST;
-					$_SESSION["message_mood"] = 'negative';
-					$_SESSION["message"] = $text['message-invalid_recipient'];
+					messages::add($text['message-invalid_recipient'], 'negative');
 					header("Location: notification_edit.php");
 					exit;
 			}
@@ -254,15 +253,16 @@ else {
 			$db->exec(check_sql($sql));
 			unset($sql);
 			// set message
-			$_SESSION["message"] = $text['message-update'];
 			if (
 				$project_security == 'false' &&
 				$project_releases == 'false' &&
 				$project_events == 'false' &&
 				$project_news == 'false'
 				) {
-				$_SESSION["message_mood"] = 'alert';
-				$_SESSION["message"] = $_SESSION["message"]." - ".$text['message-no_channels'];
+				messages::add($text['message-update']." - ".$text['message-no_channels'], 'alert');
+			}
+			else {
+				messages::add($text['message-update']);
 			}
 			// redirect
 			header("Location: notification_edit.php");

core/users/user_delete.php

@@ -102,7 +102,7 @@
 	}
 
 //redirect the user
-	$_SESSION["message"] = $text['message-delete'];
+	messages::add($text['message-delete']);
 	header("Location: users.php");
 
 ?>

core/users/user_setting_delete.php

@@ -60,8 +60,7 @@
 	}
 	else {
 		// set message
-		$_SESSION["message"] = $text['message-delete_failed'];
-		$_SESSION["message_mood"] = "negative";
+		messages::add($text['message-delete_failed'], 'negative');
 	}
 
 	header("Location: user_edit.php?id=".check_str($_REQUEST["user_uuid"]));

core/users/user_setting_edit.php

@@ -319,10 +319,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 			//redirect the browser
 				if ($action == "update") {
-					$_SESSION["message"] = $text['message-update'];
+					messages::add($text['message-update']);
 				}
 				if ($action == "add") {
-					$_SESSION["message"] = $text['message-add'];
+					messages::add($text['message-add']);
 				}
 				header("Location: user_edit.php?id=".$user_uuid);
 				return;

core/users/user_settings.php

@@ -52,7 +52,7 @@
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			$_SESSION["message"] = $text['message-update'];
+			messages::add($text['message-update']);
 			header("Location: user_edit.php?id=".$user_uuid);
 			exit;
 		}

resources/functions.php

@@ -1021,9 +1021,7 @@ function format_string ($format, $data) {
 				$msg_errors[] = '1+ '.$text['label-special_characters'];
 			}
 			if (is_array($msg_errors) && sizeof($msg_errors) > 0) {
-				$_SESSION["message"] = $text['message-password_requirements'].': '.implode(', ', $msg_errors);
-				$_SESSION['message_mood'] = 'negative';
-				$_SESSION['message_delay'] = '6000';
+				messages::add($_SESSION["message"] = $text['message-password_requirements'].': '.implode(', ', $msg_errors), 'negative', 6000);
 				return false;
 			}
 			else {