瀏覽代碼

Change messages class to message

markjcrane 7 年之前
父節點
當前提交
04994f5205

+ 1 - 1
core/databases/database_delete.php

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

+ 2 - 2
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
-				messages::add($text['message-add']);
+				message::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
-				messages::add($text['message-update']);
+				message::add($text['message-update']);
 				header("Location: databases.php");
 				return;
 		} //if ($action == "update")

+ 2 - 2
core/default_settings/default_setting_edit.php

@@ -153,12 +153,12 @@
 
 				//set the message and redirect the user
 				if ($action == "add" && permission_exists('default_setting_add')) {
-					messages::add($text['message-add']);
+					message::add($text['message-add']);
 					header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category);
 					return;
 				}
 				if ($action == "update" && permission_exists('default_setting_edit')) {
-					messages::add($text['message-update']);
+					message::add($text['message-update']);
 					header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category);
 					return;
 				}

+ 3 - 3
core/default_settings/default_settings.php

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

+ 1 - 1
core/default_settings/default_settings_reload.php

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

+ 1 - 1
core/domain_settings/domain_delete.php

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

+ 2 - 2
core/domain_settings/domain_edit.php

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

+ 1 - 1
core/domain_settings/domain_setting_delete.php

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

+ 2 - 2
core/domain_settings/domain_setting_edit.php

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

+ 2 - 2
core/domain_settings/domain_settings.php

@@ -55,7 +55,7 @@
 				$db->exec(check_sql($sql));
 				unset($sql);
 
-				messages::add($text['message-update']);
+				message::add($text['message-update']);
 				header("Location: domain_edit.php?id=".$domain_uuid);
 				exit;
 			}
@@ -79,7 +79,7 @@
 				}
 				else {
 					// set message
-					messages::add($text['message-delete_failed'], 'negative');
+					message::add($text['message-delete_failed'], 'negative');
 				}
 
 				header("Location: domain_edit.php?id=".escape($_REQUEST["domain_uuid"]));

+ 1 - 1
core/groups/group_permissions.php

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

+ 2 - 2
core/groups/groupadd.php

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

+ 1 - 1
core/groups/groupdelete.php

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

+ 2 - 2
core/groups/groupedit.php

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

+ 1 - 1
core/groups/groupmemberadd.php

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

+ 1 - 1
core/groups/groupmemberdelete.php

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

+ 1 - 1
core/groups/groups.php

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

+ 1 - 1
core/groups/permissions_copy.php

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

+ 1 - 1
core/groups/permissions_default.php

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

+ 1 - 1
core/menu/menu_delete.php

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

+ 2 - 2
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
-				messages::add($text['message-add']);
+				message::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
-				messages::add($text['message-update']);
+				message::add($text['message-update']);
 				header("Location: menu.php");
 				return;
 		} //if ($action == "update")

+ 1 - 1
core/menu/menu_item_delete.php

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

+ 3 - 3
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
-			messages::add($text['message-delete']);
+			message::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") {
-					messages::add($text['message-add']);
+					message::add($text['message-add']);
 				}
 				if ($action == "update") {
-					messages::add($text['message-update']);
+					message::add($text['message-update']);
 				}
 
 			//redirect the user

+ 1 - 1
core/menu/menu_item_move_down.php

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

+ 1 - 1
core/menu/menu_item_move_up.php

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

+ 1 - 1
core/menu/menu_restore_default.php

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

+ 6 - 6
core/upgrade/index.php

@@ -77,10 +77,10 @@
 			}
 			chdir($cwd);
 			if ($update_failed) {
-				messages::add($text['message-upgrade_source_failed'], 'negative', $message_timeout);
+				message::add($text['message-upgrade_source_failed'], 'negative', $message_timeout);
 			}
 			else {
-				messages::add($text['message-upgrade_source'], null, $message_timeout);
+				message::add($text['message-upgrade_source'], null, $message_timeout);
 			}
 		}
 
@@ -90,7 +90,7 @@
 			require_once "resources/classes/schema.php";
 			$obj = new schema();
 			$_SESSION["response"]["schema"] = $obj->schema("html");
-			messages::add($text['message-upgrade_schema'], null, $message_timeout);
+			message::add($text['message-upgrade_schema'], null, $message_timeout);
 		}
 
 		// process the apps defaults
@@ -98,7 +98,7 @@
 			require_once "resources/classes/domains.php";
 			$domain = new domains;
 			$domain->upgrade();
-			messages::add($text['message-upgrade_apps'], null, $message_timeout);
+			message::add($text['message-upgrade_apps'], null, $message_timeout);
 		}
 
 		// restore defaults of the selected menu
@@ -109,14 +109,14 @@
 			$included = true;
 			require_once("core/menu/menu_restore_default.php");
 			unset($sel_menu);
-			messages::add($text['message-upgrade_menu'], null, $message_timeout);
+			message::add($text['message-upgrade_menu'], null, $message_timeout);
 		}
 
 		// restore default permissions
 		if ($do["permissions"] && permission_exists("group_edit")) {
 			$included = true;
 			require_once("core/groups/permissions_default.php");
-			messages::add($text['message-upgrade_permissions'], null, $message_timeout);
+			message::add($text['message-upgrade_permissions'], null, $message_timeout);
 		}
 
 		header("Location: ".PROJECT_PATH."/core/upgrade/index.php");

+ 1 - 1
core/users/user_delete.php

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

+ 4 - 4
core/users/user_edit.php

@@ -63,7 +63,7 @@
 		}
 		unset($prep_statement, $row);
 		if ($total_users >= $_SESSION['limit']['users']['numeric']) {
-			messages::add($text['message-maximum_users'].' '.$_SESSION['limit']['users']['numeric'], 'negative');
+			message::add($text['message-maximum_users'].' '.$_SESSION['limit']['users']['numeric'], 'negative');
 			header('Location: users.php');
 			exit;
 		}
@@ -90,7 +90,7 @@
 			$sql .= "and user_uuid = '".$user_uuid."' ";
 			$db->exec(check_sql($sql));
 		//redirect the user
-			messages::add($text['message-update']);
+			message::add($text['message-update']);
 			header("Location: user_edit.php?id=".$user_uuid);
 			return;
 	}
@@ -152,7 +152,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") {
 		}
 
 		if ($msg_error != '') {
-			messages::add($msg_error, 'negative');
+			message::add($msg_error, 'negative');
 			if ($action == 'edit') {
 				header("Location: user_edit.php?id=".$user_uuid);
 			}
@@ -467,7 +467,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") {
 		}
 
 	//redirect the browser
-		messages::add($text['message-update']);
+		message::add($text['message-update']);
 		if ($_REQUEST['action'] == $text['button-add'] || !permission_exists('user_edit')) {
 			header("Location: user_edit.php?id=".$user_uuid);
 		}

+ 1 - 1
core/users/user_setting_delete.php

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

+ 2 - 2
core/users/user_setting_edit.php

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

+ 1 - 1
core/users/user_settings.php

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

+ 1 - 1
resources/check_auth.php

@@ -100,7 +100,7 @@
 
 				//redirect the user to the login page
 					$target_path = ($_REQUEST["path"] != '') ? $_REQUEST["path"] : $_SERVER["PHP_SELF"];
-					messages::add($text['message-invalid_credentials'], 'negative');
+					message::add($text['message-invalid_credentials'], 'negative');
 					header("Location: ".PROJECT_PATH."/login.php?path=".urlencode($target_path));
 					exit;
 			}

+ 1 - 1
resources/functions.php

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