dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
convert more messages over to messsagse::add
This commit is contained in:
Mafoo
2017-06-09 20:13:40 -06:00
committed by FusionPBX
parent bc26ecf6ae
commit 3cab4401cf
153 changed files with 249 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/fax/fax_copy.php
+1 -1
View File
@@ -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;
app/fax/fax_delete.php
+1 -1
View File
@@ -91,7 +91,7 @@ else {
}
//redirect the user
$_SESSION["message"] = $text['message-delete'];
messages::add($text['message-delete']);
header("Location: fax.php");
return;
app/fax/fax_edit.php
+4 -4
View File
@@ -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;
app/fax/fax_files_remote.php
+5 -9
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_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;
}
app/fax/fax_send.php
+2 -3
View File
@@ -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);
}