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/ivr_menus/ivr_menu_delete.php
+1 -1
View File
@@ -61,7 +61,7 @@ if (strlen($id) > 0) {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header("Location: ivr_menus.php");
?>
app/ivr_menus/ivr_menu_edit.php
+3 -4
View File
@@ -72,8 +72,7 @@
}
unset($prep_statement, $row);
if ($total_ivr_menus >= $_SESSION['limit']['ivr_menus']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_ivr_menus'].' '.$_SESSION['limit']['ivr_menus']['numeric'];
messages::add($text['message-maximum_ivr_menus'].' '.$_SESSION['limit']['ivr_menus']['numeric'], 'negative');
header('Location: ivr_menus.php');
return;
}
@@ -304,12 +303,12 @@
//set the add message
if ($action == "add" && permission_exists('ivr_menu_add')) {
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
//set the update message
if ($action == "update" && permission_exists('ivr_menu_edit')) {
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
//redirect the user
app/ivr_menus/ivr_menu_option_delete.php
+1 -1
View File
@@ -56,7 +56,7 @@ else {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: ivr_menu_edit.php?id='.$ivr_menu_uuid);
?>
app/ivr_menus/resources/classes/ivr_menu.php
+2 -2
View File
@@ -190,12 +190,12 @@ include "root.php";
//set the add message
if ($action == "add" && permission_exists('ivr_menu_add')) {
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
//set the update message
if ($action == "update" && permission_exists('ivr_menu_edit')) {
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
//return the result