diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php
index e53c6169d1..82aeee8dd9 100644
--- a/app/access_controls/access_control_edit.php
+++ b/app/access_controls/access_control_edit.php
@@ -79,7 +79,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
remove_config_from_cache('configuration:acl.conf');
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: access_controls.php");
return;
@@ -95,7 +95,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
remove_config_from_cache('configuration:acl.conf');
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: access_controls.php");
return;
diff --git a/app/backup/index.php b/app/backup/index.php
index 4b54ff9f48..4cca7015e4 100644
--- a/app/backup/index.php
+++ b/app/backup/index.php
@@ -81,16 +81,14 @@ else {
}
else {
//set response message
- $_SESSION["message"] = $text['message-backup_failed_format'] . $response_txt;
- $_SESSION['message_mood'] = 'negative';
+ messages::add($text['message-backup_failed_format'] . $response_txt, 'negative');
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}
}
else {
//set response message
- $_SESSION["message"] = $text['message-backup_failed_paths'];
- $_SESSION['message_mood'] = 'negative';
+ messages::add($text['message-backup_failed_paths'], 'negative');
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}
@@ -126,8 +124,7 @@ else {
}
if (!$valid_format) {
@unlink($backup_path.'/'.$backup_file);
- $_SESSION["message"] = $text['message-restore_failed_format'];
- $_SESSION['message_mood'] = 'negative';
+ messages::add($text['message-restore_failed_format'], 'negative');
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}
@@ -137,12 +134,11 @@ else {
$response_txt = "
" . implode("
", $response);
if ($restore_errlevel == 0) {
//set response message
- $_SESSION["message"] = $text['message-restore_completed'];
+ messages::add($text['message-restore_completed']);
header("Location: ".$_SERVER['PHP_SELF']);
exit;
} else {
- $_SESSION["message"] = $text['message-restore_failed_extract'] . $response_txt;
- $_SESSION['message_mood'] = 'negative';
+ messages::add($text['message-restore_failed_extract'] . $response_txt, 'negative');
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}
@@ -150,8 +146,7 @@ else {
}
else {
//set response message
- $_SESSION["message"] = $text['message-restore_failed_upload'];
- $_SESSION['message_mood'] = 'negative';
+ messages::add($text['message-restore_failed_upload'], 'negative');
header("Location: ".$_SERVER['PHP_SELF']);
exit;
}
diff --git a/app/call_block/call_block_cdr_add.php b/app/call_block/call_block_cdr_add.php
index 4f46cd6af5..c59ecfc42c 100644
--- a/app/call_block/call_block_cdr_add.php
+++ b/app/call_block/call_block_cdr_add.php
@@ -102,7 +102,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['label-add-complete'];
+ messages::add($text['label-add-complete']);
}
diff --git a/app/call_block/call_block_delete.php b/app/call_block/call_block_delete.php
index a52b56e142..56a0b8ebd9 100644
--- a/app/call_block/call_block_delete.php
+++ b/app/call_block/call_block_delete.php
@@ -76,7 +76,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['label-delete-complete'];
+ messages::add($text['label-delete-complete']);
header("Location: call_block.php");
return;
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 8cae586146..4d2d528815 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -151,7 +151,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['label-add-complete'];
+ messages::add($text['label-add-complete']);
header("Location: call_block.php");
return;
} //if ($action == "add")
@@ -186,7 +186,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['label-update-complete'];
+ messages::add($text['label-update-complete']);
header("Location: call_block.php");
return;
} //if ($action == "update")
diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php
index 0f362f42e1..193955a476 100644
--- a/app/call_broadcast/call_broadcast_delete.php
+++ b/app/call_broadcast/call_broadcast_delete.php
@@ -54,7 +54,7 @@ else {
}
-$_SESSION["message"] = $text['confirm-delete'];
+messages::add($text['confirm-delete']);
header("Location: call_broadcast.php");
return;
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index c43991bd42..44d72a3ff2 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -166,7 +166,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['confirm-add'];
+ messages::add($text['confirm-add']);
header("Location: call_broadcast.php");
return;
} //if ($action == "add")
@@ -201,7 +201,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['confirm-update'];
+ messages::add($text['confirm-update']);
header("Location: call_broadcast.php");
return;
} //if ($action == "update")
diff --git a/app/call_centers/call_center_agent_delete.php b/app/call_centers/call_center_agent_delete.php
index f131e2202a..2edf56ad4e 100644
--- a/app/call_centers/call_center_agent_delete.php
+++ b/app/call_centers/call_center_agent_delete.php
@@ -93,7 +93,7 @@
remove_config_from_cache('configuration:callcenter.conf');
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: call_center_agents.php");
return;
diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 5e3575b75e..7a7d9e2194 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_edit.php
@@ -247,10 +247,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header("Location: call_center_agents.php");
return;
diff --git a/app/call_centers/call_center_queue_delete.php b/app/call_centers/call_center_queue_delete.php
index a5b0eb277e..103d134b28 100644
--- a/app/call_centers/call_center_queue_delete.php
+++ b/app/call_centers/call_center_queue_delete.php
@@ -103,7 +103,7 @@
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: call_center_queues.php");
return;
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 6d6966a74e..25b7afa168 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -289,10 +289,10 @@
//redirect the user
if (isset($action)) {
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']);
}
}
diff --git a/app/call_centers/call_center_tier_edit.php b/app/call_centers/call_center_tier_edit.php
index a8c5d2d4ac..bdb04244f7 100644
--- a/app/call_centers/call_center_tier_edit.php
+++ b/app/call_centers/call_center_tier_edit.php
@@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
unset($prep_statement);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: call_center_queue_edit.php?id=".$queue_uuid);
return;
diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php
index 9174e88e34..3058e81b2a 100644
--- a/app/call_flows/call_flow_delete.php
+++ b/app/call_flows/call_flow_delete.php
@@ -91,7 +91,7 @@ if (strlen($id)>0) {
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: call_flows.php");
return;
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 932f778e96..aa1864c899 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -238,10 +238,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header("Location: call_flows.php");
return;
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 97d4830117..8f16731439 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -342,7 +342,7 @@
}
//redirect the user
- $_SESSION["message"] = $text['confirm-update'];
+ messages::add($text['confirm-update']);
header("Location: ".$_REQUEST['return_url']);
return;
diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php
index e3a41620a4..293ff74567 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -90,7 +90,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: conference_centers.php");
return;
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 52ae7fdc9d..67bd1a876d 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -177,10 +177,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header("Location: conference_centers.php");
return;
diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php
index ea7f0880cc..5688e141fa 100644
--- a/app/conference_centers/conference_room_delete.php
+++ b/app/conference_centers/conference_room_delete.php
@@ -91,7 +91,7 @@
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: conference_rooms.php");
return;
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index 1f25bf0d3c..0a4549aeef 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -154,7 +154,7 @@ else {
unset($sql);
}
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: conference_room_edit.php?id=".$conference_room_uuid);
return;
}
@@ -343,7 +343,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
}
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
} //if ($action == "add")
if ($action == "update" && permission_exists('conference_room_edit')) {
@@ -409,7 +409,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']);
} //if ($action == "update")
//assign the user to the meeting
@@ -433,7 +433,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: conference_room_edit.php?id=".$conference_room_uuid);
diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php
index 7c3af58e6c..f94e03dc66 100644
--- a/app/conference_controls/conference_control_detail_edit.php
+++ b/app/conference_controls/conference_control_detail_edit.php
@@ -92,7 +92,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: conference_control_edit.php?id='.$conference_control_uuid);
return;
@@ -110,7 +110,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: conference_control_edit.php?id='.$conference_control_uuid);
return;
diff --git a/app/conference_controls/conference_control_edit.php b/app/conference_controls/conference_control_edit.php
index 324b5d8e51..a320907e40 100644
--- a/app/conference_controls/conference_control_edit.php
+++ b/app/conference_controls/conference_control_edit.php
@@ -82,10 +82,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header("Location: conference_controls.php");
return;
diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php
index f0300690b9..ee642aba2f 100644
--- a/app/conference_profiles/conference_profile_edit.php
+++ b/app/conference_profiles/conference_profile_edit.php
@@ -81,7 +81,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: conference_profiles.php");
return;
@@ -97,7 +97,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: conference_profiles.php");
return;
diff --git a/app/conference_profiles/conference_profile_param_edit.php b/app/conference_profiles/conference_profile_param_edit.php
index ba4a639fdd..189be28747 100644
--- a/app/conference_profiles/conference_profile_param_edit.php
+++ b/app/conference_profiles/conference_profile_param_edit.php
@@ -93,7 +93,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header('Location: conference_profile_edit.php?id='.$conference_profile_uuid);
return;
@@ -111,7 +111,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header('Location: conference_profile_edit.php?id='.$conference_profile_uuid);
return;
diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php
index 7ea4ea3dc6..8bc6f29259 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -91,7 +91,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['confirm-delete'];
+ messages::add($text['confirm-delete']);
header("Location: conferences.php");
return;
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 241b3b956c..296474ea90 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -80,7 +80,7 @@
$sql .= "and user_uuid = '".$user_uuid."' ";
$db->exec(check_sql($sql));
- $_SESSION["message"] = $text['confirm-delete'];
+ messages::add($text['confirm-delete']);
header("Location: conference_edit.php?id=".$conference_uuid);
return;
}
@@ -107,7 +107,7 @@
$sql_insert .= ")";
$db->exec($sql_insert);
//send a message
- $_SESSION["message"] = $text['confirm-add'];
+ messages::add($text['confirm-add']);
header("Location: conference_edit.php?id=".$conference_uuid);
return;
}
@@ -217,7 +217,7 @@
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
//add the message
- $_SESSION["message"] = $text['confirm-add'];
+ messages::add($text['confirm-add']);
} //if ($action == "add")
if ($action == "update") {
@@ -273,7 +273,7 @@
$db->query($sql);
//add the message
- $_SESSION["message"] = $text['confirm-update'];
+ messages::add($text['confirm-update']);
} //if ($action == "update")
//update the dialplan xml
diff --git a/app/contacts/contact_address_delete.php b/app/contacts/contact_address_delete.php
index 6235e5bc2a..72c4e925ce 100644
--- a/app/contacts/contact_address_delete.php
+++ b/app/contacts/contact_address_delete.php
@@ -55,7 +55,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php
index ef67242594..f4259499cf 100644
--- a/app/contacts/contact_address_edit.php
+++ b/app/contacts/contact_address_edit.php
@@ -161,7 +161,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -187,7 +187,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_delete.php b/app/contacts/contact_delete.php
index a3b1732152..e1038a8229 100644
--- a/app/contacts/contact_delete.php
+++ b/app/contacts/contact_delete.php
@@ -132,7 +132,7 @@ if (strlen($contact_uuid) > 0) {
}
if (!$included) {
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contacts.php");
return;
}
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 9bc32eac97..17421ae9ad 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -150,7 +150,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
$location = "contact_edit.php?id=".$contact_uuid;
} //if ($action == "add")
@@ -177,7 +177,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
$location = "contact_edit.php?id=".$contact_uuid;
} //if ($action == "update")
diff --git a/app/contacts/contact_email_delete.php b/app/contacts/contact_email_delete.php
index b37d65f9fd..346b1ab563 100644
--- a/app/contacts/contact_email_delete.php
+++ b/app/contacts/contact_email_delete.php
@@ -52,7 +52,7 @@ if (strlen($id)>0) {
unset($sql);
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php
index 4f553071ba..0347c374d3 100644
--- a/app/contacts/contact_email_edit.php
+++ b/app/contacts/contact_email_edit.php
@@ -133,7 +133,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -150,7 +150,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_group_delete.php b/app/contacts/contact_group_delete.php
index b1fe25208b..dc9c0e6435 100644
--- a/app/contacts/contact_group_delete.php
+++ b/app/contacts/contact_group_delete.php
@@ -57,7 +57,7 @@ else {
//redirect the browser
if (!$included) {
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
}
diff --git a/app/contacts/contact_import_google.php b/app/contacts/contact_import_google.php
index 23f2c44e29..4e63df8532 100644
--- a/app/contacts/contact_import_google.php
+++ b/app/contacts/contact_import_google.php
@@ -333,8 +333,7 @@ if ($_POST['a'] == 'import') {
else {
// no contacts imported
- $_SESSION['message_mood'] = 'negative';
- $_SESSION["message"] = $text['message-contacts_imported']." ".$contacts_imported;
+ messages::add($text['message-contacts_imported']." ".$contacts_imported, 'negative');
}
}
diff --git a/app/contacts/contact_note_delete.php b/app/contacts/contact_note_delete.php
index 3fc3a87bc2..d52000746c 100644
--- a/app/contacts/contact_note_delete.php
+++ b/app/contacts/contact_note_delete.php
@@ -52,7 +52,7 @@ if (strlen($id)>0) {
unset($sql);
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php
index 8c255dc37d..4715f1bbb0 100644
--- a/app/contacts/contact_note_edit.php
+++ b/app/contacts/contact_note_edit.php
@@ -117,7 +117,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -134,7 +134,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_phone_delete.php b/app/contacts/contact_phone_delete.php
index fe17ad4dce..40c5296698 100644
--- a/app/contacts/contact_phone_delete.php
+++ b/app/contacts/contact_phone_delete.php
@@ -55,7 +55,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index 0677b5deaf..b18191d677 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -159,7 +159,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -182,7 +182,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_relation_delete.php b/app/contacts/contact_relation_delete.php
index 9bb143bcae..d9f31f314e 100644
--- a/app/contacts/contact_relation_delete.php
+++ b/app/contacts/contact_relation_delete.php
@@ -53,7 +53,7 @@ if (strlen($id)>0) {
unset($sql);
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_relation_edit.php b/app/contacts/contact_relation_edit.php
index 6774247b0b..e2e13a9788 100644
--- a/app/contacts/contact_relation_edit.php
+++ b/app/contacts/contact_relation_edit.php
@@ -145,7 +145,7 @@ else {
unset($sql);
}
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -159,7 +159,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_setting_delete.php b/app/contacts/contact_setting_delete.php
index 306bdac3a3..48bf4e0998 100644
--- a/app/contacts/contact_setting_delete.php
+++ b/app/contacts/contact_setting_delete.php
@@ -56,7 +56,7 @@ else {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php
index 47bae1a29c..f696ab47ea 100644
--- a/app/contacts/contact_setting_edit.php
+++ b/app/contacts/contact_setting_edit.php
@@ -162,10 +162,10 @@ else {
//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: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_time_delete.php b/app/contacts/contact_time_delete.php
index 1ab7e7b06f..15004c5e76 100644
--- a/app/contacts/contact_time_delete.php
+++ b/app/contacts/contact_time_delete.php
@@ -56,7 +56,7 @@ else {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_time_edit.php b/app/contacts/contact_time_edit.php
index 8731175d0e..1c33cc9b1d 100644
--- a/app/contacts/contact_time_edit.php
+++ b/app/contacts/contact_time_edit.php
@@ -119,7 +119,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -138,7 +138,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_url_delete.php b/app/contacts/contact_url_delete.php
index ddf9339bf6..cfd07061bf 100644
--- a/app/contacts/contact_url_delete.php
+++ b/app/contacts/contact_url_delete.php
@@ -54,7 +54,7 @@ if (strlen($id)>0) {
unset($sql);
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php
index 30e39265e3..111d8d3606 100644
--- a/app/contacts/contact_url_edit.php
+++ b/app/contacts/contact_url_edit.php
@@ -134,7 +134,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "add")
@@ -151,7 +151,7 @@ else {
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
} //if ($action == "update")
diff --git a/app/contacts/contact_user_delete.php b/app/contacts/contact_user_delete.php
index d8112c3751..892364f2ac 100644
--- a/app/contacts/contact_user_delete.php
+++ b/app/contacts/contact_user_delete.php
@@ -57,7 +57,7 @@ else {
//redirect the browser
if (!$included) {
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid);
return;
}
diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php
index c52da65c12..e5f55d7e96 100644
--- a/app/database_transactions/database_transaction_edit.php
+++ b/app/database_transactions/database_transaction_edit.php
@@ -135,7 +135,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: database_transactions.php");
return;
@@ -158,7 +158,7 @@
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: database_transactions.php");
return;
diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index d4120b937c..adad537f84 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -112,7 +112,7 @@
$cache->delete("dialplan:".$destination_context);
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: destinations.php");
return;
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 7cdca3e9ba..9dd1fadb6a 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -412,10 +412,10 @@
//redirect the user
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']);
}
header("Location: destination_edit.php?id=".$destination_uuid);
return;
diff --git a/app/devices/cmd.php b/app/devices/cmd.php
index dd8958bf09..4708cb15d2 100644
--- a/app/devices/cmd.php
+++ b/app/devices/cmd.php
@@ -80,9 +80,7 @@ else {
}
else {
//send the message
- $_SESSION["message_delay"] = 3500;
- $_SESSION["message_mood"] = 'positive';
- $_SESSION["message"] = $text['button-applied'];
+ messages::add($text['button-applied'], 'positive', 3500);
//send the redirect
if (isset($_SERVER['HTTP_REFERER'])) {
diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php
index fb2197db80..80d49ed73a 100644
--- a/app/devices/device_copy.php
+++ b/app/devices/device_copy.php
@@ -159,7 +159,7 @@
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
$response = $database->message;
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
}
//redirect
diff --git a/app/devices/device_dashboard.php b/app/devices/device_dashboard.php
index 023b1d78c5..7fd5aa7c56 100644
--- a/app/devices/device_dashboard.php
+++ b/app/devices/device_dashboard.php
@@ -279,20 +279,11 @@
}
//set the message
- if (!isset($_SESSION['message'])) {
- //set the message
- if ($action == "add") {
- //save the message to a session variable
- $_SESSION['message'] = $text['message-add'];
- }
- if ($action == "update") {
- //save the message to a session variable
- $_SESSION['message'] = $text['message-update'];
- }
- //redirect the browser
- header("Location: /core/user_settings/user_dashboard.php");
- exit;
- }
+ messages::add($text["message-$action"]);
+
+ //redirect the browser
+ header("Location: /core/user_settings/user_dashboard.php");
+ exit;
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0)
diff --git a/app/devices/device_delete.php b/app/devices/device_delete.php
index efa557d5c4..f6be1b816d 100644
--- a/app/devices/device_delete.php
+++ b/app/devices/device_delete.php
@@ -82,7 +82,7 @@
}
//set the message and redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: devices.php");
return;
diff --git a/app/devices/device_key_delete.php b/app/devices/device_key_delete.php
index 50e817d486..424d6459ab 100644
--- a/app/devices/device_key_delete.php
+++ b/app/devices/device_key_delete.php
@@ -54,7 +54,7 @@ else {
}
//send a redirect
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
if ($device_uuid != '') {
header("Location: device_edit.php?id=".$device_uuid);
}
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 5a1a59b759..50ca33084a 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -123,7 +123,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: device_edit.php?id=".$device_uuid);
return;
} //if ($action == "add")
@@ -142,7 +142,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: device_edit.php?id=".$device_uuid);
return;
} //if ($action == "update")
diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php
index 8f16e42871..67bae51384 100644
--- a/app/devices/device_line_delete.php
+++ b/app/devices/device_line_delete.php
@@ -54,7 +54,7 @@ else {
}
//send a redirect
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: device_edit.php?id=".$device_uuid);
return;
diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php
index fe8e24bd00..842d01483a 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -165,10 +165,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
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']);
}
header("Location: device_edit.php?id=".$device_uuid);
return;
diff --git a/app/devices/device_profile_copy.php b/app/devices/device_profile_copy.php
index b3d34790ed..4384a13381 100644
--- a/app/devices/device_profile_copy.php
+++ b/app/devices/device_profile_copy.php
@@ -115,7 +115,7 @@
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
$response = $database->message;
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
}
//redirect
diff --git a/app/devices/device_profile_delete.php b/app/devices/device_profile_delete.php
index e295e0c890..6c7aeab3b3 100644
--- a/app/devices/device_profile_delete.php
+++ b/app/devices/device_profile_delete.php
@@ -77,7 +77,7 @@
}
//set the message and redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: device_profiles.php");
return;
diff --git a/app/devices/device_setting_delete.php b/app/devices/device_setting_delete.php
index 48b5c2ab44..15c2aaa3b7 100644
--- a/app/devices/device_setting_delete.php
+++ b/app/devices/device_setting_delete.php
@@ -67,13 +67,13 @@ else {
//redirect to device profile
if (is_uuid($device_profile_uuid)) {
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: device_profile_edit.php?id=".$device_profile_uuid);
return;
}
//send a redirect
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: device_edit.php?id=".$device_uuid);
return;
diff --git a/app/devices/device_setting_edit.php b/app/devices/device_setting_edit.php
index fe80e28f07..8bf454fb6f 100644
--- a/app/devices/device_setting_edit.php
+++ b/app/devices/device_setting_edit.php
@@ -126,10 +126,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} //if ($action == "update")
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']);
}
header("Location: device_edit.php?id=".$device_uuid);
return;
diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php
index d17097b69f..ddd32770c4 100644
--- a/app/devices/device_vendor_edit.php
+++ b/app/devices/device_vendor_edit.php
@@ -102,7 +102,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: device_vendors.php");
return;
@@ -117,7 +117,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: device_vendors.php");
return;
diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php
index fa3b2a4bb8..1b539f9ee3 100644
--- a/app/devices/device_vendor_function_edit.php
+++ b/app/devices/device_vendor_function_edit.php
@@ -39,7 +39,7 @@
$sql .= "where device_vendor_function_group_uuid = '".$device_vendor_function_group_uuid."' ";
$db->exec(check_sql($sql));
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: device_vendor_function_edit.php?id=".$device_vendor_function_uuid ."&device_vendor_uuid=".$device_vendor_uuid);
return;
}
diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index 01dd92c5ce..a2faf40f29 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -259,7 +259,7 @@
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php");
return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php
index 95ce232f39..33f1548789 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -150,7 +150,7 @@
save_dialplan_xml();
//send a redirect
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
switch ($app_uuid) {
case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes
case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes
diff --git a/app/dialplan/dialplan_detail_edit.php b/app/dialplan/dialplan_detail_edit.php
index b0fe22cead..264e3b5eb1 100644
--- a/app/dialplan/dialplan_detail_edit.php
+++ b/app/dialplan/dialplan_detail_edit.php
@@ -143,7 +143,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
return;
} //if ($action == "add")
@@ -178,7 +178,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
return;
} //if ($action == "update")
diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php
index 870cf85e69..616acc7eff 100644
--- a/app/dialplan/dialplans.php
+++ b/app/dialplan/dialplans.php
@@ -51,7 +51,7 @@
$sql .= "where dialplan_uuid = '".$dialplan_uuid."'";
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
}
//delete the dialplan context from memcache
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index edcb332291..0758d91a06 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -412,7 +412,7 @@
save_dialplan_xml();
//redirect message
- $_SESSION["message"] = $text['confirm-update-complete'];
+ messages::add($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 c500d00082..9c0a4b99eb 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -655,7 +655,7 @@
save_dialplan_xml();
//redirect the browser
- $_SESSION["message"] = $text['message-update'];
+ messages::add($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)
diff --git a/app/emails/email_cron.php b/app/emails/email_cron.php
index 37ee6a403e..e34822b782 100644
--- a/app/emails/email_cron.php
+++ b/app/emails/email_cron.php
@@ -35,7 +35,7 @@
require_once "secure/v_mailto.php";
if ($mailer_error == '') {
//get the message
- $_SESSION["message"] = $text['message-message_resent'];
+ messages::add($text['message-message_resent']);
//delete the email
$sql = "delete from v_emails ";
diff --git a/app/emails/email_delete.php b/app/emails/email_delete.php
index 26d20ab2b3..4d7672f46e 100644
--- a/app/emails/email_delete.php
+++ b/app/emails/email_delete.php
@@ -52,11 +52,7 @@ else {
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($sql, $prep_statement);
-
- //set message
- if ($_SESSION["message"] == '') {
- $_SESSION["message"] = $text['message-delete'];
- }
+ messages::add($text['message-delete']);
}
//redirect user
diff --git a/app/emails/email_view.php b/app/emails/email_view.php
index 9b5d91c709..81b2b0c2b3 100644
--- a/app/emails/email_view.php
+++ b/app/emails/email_view.php
@@ -66,7 +66,7 @@ else {
}
if (!$msg_found) {
- $_SESSION["message"] = $text['message-invalid_email'];
+ messages::add($text['message-invalid_email']);
header("Location: emails.php");
exit;
}
@@ -121,7 +121,7 @@ else {
}
}
else {
- $_SESSION["message"] = $text['message-decoding_error'].(($mime->error != '') ? ': '.htmlspecialchars($mime->error) : null);
+ messages::add($text['message-decoding_error'].(($mime->error != '') ? ': '.htmlspecialchars($mime->error) : null));
header("Location: emails.php");
exit;
}
diff --git a/app/emails/emails.php b/app/emails/emails.php
index 8b92419bdb..a543197a23 100644
--- a/app/emails/emails.php
+++ b/app/emails/emails.php
@@ -85,7 +85,7 @@ else {
$msg = $email;
require_once "secure/v_mailto.php";
if ($mailer_error == '') {
- $_SESSION["message"] = $text['message-message_resent'];
+ messages::add($text['message-message_resent']);
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
header("Location: email_delete.php?id=".$email_uuid."&showall=true");
} else {
@@ -93,9 +93,7 @@ else {
}
}
else {
- $_SESSION["message_mood"] = 'negative';
- $_SESSION["message_delay"] = '4'; //sec
- $_SESSION["message"] = $text['message-resend_failed'].": ".$mailer_error;
+ messages::add($text['message-resend_failed'].": ".$mailer_error, 'negative', 4000);
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
header("Location: emails.php?showall=true");
} else {
diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index f6eba34dee..089bd65ea1 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -55,8 +55,7 @@
// skip the copy if the domain extension already exists
$extension = new extension;
if ($extension->exists($_SESSION['domain_uuid'], $extension_new)) {
- $_SESSION['message_mood'] = 'negative';
- $_SESSION["message"] = $text['message-duplicate'];
+ messages::add($text['message-duplicate'], 'negative');
header("Location: extensions.php");
return;
}
@@ -237,7 +236,7 @@
}
//redirect the user
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
header("Location: extensions.php");
return;
diff --git a/app/extensions/extension_dashboard.php b/app/extensions/extension_dashboard.php
index 368ae7adab..910678ff90 100644
--- a/app/extensions/extension_dashboard.php
+++ b/app/extensions/extension_dashboard.php
@@ -112,14 +112,11 @@
}
//set the message
- if (!isset($_SESSION['message'])) {
- //save the message to a session variable
- $_SESSION['message'] = $text['message-update'];
+ messages::add($text['message-update']);
- //redirect the browser
- header("Location: /core/user_settings/user_dashboard.php");
- exit;
- }
+ //redirect the browser
+ header("Location: /core/user_settings/user_dashboard.php");
+ exit;
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0)
diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php
index 2a69212deb..a3d14520ed 100644
--- a/app/extensions/extension_delete.php
+++ b/app/extensions/extension_delete.php
@@ -164,7 +164,7 @@
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: extensions.php");
return;
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index cc8f36f249..24a0b6923c 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -546,6 +546,7 @@
//show the action and redirect the user
if ($action == "add") {
+ messages::add($text['message-add']);
//prepare for alternating the row style
$c = 0;
$row_style["0"] = "row_style0";
@@ -554,7 +555,6 @@
//show the action and redirect the user
if (count($generated_users) == 0) {
//action add
- $_SESSION["message"] = $text['message-add'];
header("Location: extension_edit.php?id=".$extension_uuid);
}
else {
@@ -584,12 +584,7 @@
return;
}
if ($action == "update") {
- if ($action == "update") {
- $_SESSION["message"] = $text['message-update'];
- }
- else {
- $_SESSION["message"] = $text['message-add'];
- }
+ messages::add($text['message-update']);
header("Location: extension_edit.php?id=".$extension_uuid);
return;
}
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 500b069fb5..f3e4de56ec 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -139,7 +139,7 @@ else {
unset($sql);
//redirect the user
- $_SESSION["message"] = $text['confirm-copy'];
+ messages::add($text['confirm-copy']);
header("Location: fax.php");
return;
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index 406cbc8cf3..7f2f09af48 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -91,7 +91,7 @@ else {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: fax.php");
return;
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 7dc3a6716c..5fa4efac4b 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -140,7 +140,7 @@
$db->exec(check_sql($sql));
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: fax_edit.php?id=".$fax_uuid);
return;
}
@@ -168,7 +168,7 @@
$db->exec($sql_insert);
//redirect the browser
- $_SESSION["message"] = $text['confirm-add'];
+ messages::add($text['confirm-add']);
header("Location: fax_edit.php?id=".$fax_uuid);
return;
}
@@ -381,10 +381,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//redirect the browser
if ($action == "update" && permission_exists('fax_extension_edit')) {
- $_SESSION["message"] = $text['confirm-update'];
+ messages::add($text['confirm-update']);
}
if ($action == "add" && permission_exists('fax_extension_add')) {
- $_SESSION["message"] = $text['confirm-add'];
+ messages::add($text['confirm-add']);
}
header("Location: fax.php");
return;
diff --git a/app/fax/fax_files_remote.php b/app/fax/fax_files_remote.php
index 325ae40a6a..e1738ebe61 100644
--- a/app/fax/fax_files_remote.php
+++ b/app/fax/fax_files_remote.php
@@ -90,8 +90,7 @@ else {
$fax_email_connection .= "/".(($fax_email_connection_validate == 'false') ? "no" : null)."validate-cert";
$fax_email_connection .= "}".$fax_email_connection_mailbox;
if (!$connection = imap_open($fax_email_connection, $fax_email_connection_username, $fax_email_connection_password)) {
- $_SESSION["message_mood"] = 'negative';
- $_SESSION["message"] = $text['message-cannot_connect']."(".imap_last_error().")";
+ messages::add($text['message-cannot_connect']."(".imap_last_error().")", 'neative');
header("Location: fax.php");
exit;
}
@@ -132,8 +131,7 @@ else {
}
else{
//redirect user
- $_SESSION["message_mood"] = "negative";
- $_SESSION["message"] = $text['message-download_failed'];
+ messages::add($text['message-download_failed'], 'negative');
header("Location: ?id=".$fax_uuid);
exit;
}
@@ -150,23 +148,21 @@ else {
$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name'];
@unlink($fax_dir.'/'.$fax_extension.'/inbox/'.$attachment['name']);
//redirect user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: ?id=".$fax_uuid);
exit;
}
}
else {
//redirect user
- $_SESSION["message_mood"] = "negative";
- $_SESSION["message"] = $text['message-delete_failed'];
+ messages::add($text['message-delete_failed'], 'negative');
header("Location: ?id=".$fax_uuid);
exit;
}
}
else {
//redirect user
- $_SESSION["message_mood"] = "negative";
- $_SESSION["message"] = $text['message-delete_failed'];
+ messages::add($text['message-delete_failed'], 'negative');
header("Location: ?id=".$fax_uuid);
exit;
}
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 8bd3130a81..3ec25dc1e8 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -656,8 +656,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){
else {
if (!$included) {
//nothing to send, redirect the browser
- $_SESSION['message_mood'] = 'negative';
- $_SESSION["message"] = $text['message-invalid-fax'];
+ messages::add($text['message-invalid-fax'], 'negative');
header("Location: fax_send.php?id=".$fax_uuid);
exit;
}
@@ -806,7 +805,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){
if (!$included) {
//redirect the browser
- $_SESSION["message"] = $response;
+ messages::add($response, 'default');
if (permission_exists('fax_active_view')) {
header("Location: fax_active.php?id=".$fax_uuid);
}
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 6a61b10f88..aa2d791265 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -276,7 +276,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$cache->delete("dialplan:".$_SESSION["context"]);
//redirect the user
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=16589224-c876-aeb3-f59f-523a1c0801f7");
return;
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index ecc16b3340..b0fa0fa108 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -156,7 +156,7 @@ else {
save_gateway_xml();
//redirect the user
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
header("Location: gateways.php");
return;
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index 9ae4082682..23a1a6d867 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -113,7 +113,7 @@ if (strlen($_GET["id"])>0) {
}
//redirect the users
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: gateways.php");
return;
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 3a9ee26483..bea6245081 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -274,10 +274,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header("Location: gateways.php");
return;
diff --git a/app/ivr_menus/ivr_menu_copy.php b/app/ivr_menus/ivr_menu_copy.php
index ef67158115..25430fff4c 100644
--- a/app/ivr_menus/ivr_menu_copy.php
+++ b/app/ivr_menus/ivr_menu_copy.php
@@ -169,7 +169,7 @@
}
//redirect the user
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
header("Location: ivr_menus.php");
return;
diff --git a/app/modules/module_delete.php b/app/modules/module_delete.php
index d33efc3099..ee63388c9b 100644
--- a/app/modules/module_delete.php
+++ b/app/modules/module_delete.php
@@ -51,7 +51,7 @@ if (strlen($id)>0) {
unset($sql);
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: modules.php");
return;
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index d9081cabd8..bc2ab37e0a 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -117,7 +117,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$module = new modules;;
$module->xml();
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: modules.php");
return;
} //if ($action == "add")
@@ -138,7 +138,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$module = new modules;;
$module->xml();
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: modules.php");
return;
} //if ($action == "update")
diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php
index 8d2e3087d3..b74f38bf53 100644
--- a/app/music_on_hold/music_on_hold_edit.php
+++ b/app/music_on_hold/music_on_hold_edit.php
@@ -153,7 +153,7 @@
$music->reload();
//set the message and redirect the user
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: music_on_hold.php");
return;
} //if ($action == "add")
@@ -191,7 +191,7 @@
$music->reload();
//set the message and redirect the user
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: music_on_hold.php");
return;
} //if ($action == "update")
diff --git a/app/number_translation/number_translation_delete.php b/app/number_translation/number_translation_delete.php
index d8dc3853fa..d100aba31c 100644
--- a/app/number_translation/number_translation_delete.php
+++ b/app/number_translation/number_translation_delete.php
@@ -93,7 +93,7 @@ if (!permission_exists('number_translation_delete')) {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'].(($number_translations_deleted > 1) ? ": ".$number_translations_deleted : null);
+ messages::add($text['message-delete'].(($number_translations_deleted > 1) ? ": ".$number_translations_deleted : null));
header("Location: ".PROJECT_PATH."/app/number_translation/number_translations.php".(($app_uuid != '') ? "?app_uuid=".$app_uuid : null));
?>
\ No newline at end of file
diff --git a/app/number_translation/number_translation_detail_delete.php b/app/number_translation/number_translation_detail_delete.php
index f6957e0729..7cd47bfea1 100644
--- a/app/number_translation/number_translation_detail_delete.php
+++ b/app/number_translation/number_translation_detail_delete.php
@@ -59,7 +59,7 @@
}
//save the message to a session variable
- $_SESSION['message'] = $text['message-delete'];
+ messages::add($text['message-delete']);
//redirect the browser
header("Location: number_translation_edit.php?id=$number_translation_uuid");
diff --git a/app/number_translation/number_translation_edit.php b/app/number_translation/number_translation_edit.php
index f0587f3332..60ee86ac97 100644
--- a/app/number_translation/number_translation_edit.php
+++ b/app/number_translation/number_translation_edit.php
@@ -142,10 +142,10 @@
//set the message
if ($action == "add") {
- $_SESSION['message'] = $text['message-add'];
+ messages::add($text['message-add']);
}
else if ($action == "update") {
- $_SESSION['message'] = $text['message-update'];
+ messages::add($text['message-update']);
}
header("Location: ?id=$number_translation_uuid");
exit;
diff --git a/app/phrases/phrase_delete.php b/app/phrases/phrase_delete.php
index 449b4d5b59..a2300a74e0 100644
--- a/app/phrases/phrase_delete.php
+++ b/app/phrases/phrase_delete.php
@@ -65,7 +65,7 @@ if ($phrase_uuid != '') {
save_phrases_xml();
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: phrases.php");
return;
?>
\ No newline at end of file
diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php
index bd941adcca..37bc50c20b 100644
--- a/app/phrases/phrase_edit.php
+++ b/app/phrases/phrase_edit.php
@@ -170,7 +170,7 @@
}
//send a redirect
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: phrase_edit.php?id=".$phrase_uuid);
return;
} //if ($action == "add")
@@ -239,7 +239,7 @@
}
//send a redirect
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: phrase_edit.php?id=".$phrase_uuid);
return;
diff --git a/app/pin_numbers/pin_number_edit.php b/app/pin_numbers/pin_number_edit.php
index 987ff7e03f..88573ccc8a 100644
--- a/app/pin_numbers/pin_number_edit.php
+++ b/app/pin_numbers/pin_number_edit.php
@@ -108,7 +108,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: pin_numbers.php");
return;
@@ -125,7 +125,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: pin_numbers.php");
return;
diff --git a/app/recordings/recording_delete.php b/app/recordings/recording_delete.php
index 9738b8756a..5b055164f6 100644
--- a/app/recordings/recording_delete.php
+++ b/app/recordings/recording_delete.php
@@ -72,7 +72,7 @@ if (strlen($id)>0) {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: recordings.php");
return;
?>
\ No newline at end of file
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index e4b6bc6187..a766edea4e 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -97,7 +97,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: recordings.php");
return;
} //if (permission_exists('recording_edit')) {
diff --git a/app/ring_groups/ring_group_delete.php b/app/ring_groups/ring_group_delete.php
index cfd2d237fc..003ab7eef5 100644
--- a/app/ring_groups/ring_group_delete.php
+++ b/app/ring_groups/ring_group_delete.php
@@ -106,7 +106,7 @@ else {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: ring_groups.php");
return;
diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php
index 204d769598..814d0411ec 100644
--- a/app/ring_groups/ring_group_destination_edit.php
+++ b/app/ring_groups/ring_group_destination_edit.php
@@ -132,7 +132,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: ring_group_edit.php?id=".$ring_group_uuid);
return;
} //if ($action == "add")
@@ -153,7 +153,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: ring_group_edit.php?id=".$ring_group_uuid);
return;
} //if ($action == "update")
diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 4d78f74b63..e3be2abdcc 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -69,7 +69,7 @@
unset($sql);
}
//redirect the user
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: ".$_REQUEST['return_url']);
exit;
}
diff --git a/app/services/service_delete.php b/app/services/service_delete.php
index 7493d30125..18061136ba 100644
--- a/app/services/service_delete.php
+++ b/app/services/service_delete.php
@@ -53,7 +53,7 @@ else {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: services.php");
return;
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index 75209fdb5c..2b3d1649a2 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -115,7 +115,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: services.php");
return;
} //if ($action == "add")
@@ -133,7 +133,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: services.php");
return;
} //if ($action == "update")
diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php
index ad35ec7a51..e76381589d 100644
--- a/app/settings/setting_edit.php
+++ b/app/settings/setting_edit.php
@@ -141,7 +141,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//synchronize settings
save_setting_xml();
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: setting_edit.php");
return;
} //if ($action == "add")
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//synchronize settings
save_setting_xml();
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: setting_edit.php");
return;
} //if ($action == "update")
diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php
index 08fb0bb7bf..a88a992fd8 100644
--- a/app/sip_profiles/sip_profile_copy.php
+++ b/app/sip_profiles/sip_profile_copy.php
@@ -161,7 +161,7 @@
$_SESSION["reload_xml"] = true;
//redirect the user
- $_SESSION["message"] = $text['message-copy'];
+ messages::add($text['message-copy']);
header("Location: ".PROJECT_PATH."/app/sip_profiles/sip_profiles.php");
return;
diff --git a/app/sip_profiles/sip_profile_delete.php b/app/sip_profiles/sip_profile_delete.php
index 1baf1bc19e..34ca185228 100644
--- a/app/sip_profiles/sip_profile_delete.php
+++ b/app/sip_profiles/sip_profile_delete.php
@@ -109,7 +109,7 @@
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: sip_profiles.php");
return;
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 02e8fffa03..1dbe239a3b 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -161,7 +161,7 @@
$cache->delete("configuration:sofia.conf:".$sip_profile_hostname);
//redirect the browser
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: sip_profiles.php");
//save the sip profile xml
@@ -172,10 +172,10 @@
//redirect the user
if (isset($action)) {
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']);
}
header('Location: sip_profile_edit.php?id='.$sip_profile_uuid);
return;
diff --git a/app/sip_profiles/sip_profile_setting_delete.php b/app/sip_profiles/sip_profile_setting_delete.php
index 2a660cfca0..a753b1c7fc 100644
--- a/app/sip_profiles/sip_profile_setting_delete.php
+++ b/app/sip_profiles/sip_profile_setting_delete.php
@@ -59,7 +59,7 @@ if (strlen($id)>0) {
}
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: sip_profile_edit.php?id=".$sip_profile_uuid);
return;
diff --git a/app/sip_profiles/sip_profile_setting_edit.php b/app/sip_profiles/sip_profile_setting_edit.php
index fe2fbb396e..44e03b6b7b 100644
--- a/app/sip_profiles/sip_profile_setting_edit.php
+++ b/app/sip_profiles/sip_profile_setting_edit.php
@@ -116,7 +116,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$_SESSION["reload_xml"] = true;
//redirect the browser
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: sip_profile_edit.php?id=".$sip_profile_uuid);
return;
} //if ($action == "add")
@@ -140,7 +140,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$_SESSION["reload_xml"] = true;
//redirect the browser
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: sip_profile_edit.php?id=".$sip_profile_uuid);
return;
} //if ($action == "update")
diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php
index 67fc7d813b..ab5f364332 100644
--- a/app/time_conditions/time_conditions.php
+++ b/app/time_conditions/time_conditions.php
@@ -52,7 +52,7 @@
$sql .= "and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' ";
$db->exec(check_sql($sql));
unset($sql);
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
}
//set the http values as php variables
diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php
index 0cf585f2da..9250401792 100644
--- a/app/vars/var_delete.php
+++ b/app/vars/var_delete.php
@@ -55,7 +55,7 @@ else {
}
-$_SESSION["message"] = $text['message-delete'];
+messages::add($text['message-delete']);
header("Location: vars.php");
return;
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 6900123b03..88bcc719a3 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -128,7 +128,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//synchronize the configuration
save_var_xml();
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
header("Location: vars.php");
return;
} //if ($action == "add")
@@ -158,7 +158,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//synchronize the configuration
save_var_xml();
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: vars.php");
return;
} //if ($action == "update")
diff --git a/app/vars/vars.php b/app/vars/vars.php
index 1a22ffb7c2..61bcbf28b6 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -52,7 +52,7 @@ else {
//synchronize the configuration
save_var_xml();
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: vars.php?id=".$_REQUEST['id']);
exit;
}
diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php
index a5cbe320de..e70a886503 100644
--- a/app/voicemail_greetings/voicemail_greeting_delete.php
+++ b/app/voicemail_greetings/voicemail_greeting_delete.php
@@ -77,7 +77,7 @@ if (strlen($voicemail_greeting_uuid) > 0) {
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: voicemail_greetings.php?id=".$voicemail_id);
return;
?>
\ No newline at end of file
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 033db6cc0e..8f69ae4bff 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -86,7 +86,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
//redirect the user
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: voicemail_greetings.php?id=".$voicemail_id);
return;
} //if (permission_exists('voicemail_greeting_edit')) {
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 96a1cb77ae..add4a6362b 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -169,7 +169,7 @@ require_once "resources/check_auth.php";
$prep_statement->execute();
unset($prep_statement);
- $_SESSION["message"] = $text['message-uploaded'].": ".$_FILES['file']['name'];
+ messages::add($text['message-uploaded'].": ".$_FILES['file']['name']);
break;
}
else {
@@ -208,7 +208,7 @@ require_once "resources/check_auth.php";
$prep_statement->execute();
unset($prep_statement);
- $_SESSION["message"] = $text['message-greeting_selected'];
+ messages::add($text['message-greeting_selected']);
header("Location: voicemail_greetings.php?id=".$voicemail_id."&order_by=".$order_by."&order=".$order);
exit;
}
diff --git a/app/voicemails/voicemail_delete.php b/app/voicemails/voicemail_delete.php
index d2c2ddb565..4d9233bd26 100644
--- a/app/voicemails/voicemail_delete.php
+++ b/app/voicemails/voicemail_delete.php
@@ -62,7 +62,7 @@
}
//redirect the user
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: voicemails.php");
return;
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index c9b0834112..234c6047b1 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -88,7 +88,7 @@
d.voicemail_uuid = '".$voicemail_uuid."'";
$db->exec(check_sql($sqld));
//redirect the browser
- $_SESSION["message"] = $text['message-delete'];
+ messages::add($text['message-delete']);
header("Location: voicemail_edit.php?id=".$voicemail_uuid);
return;
}
@@ -116,7 +116,7 @@
)";
$db->exec(check_sql($sqli));
//redirect the browser
- $_SESSION["message"] = $text['message-add'];
+ messages::add($text['message-add']);
}
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
@@ -180,7 +180,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']);
} //if ($action == "add")
if ($action == "update" && permission_exists('voicemail_edit')) {
@@ -202,7 +202,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']);
} //if ($action == "update")
diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php
index d056796055..9d8704cb57 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -125,7 +125,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: voicemail_edit.php?id=".$voicemail_uuid);
return;
} //if ($action == "add")
@@ -146,7 +146,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: voicemail_edit.php?id=".$voicemail_uuid);
return;
} //if ($action == "update")
diff --git a/core/apps/apps_delete.php b/core/apps/apps_delete.php
index 19417c4837..138c7e2da7 100644
--- a/core/apps/apps_delete.php
+++ b/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;
diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php
index b8072e3a5f..101d44be40 100644
--- a/core/apps/apps_edit.php
+++ b/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")
diff --git a/core/databases/database_delete.php b/core/databases/database_delete.php
index a451f3ae8f..a6fed78ec5 100644
--- a/core/databases/database_delete.php
+++ b/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;
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index b6870e77de..652865dbd1 100644
--- a/core/databases/database_edit.php
+++ b/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")
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 53891d9aff..aea2de6289 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/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")
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 87557f9219..c565cb6a1f 100644
--- a/core/default_settings/default_settings.php
+++ b/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));
diff --git a/core/default_settings/default_settings_reload.php b/core/default_settings/default_settings_reload.php
index ad1668fe17..00551980da 100644
--- a/core/default_settings/default_settings_reload.php
+++ b/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));
?>
\ No newline at end of file
diff --git a/core/domain_settings/domain_delete.php b/core/domain_settings/domain_delete.php
index e652424f76..58e437fb2b 100644
--- a/core/domain_settings/domain_delete.php
+++ b/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;
diff --git a/core/domain_settings/domain_edit.php b/core/domain_settings/domain_edit.php
index b36ec4a8c3..5fc03c4a77 100644
--- a/core/domain_settings/domain_edit.php
+++ b/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;
diff --git a/core/domain_settings/domain_setting_delete.php b/core/domain_settings/domain_setting_delete.php
index 306ec8f829..dcd3e2ec18 100644
--- a/core/domain_settings/domain_setting_delete.php
+++ b/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;
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 8ad1e7b916..08c5fbd2dc 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/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;
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 424a842b4e..7e0a6ac5b3 100644
--- a/core/domain_settings/domain_settings.php
+++ b/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"]));
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index 1c014f13f5..077b09a611 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -314,7 +314,7 @@
}
}
- $_SESSION["message"] = $text['message-update'];
+ messages::add($text['message-update']);
header("Location: groups.php");
return;
}
diff --git a/core/groups/groupadd.php b/core/groups/groupadd.php
index 237e99407f..71b65b2a42 100644
--- a/core/groups/groupadd.php
+++ b/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");
}
diff --git a/core/groups/groupdelete.php b/core/groups/groupdelete.php
index b2c45ccd4f..d20cd9d6a7 100644
--- a/core/groups/groupdelete.php
+++ b/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");
?>
\ No newline at end of file
diff --git a/core/groups/groupedit.php b/core/groups/groupedit.php
index 495d1c770c..1ef25ba4e8 100644
--- a/core/groups/groupedit.php
+++ b/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);
}
diff --git a/core/groups/groupmemberadd.php b/core/groups/groupmemberadd.php
index dedc837ec9..1187cc24aa 100644
--- a/core/groups/groupmemberadd.php
+++ b/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);
?>
\ No newline at end of file
diff --git a/core/groups/groupmemberdelete.php b/core/groups/groupmemberdelete.php
index 5c23dc636a..8cfe4d5bae 100644
--- a/core/groups/groupmemberdelete.php
+++ b/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);
?>
\ No newline at end of file
diff --git a/core/groups/groups.php b/core/groups/groups.php
index be6b42c3c8..15332dfa96 100644
--- a/core/groups/groups.php
+++ b/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
diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php
index 0d66859558..5781cde481 100644
--- a/core/groups/permissions_copy.php
+++ b/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
diff --git a/core/groups/permissions_default.php b/core/groups/permissions_default.php
index e47a4d2dc3..f6b9f421c6 100644
--- a/core/groups/permissions_default.php
+++ b/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;
}
diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php
index 3582756d9c..dad1e3dd6b 100644
--- a/core/menu/menu_delete.php
+++ b/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;
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 7bde4418b6..8fcc59a53c 100644
--- a/core/menu/menu_edit.php
+++ b/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")
diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php
index 899896e8ee..d2f2b85aaf 100644
--- a/core/menu/menu_item_delete.php
+++ b/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;
}
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index d6c188903e..71da7e1b09 100644
--- a/core/menu/menu_item_edit.php
+++ b/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
diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php
index c248b6ca24..7728001a95 100644
--- a/core/menu/menu_item_move_down.php
+++ b/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;
}
diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php
index b845680af4..9529c3cdc5 100644
--- a/core/menu/menu_item_move_up.php
+++ b/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;
}
diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php
index 745678f862..367e3c8161 100644
--- a/core/menu/menu_restore_default.php
+++ b/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;
}
diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php
index 5c6402c9df..b9407192cd 100644
--- a/core/notifications/notification_edit.php
+++ b/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");
diff --git a/core/users/user_delete.php b/core/users/user_delete.php
index 7a7b08342c..110f313cfc 100644
--- a/core/users/user_delete.php
+++ b/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");
?>
\ No newline at end of file
diff --git a/core/users/user_setting_delete.php b/core/users/user_setting_delete.php
index 906aeffa76..22abbd3d21 100644
--- a/core/users/user_setting_delete.php
+++ b/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"]));
diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php
index 69592ea16a..41552b5d07 100644
--- a/core/users/user_setting_edit.php
+++ b/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;
diff --git a/core/users/user_settings.php b/core/users/user_settings.php
index 97ee030c17..e45ead696e 100644
--- a/core/users/user_settings.php
+++ b/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;
}
diff --git a/resources/functions.php b/resources/functions.php
index f5c165b264..cedab5efdc 100644
--- a/resources/functions.php
+++ b/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 {