nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues 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-10 03:13:40 +01: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

2
app/emails/email_cron.php
View File

@@ -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 ";

6
app/emails/email_delete.php
View File

@@ -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

4
app/emails/email_view.php
View File

@@ -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;
}

6
app/emails/emails.php
View File

@@ -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 {