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/devices/cmd.php
+1 -1
View File
@@ -67,7 +67,7 @@ else {
$response = event_socket_request($fp, "api log notice ".$command);
//show the response
$_SESSION['message'] = $text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].$response;
messages::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response));
//close the connection
fclose($fp);
app/devices/device_copy.php
+1 -1
View File
@@ -68,7 +68,7 @@
}
else {
$save = false;
$_SESSION['message'] = $text['message-duplicate'];
messages::add($text['message-duplicate']);
}
}
unset($prep_statement);
app/devices/device_edit.php
+3 -4
View File
@@ -120,8 +120,7 @@
}
unset($prep_statement, $row);
if ($total_devices >= $_SESSION['limit']['devices']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_devices'].' '.$_SESSION['limit']['devices']['numeric'];
messages::add($text['message-maximum_devices'].' '.$_SESSION['limit']['devices']['numeric'], 'negative');
header('Location: devices.php');
return;
}
@@ -326,11 +325,11 @@
if ($save) {
if ($action == "add") {
//save the message to a session variable
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
if ($action == "update") {
//save the message to a session variable
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
//redirect the browser
header("Location: device_edit.php?id=$device_uuid");
app/devices/device_profile_edit.php
+2 -2
View File
@@ -177,11 +177,11 @@
if ($save) {
if ($action == "add") {
//save the message to a session variable
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
if ($action == "update") {
//save the message to a session variable
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
//redirect the browser
app/devices/device_vendor_delete.php
+1 -1
View File
@@ -58,7 +58,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: device_vendors.php');
?>
app/devices/device_vendor_function_delete.php
+1 -1
View File
@@ -59,7 +59,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: device_vendor_function_edit.php?id='.$device_vendor_uuid);
?>
app/devices/device_vendor_restore.php
+1 -1
View File
@@ -159,7 +159,7 @@
} //if num_rows
} // if prep_statement
$_SESSION['message'] = $text['message-restore'];
messages::add($text['message-restore']);
header('Location: device_vendors.php');
?>