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

convert more messages over to messsagse::add
This commit is contained in:
Mafoo 2017-06-10 03:13:40 +01:00 committed by FusionPBX
parent bc26ecf6ae
commit 3cab4401cf
153 changed files with 249 additions and 293 deletions

View File

@ -79,7 +79,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf'); remove_config_from_cache('configuration:acl.conf');
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: access_controls.php"); header("Location: access_controls.php");
return; return;
@ -95,7 +95,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql); unset($sql);
remove_config_from_cache('configuration:acl.conf'); remove_config_from_cache('configuration:acl.conf');
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: access_controls.php"); header("Location: access_controls.php");
return; return;

View File

@ -81,16 +81,14 @@ else {
} }
else { else {
//set response message //set response message
$_SESSION["message"] = $text['message-backup_failed_format'] . $response_txt; messages::add($text['message-backup_failed_format'] . $response_txt, 'negative');
$_SESSION['message_mood'] = 'negative';
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} }
} }
else { else {
//set response message //set response message
$_SESSION["message"] = $text['message-backup_failed_paths']; messages::add($text['message-backup_failed_paths'], 'negative');
$_SESSION['message_mood'] = 'negative';
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -126,8 +124,7 @@ else {
} }
if (!$valid_format) { if (!$valid_format) {
@unlink($backup_path.'/'.$backup_file); @unlink($backup_path.'/'.$backup_file);
$_SESSION["message"] = $text['message-restore_failed_format']; messages::add($text['message-restore_failed_format'], 'negative');
$_SESSION['message_mood'] = 'negative';
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -137,12 +134,11 @@ else {
$response_txt = "<br>" . implode("<br>", $response); $response_txt = "<br>" . implode("<br>", $response);
if ($restore_errlevel == 0) { if ($restore_errlevel == 0) {
//set response message //set response message
$_SESSION["message"] = $text['message-restore_completed']; messages::add($text['message-restore_completed']);
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} else { } else {
$_SESSION["message"] = $text['message-restore_failed_extract'] . $response_txt; messages::add($text['message-restore_failed_extract'] . $response_txt, 'negative');
$_SESSION['message_mood'] = 'negative';
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} }
@ -150,8 +146,7 @@ else {
} }
else { else {
//set response message //set response message
$_SESSION["message"] = $text['message-restore_failed_upload']; messages::add($text['message-restore_failed_upload'], 'negative');
$_SESSION['message_mood'] = 'negative';
header("Location: ".$_SERVER['PHP_SELF']); header("Location: ".$_SERVER['PHP_SELF']);
exit; exit;
} }

View File

@ -102,7 +102,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['label-add-complete']; messages::add($text['label-add-complete']);
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -93,7 +93,7 @@
remove_config_from_cache('configuration:callcenter.conf'); remove_config_from_cache('configuration:callcenter.conf');
//redirect the browser //redirect the browser
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: call_center_agents.php"); header("Location: call_center_agents.php");
return; return;

View File

@ -247,10 +247,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: call_center_agents.php"); header("Location: call_center_agents.php");
return; return;

View File

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

View File

@ -289,10 +289,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
} }

View File

@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} }
unset($prep_statement); unset($prep_statement);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: call_center_queue_edit.php?id=".$queue_uuid); header("Location: call_center_queue_edit.php?id=".$queue_uuid);
return; return;

View File

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

View File

@ -238,10 +238,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: call_flows.php"); header("Location: call_flows.php");
return; return;

View File

@ -342,7 +342,7 @@
} }
//redirect the user //redirect the user
$_SESSION["message"] = $text['confirm-update']; messages::add($text['confirm-update']);
header("Location: ".$_REQUEST['return_url']); header("Location: ".$_REQUEST['return_url']);
return; return;

View File

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

View File

@ -177,10 +177,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: conference_centers.php"); header("Location: conference_centers.php");
return; return;

View File

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

View File

@ -154,7 +154,7 @@ else {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: conference_room_edit.php?id=".$conference_room_uuid); header("Location: conference_room_edit.php?id=".$conference_room_uuid);
return; return;
} }
@ -343,7 +343,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} //if ($action == "add") } //if ($action == "add")
if ($action == "update" && permission_exists('conference_room_edit')) { 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)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} //if ($action == "update") } //if ($action == "update")
//assign the user to the meeting //assign the user to the meeting
@ -433,7 +433,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
header("Location: conference_room_edit.php?id=".$conference_room_uuid); header("Location: conference_room_edit.php?id=".$conference_room_uuid);

View File

@ -92,7 +92,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header('Location: conference_control_edit.php?id='.$conference_control_uuid); header('Location: conference_control_edit.php?id='.$conference_control_uuid);
return; return;
@ -110,7 +110,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header('Location: conference_control_edit.php?id='.$conference_control_uuid); header('Location: conference_control_edit.php?id='.$conference_control_uuid);
return; return;

View File

@ -82,10 +82,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: conference_controls.php"); header("Location: conference_controls.php");
return; return;

View File

@ -81,7 +81,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: conference_profiles.php"); header("Location: conference_profiles.php");
return; return;
@ -97,7 +97,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: conference_profiles.php"); header("Location: conference_profiles.php");
return; return;

View File

@ -93,7 +93,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header('Location: conference_profile_edit.php?id='.$conference_profile_uuid); header('Location: conference_profile_edit.php?id='.$conference_profile_uuid);
return; return;
@ -111,7 +111,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header('Location: conference_profile_edit.php?id='.$conference_profile_uuid); header('Location: conference_profile_edit.php?id='.$conference_profile_uuid);
return; return;

View File

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

View File

@ -80,7 +80,7 @@
$sql .= "and user_uuid = '".$user_uuid."' "; $sql .= "and user_uuid = '".$user_uuid."' ";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
$_SESSION["message"] = $text['confirm-delete']; messages::add($text['confirm-delete']);
header("Location: conference_edit.php?id=".$conference_uuid); header("Location: conference_edit.php?id=".$conference_uuid);
return; return;
} }
@ -107,7 +107,7 @@
$sql_insert .= ")"; $sql_insert .= ")";
$db->exec($sql_insert); $db->exec($sql_insert);
//send a message //send a message
$_SESSION["message"] = $text['confirm-add']; messages::add($text['confirm-add']);
header("Location: conference_edit.php?id=".$conference_uuid); header("Location: conference_edit.php?id=".$conference_uuid);
return; 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); 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 //add the message
$_SESSION["message"] = $text['confirm-add']; messages::add($text['confirm-add']);
} //if ($action == "add") } //if ($action == "add")
if ($action == "update") { if ($action == "update") {
@ -273,7 +273,7 @@
$db->query($sql); $db->query($sql);
//add the message //add the message
$_SESSION["message"] = $text['confirm-update']; messages::add($text['confirm-update']);
} //if ($action == "update") } //if ($action == "update")
//update the dialplan xml //update the dialplan xml

View File

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

View File

@ -161,7 +161,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -187,7 +187,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -132,7 +132,7 @@ if (strlen($contact_uuid) > 0) {
} }
if (!$included) { if (!$included) {
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contacts.php"); header("Location: contacts.php");
return; return;
} }

View File

@ -150,7 +150,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
$location = "contact_edit.php?id=".$contact_uuid; $location = "contact_edit.php?id=".$contact_uuid;
} //if ($action == "add") } //if ($action == "add")
@ -177,7 +177,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
$location = "contact_edit.php?id=".$contact_uuid; $location = "contact_edit.php?id=".$contact_uuid;
} //if ($action == "update") } //if ($action == "update")

View File

@ -52,7 +52,7 @@ if (strlen($id)>0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;

View File

@ -133,7 +133,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -150,7 +150,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -57,7 +57,7 @@ else {
//redirect the browser //redirect the browser
if (!$included) { if (!$included) {
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} }

View File

@ -333,8 +333,7 @@ if ($_POST['a'] == 'import') {
else { else {
// no contacts imported // no contacts imported
$_SESSION['message_mood'] = 'negative'; messages::add($text['message-contacts_imported']." ".$contacts_imported, 'negative');
$_SESSION["message"] = $text['message-contacts_imported']." ".$contacts_imported;
} }
} }

View File

@ -52,7 +52,7 @@ if (strlen($id)>0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;

View File

@ -117,7 +117,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -134,7 +134,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

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

View File

@ -159,7 +159,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -182,7 +182,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -53,7 +53,7 @@ if (strlen($id)>0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;

View File

@ -145,7 +145,7 @@ else {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -159,7 +159,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

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

View File

@ -162,10 +162,10 @@ else {
//redirect the browser //redirect the browser
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;

View File

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

View File

@ -119,7 +119,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -138,7 +138,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -54,7 +54,7 @@ if (strlen($id)>0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;

View File

@ -134,7 +134,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -151,7 +151,7 @@ else {
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -57,7 +57,7 @@ else {
//redirect the browser //redirect the browser
if (!$included) { if (!$included) {
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: contact_edit.php?id=".$contact_uuid); header("Location: contact_edit.php?id=".$contact_uuid);
return; return;
} }

View File

@ -135,7 +135,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: database_transactions.php"); header("Location: database_transactions.php");
return; return;
@ -158,7 +158,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: database_transactions.php"); header("Location: database_transactions.php");
return; return;

View File

@ -112,7 +112,7 @@
$cache->delete("dialplan:".$destination_context); $cache->delete("dialplan:".$destination_context);
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: destinations.php"); header("Location: destinations.php");
return; return;

View File

@ -412,10 +412,10 @@
//redirect the user //redirect the user
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: destination_edit.php?id=".$destination_uuid); header("Location: destination_edit.php?id=".$destination_uuid);
return; return;

View File

@ -80,9 +80,7 @@ else {
} }
else { else {
//send the message //send the message
$_SESSION["message_delay"] = 3500; messages::add($text['button-applied'], 'positive', 3500);
$_SESSION["message_mood"] = 'positive';
$_SESSION["message"] = $text['button-applied'];
//send the redirect //send the redirect
if (isset($_SERVER['HTTP_REFERER'])) { if (isset($_SERVER['HTTP_REFERER'])) {

View File

@ -159,7 +159,7 @@
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array); $database->save($array);
$response = $database->message; $response = $database->message;
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
} }
//redirect //redirect

View File

@ -279,20 +279,11 @@
} }
//set the message //set the message
if (!isset($_SESSION['message'])) { messages::add($text["message-$action"]);
//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 //redirect the browser
header("Location: /core/user_settings/user_dashboard.php"); header("Location: /core/user_settings/user_dashboard.php");
exit; exit;
}
} //if ($_POST["persistformvar"] != "true") } //if ($_POST["persistformvar"] != "true")
} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) } //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0)

View File

@ -82,7 +82,7 @@
} }
//set the message and redirect the user //set the message and redirect the user
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: devices.php"); header("Location: devices.php");
return; return;

View File

@ -54,7 +54,7 @@ else {
} }
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
if ($device_uuid != '') { if ($device_uuid != '') {
header("Location: device_edit.php?id=".$device_uuid); header("Location: device_edit.php?id=".$device_uuid);
} }

View File

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

View File

@ -54,7 +54,7 @@ else {
} }
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: device_edit.php?id=".$device_uuid); header("Location: device_edit.php?id=".$device_uuid);
return; return;

View File

@ -165,10 +165,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: device_edit.php?id=".$device_uuid); header("Location: device_edit.php?id=".$device_uuid);
return; return;

View File

@ -115,7 +115,7 @@
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array); $database->save($array);
$response = $database->message; $response = $database->message;
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
} }
//redirect //redirect

View File

@ -77,7 +77,7 @@
} }
//set the message and redirect the user //set the message and redirect the user
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: device_profiles.php"); header("Location: device_profiles.php");
return; return;

View File

@ -67,13 +67,13 @@ else {
//redirect to device profile //redirect to device profile
if (is_uuid($device_profile_uuid)) { 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); header("Location: device_profile_edit.php?id=".$device_profile_uuid);
return; return;
} }
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: device_edit.php?id=".$device_uuid); header("Location: device_edit.php?id=".$device_uuid);
return; return;

View File

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

View File

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

View File

@ -39,7 +39,7 @@
$sql .= "where device_vendor_function_group_uuid = '".$device_vendor_function_group_uuid."' "; $sql .= "where device_vendor_function_group_uuid = '".$device_vendor_function_group_uuid."' ";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
//redirect the browser //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); header("Location: device_vendor_function_edit.php?id=".$device_vendor_function_uuid ."&device_vendor_uuid=".$device_vendor_uuid);
return; return;
} }

View File

@ -259,7 +259,7 @@
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $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"); header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php");
return; return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

View File

@ -150,7 +150,7 @@
save_dialplan_xml(); save_dialplan_xml();
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
switch ($app_uuid) { switch ($app_uuid) {
case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes
case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes

View File

@ -143,7 +143,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $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); header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -178,7 +178,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $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); header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid);
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -51,7 +51,7 @@
$sql .= "where dialplan_uuid = '".$dialplan_uuid."'"; $sql .= "where dialplan_uuid = '".$dialplan_uuid."'";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
//delete the dialplan context from memcache //delete the dialplan context from memcache

View File

@ -412,7 +412,7 @@
save_dialplan_xml(); save_dialplan_xml();
//redirect message //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"); header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4");
return; return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

View File

@ -655,7 +655,7 @@
save_dialplan_xml(); save_dialplan_xml();
//redirect the browser //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"); header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3");
return; return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

View File

@ -35,7 +35,7 @@
require_once "secure/v_mailto.php"; require_once "secure/v_mailto.php";
if ($mailer_error == '') { if ($mailer_error == '') {
//get the message //get the message
$_SESSION["message"] = $text['message-message_resent']; messages::add($text['message-message_resent']);
//delete the email //delete the email
$sql = "delete from v_emails "; $sql = "delete from v_emails ";

View File

@ -52,11 +52,7 @@ else {
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
unset($sql, $prep_statement); unset($sql, $prep_statement);
messages::add($text['message-delete']);
//set message
if ($_SESSION["message"] == '') {
$_SESSION["message"] = $text['message-delete'];
}
} }
//redirect user //redirect user

View File

@ -66,7 +66,7 @@ else {
} }
if (!$msg_found) { if (!$msg_found) {
$_SESSION["message"] = $text['message-invalid_email']; messages::add($text['message-invalid_email']);
header("Location: emails.php"); header("Location: emails.php");
exit; exit;
} }
@ -121,7 +121,7 @@ else {
} }
} }
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"); header("Location: emails.php");
exit; exit;
} }

View File

@ -85,7 +85,7 @@ else {
$msg = $email; $msg = $email;
require_once "secure/v_mailto.php"; require_once "secure/v_mailto.php";
if ($mailer_error == '') { if ($mailer_error == '') {
$_SESSION["message"] = $text['message-message_resent']; messages::add($text['message-message_resent']);
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') { if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
header("Location: email_delete.php?id=".$email_uuid."&showall=true"); header("Location: email_delete.php?id=".$email_uuid."&showall=true");
} else { } else {
@ -93,9 +93,7 @@ else {
} }
} }
else { else {
$_SESSION["message_mood"] = 'negative'; messages::add($text['message-resend_failed'].": ".$mailer_error, 'negative', 4000);
$_SESSION["message_delay"] = '4'; //sec
$_SESSION["message"] = $text['message-resend_failed'].": ".$mailer_error;
if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') { if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') {
header("Location: emails.php?showall=true"); header("Location: emails.php?showall=true");
} else { } else {

View File

@ -55,8 +55,7 @@
// skip the copy if the domain extension already exists // skip the copy if the domain extension already exists
$extension = new extension; $extension = new extension;
if ($extension->exists($_SESSION['domain_uuid'], $extension_new)) { if ($extension->exists($_SESSION['domain_uuid'], $extension_new)) {
$_SESSION['message_mood'] = 'negative'; messages::add($text['message-duplicate'], 'negative');
$_SESSION["message"] = $text['message-duplicate'];
header("Location: extensions.php"); header("Location: extensions.php");
return; return;
} }
@ -237,7 +236,7 @@
} }
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
header("Location: extensions.php"); header("Location: extensions.php");
return; return;

View File

@ -112,14 +112,11 @@
} }
//set the message //set the message
if (!isset($_SESSION['message'])) { messages::add($text['message-update']);
//save the message to a session variable
$_SESSION['message'] = $text['message-update'];
//redirect the browser //redirect the browser
header("Location: /core/user_settings/user_dashboard.php"); header("Location: /core/user_settings/user_dashboard.php");
exit; exit;
}
} //if ($_POST["persistformvar"] != "true") } //if ($_POST["persistformvar"] != "true")
} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) } //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0)

View File

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

View File

@ -546,6 +546,7 @@
//show the action and redirect the user //show the action and redirect the user
if ($action == "add") { if ($action == "add") {
messages::add($text['message-add']);
//prepare for alternating the row style //prepare for alternating the row style
$c = 0; $c = 0;
$row_style["0"] = "row_style0"; $row_style["0"] = "row_style0";
@ -554,7 +555,6 @@
//show the action and redirect the user //show the action and redirect the user
if (count($generated_users) == 0) { if (count($generated_users) == 0) {
//action add //action add
$_SESSION["message"] = $text['message-add'];
header("Location: extension_edit.php?id=".$extension_uuid); header("Location: extension_edit.php?id=".$extension_uuid);
} }
else { else {
@ -584,12 +584,7 @@
return; return;
} }
if ($action == "update") { if ($action == "update") {
if ($action == "update") { messages::add($text['message-update']);
$_SESSION["message"] = $text['message-update'];
}
else {
$_SESSION["message"] = $text['message-add'];
}
header("Location: extension_edit.php?id=".$extension_uuid); header("Location: extension_edit.php?id=".$extension_uuid);
return; return;
} }

View File

@ -139,7 +139,7 @@ else {
unset($sql); unset($sql);
//redirect the user //redirect the user
$_SESSION["message"] = $text['confirm-copy']; messages::add($text['confirm-copy']);
header("Location: fax.php"); header("Location: fax.php");
return; return;

View File

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

View File

@ -140,7 +140,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
//redirect the browser //redirect the browser
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: fax_edit.php?id=".$fax_uuid); header("Location: fax_edit.php?id=".$fax_uuid);
return; return;
} }
@ -168,7 +168,7 @@
$db->exec($sql_insert); $db->exec($sql_insert);
//redirect the browser //redirect the browser
$_SESSION["message"] = $text['confirm-add']; messages::add($text['confirm-add']);
header("Location: fax_edit.php?id=".$fax_uuid); header("Location: fax_edit.php?id=".$fax_uuid);
return; return;
} }
@ -381,10 +381,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//redirect the browser //redirect the browser
if ($action == "update" && permission_exists('fax_extension_edit')) { 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')) { if ($action == "add" && permission_exists('fax_extension_add')) {
$_SESSION["message"] = $text['confirm-add']; messages::add($text['confirm-add']);
} }
header("Location: fax.php"); header("Location: fax.php");
return; return;

View File

@ -90,8 +90,7 @@ else {
$fax_email_connection .= "/".(($fax_email_connection_validate == 'false') ? "no" : null)."validate-cert"; $fax_email_connection .= "/".(($fax_email_connection_validate == 'false') ? "no" : null)."validate-cert";
$fax_email_connection .= "}".$fax_email_connection_mailbox; $fax_email_connection .= "}".$fax_email_connection_mailbox;
if (!$connection = imap_open($fax_email_connection, $fax_email_connection_username, $fax_email_connection_password)) { if (!$connection = imap_open($fax_email_connection, $fax_email_connection_username, $fax_email_connection_password)) {
$_SESSION["message_mood"] = 'negative'; messages::add($text['message-cannot_connect']."(".imap_last_error().")", 'neative');
$_SESSION["message"] = $text['message-cannot_connect']."(".imap_last_error().")";
header("Location: fax.php"); header("Location: fax.php");
exit; exit;
} }
@ -132,8 +131,7 @@ else {
} }
else{ else{
//redirect user //redirect user
$_SESSION["message_mood"] = "negative"; messages::add($text['message-download_failed'], 'negative');
$_SESSION["message"] = $text['message-download_failed'];
header("Location: ?id=".$fax_uuid); header("Location: ?id=".$fax_uuid);
exit; exit;
} }
@ -150,23 +148,21 @@ else {
$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name']; $fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name'];
@unlink($fax_dir.'/'.$fax_extension.'/inbox/'.$attachment['name']); @unlink($fax_dir.'/'.$fax_extension.'/inbox/'.$attachment['name']);
//redirect user //redirect user
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: ?id=".$fax_uuid); header("Location: ?id=".$fax_uuid);
exit; exit;
} }
} }
else { else {
//redirect user //redirect user
$_SESSION["message_mood"] = "negative"; messages::add($text['message-delete_failed'], 'negative');
$_SESSION["message"] = $text['message-delete_failed'];
header("Location: ?id=".$fax_uuid); header("Location: ?id=".$fax_uuid);
exit; exit;
} }
} }
else { else {
//redirect user //redirect user
$_SESSION["message_mood"] = "negative"; messages::add($text['message-delete_failed'], 'negative');
$_SESSION["message"] = $text['message-delete_failed'];
header("Location: ?id=".$fax_uuid); header("Location: ?id=".$fax_uuid);
exit; exit;
} }

View File

@ -656,8 +656,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){
else { else {
if (!$included) { if (!$included) {
//nothing to send, redirect the browser //nothing to send, redirect the browser
$_SESSION['message_mood'] = 'negative'; messages::add($text['message-invalid-fax'], 'negative');
$_SESSION["message"] = $text['message-invalid-fax'];
header("Location: fax_send.php?id=".$fax_uuid); header("Location: fax_send.php?id=".$fax_uuid);
exit; exit;
} }
@ -806,7 +805,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){
if (!$included) { if (!$included) {
//redirect the browser //redirect the browser
$_SESSION["message"] = $response; messages::add($response, 'default');
if (permission_exists('fax_active_view')) { if (permission_exists('fax_active_view')) {
header("Location: fax_active.php?id=".$fax_uuid); header("Location: fax_active.php?id=".$fax_uuid);
} }

View File

@ -276,7 +276,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$cache->delete("dialplan:".$_SESSION["context"]); $cache->delete("dialplan:".$_SESSION["context"]);
//redirect the user //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"); header("Location: ".PROJECT_PATH."/app/dialplan/dialplans.php?app_uuid=16589224-c876-aeb3-f59f-523a1c0801f7");
return; return;

View File

@ -156,7 +156,7 @@ else {
save_gateway_xml(); save_gateway_xml();
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
header("Location: gateways.php"); header("Location: gateways.php");
return; return;

View File

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

View File

@ -274,10 +274,10 @@
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
if ($action == "add") { if ($action == "add") {
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
} }
if ($action == "update") { if ($action == "update") {
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: gateways.php"); header("Location: gateways.php");
return; return;

View File

@ -169,7 +169,7 @@
} }
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-copy']; messages::add($text['message-copy']);
header("Location: ivr_menus.php"); header("Location: ivr_menus.php");
return; return;

View File

@ -51,7 +51,7 @@ if (strlen($id)>0) {
unset($sql); unset($sql);
} }
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: modules.php"); header("Location: modules.php");
return; return;

View File

@ -117,7 +117,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$module = new modules;; $module = new modules;;
$module->xml(); $module->xml();
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: modules.php"); header("Location: modules.php");
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -138,7 +138,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$module = new modules;; $module = new modules;;
$module->xml(); $module->xml();
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: modules.php"); header("Location: modules.php");
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -153,7 +153,7 @@
$music->reload(); $music->reload();
//set the message and redirect the user //set the message and redirect the user
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: music_on_hold.php"); header("Location: music_on_hold.php");
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -191,7 +191,7 @@
$music->reload(); $music->reload();
//set the message and redirect the user //set the message and redirect the user
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: music_on_hold.php"); header("Location: music_on_hold.php");
return; return;
} //if ($action == "update") } //if ($action == "update")

View File

@ -93,7 +93,7 @@ if (!permission_exists('number_translation_delete')) {
} }
//redirect the browser //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)); header("Location: ".PROJECT_PATH."/app/number_translation/number_translations.php".(($app_uuid != '') ? "?app_uuid=".$app_uuid : null));
?> ?>

View File

@ -59,7 +59,7 @@
} }
//save the message to a session variable //save the message to a session variable
$_SESSION['message'] = $text['message-delete']; messages::add($text['message-delete']);
//redirect the browser //redirect the browser
header("Location: number_translation_edit.php?id=$number_translation_uuid"); header("Location: number_translation_edit.php?id=$number_translation_uuid");

View File

@ -142,10 +142,10 @@
//set the message //set the message
if ($action == "add") { if ($action == "add") {
$_SESSION['message'] = $text['message-add']; messages::add($text['message-add']);
} }
else if ($action == "update") { else if ($action == "update") {
$_SESSION['message'] = $text['message-update']; messages::add($text['message-update']);
} }
header("Location: ?id=$number_translation_uuid"); header("Location: ?id=$number_translation_uuid");
exit; exit;

View File

@ -65,7 +65,7 @@ if ($phrase_uuid != '') {
save_phrases_xml(); save_phrases_xml();
//redirect the user //redirect the user
$_SESSION["message"] = $text['message-delete']; messages::add($text['message-delete']);
header("Location: phrases.php"); header("Location: phrases.php");
return; return;
?> ?>

View File

@ -170,7 +170,7 @@
} }
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-add']; messages::add($text['message-add']);
header("Location: phrase_edit.php?id=".$phrase_uuid); header("Location: phrase_edit.php?id=".$phrase_uuid);
return; return;
} //if ($action == "add") } //if ($action == "add")
@ -239,7 +239,7 @@
} }
//send a redirect //send a redirect
$_SESSION["message"] = $text['message-update']; messages::add($text['message-update']);
header("Location: phrase_edit.php?id=".$phrase_uuid); header("Location: phrase_edit.php?id=".$phrase_uuid);
return; return;

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More