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

Enhance - Convert more messages (#2646)

Browse Source 
convert more messages to messages class
skipped dashboard messages due to them relying on $_SESSION['message']
to know if there has already been a change
This commit is contained in:
Mafoo
2017-06-08 09:39:04 -06:00
committed by FusionPBX
parent 76ab1cca6a
commit b7f4cba09c
42 changed files with 59 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/contacts/contact_auth.php
+3 -6
View File
@@ -52,8 +52,7 @@ $_SESSION['contact_auth']['target'] = ($_SESSION['contact_auth']['target'] == ''
if ($_SESSION['contact_auth']['source'] == 'google') {
if ($_REQUEST['error']) {
$_SESSION['message'] = ($text['message-'.$_REQUEST['error']] != '') ? $text['message-'.$_REQUEST['error']] : $_REQUEST['error'];
$_SESSION['message_mood'] = 'negative';
messages::add(($text['message-'.$_REQUEST['error']] != '') ? $text['message-'.$_REQUEST['error']] : $_REQUEST['error'], 'negative');
header("Location: ".$_SESSION['contact_auth']['referer']);
unset($_SESSION['contact_auth']);
exit;
@@ -61,7 +60,7 @@ if ($_SESSION['contact_auth']['source'] == 'google') {
if (isset($_REQUEST['signout'])) {
unset($_SESSION['contact_auth']['token']);
$_SESSION['message'] = $text['message-google_signed_out'];
messages::add($text['message-google_signed_out']);
header("Location: https://www.google.com/accounts/Logout?continue=https://appengine.google.com/_ah/logout?continue=".(($_SERVER["HTTPS"] == "on") ? "https" : "http")."://".$_SERVER['HTTP_HOST'].PROJECT_PATH."/app/contacts/".$_SESSION['contact_auth']['referer']);
exit;
}
@@ -111,9 +110,7 @@ if ($_SESSION['contact_auth']['source'] == 'google') {
}
else {
$_SESSION['message'] = $text['message-access_denied'];
$_SESSION['message_mood'] = 'negative';
messages::add($text['message-access_denied'], 'negative');
header("Location: ".$_SESSION['contact_auth']['referer']);
unset($_SESSION['contact_auth']);
exit;