nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 09:03:49 +00:00
Code Issues 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 16:39:04 +01: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

2
app/access_controls/access_control_delete.php
View File

@@ -44,7 +44,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: access_controls.php');

2
app/access_controls/access_control_node_delete.php
View File

@@ -31,7 +31,7 @@ else {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: access_control_edit.php?id='.$access_control_uuid);
?>

4
app/access_controls/access_control_node_edit.php
View File

@@ -86,7 +86,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
header('Location: access_control_edit.php?id='.$access_control_uuid);
return;
@@ -104,7 +104,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
remove_config_from_cache('configuration:acl.conf');
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
header('Location: access_control_edit.php?id='.$access_control_uuid);
return;

2
app/call_broadcast/call_broadcast_stop.php
View File

@@ -52,7 +52,7 @@ else {
if ($fp) {
$cmd = "sched_del ".$uuid;
$result = event_socket_request($fp, 'api '.$cmd);
$_SESSION['message'] = htmlentities($result);
messages::add(htmlentities($result));
}
}

3
app/call_centers/call_center_queue_edit.php
View File

@@ -65,8 +65,7 @@
}
unset($prep_statement, $row);
if ($total_call_center_queues >= $_SESSION['limit']['call_center_queues']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'];
messages::add($text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'], 'negative');
header('Location: call_center_queues.php');
return;
}

2
app/conference_controls/conference_control_delete.php
View File

@@ -43,7 +43,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: conference_controls.php');
?>

2
app/conference_controls/conference_control_detail_delete.php
View File

@@ -36,7 +36,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: conference_control_detail_edit.php?id='.$conference_control_uuid);
?>

2
app/conference_profiles/conference_profile_delete.php
View File

@@ -43,7 +43,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: conference_profiles.php');
?>

2
app/conference_profiles/conference_profile_param_delete.php
View File

@@ -36,7 +36,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: conference_profile_param_edit.php?id='.$conference_profile_uuid);
?>

9
app/contacts/contact_auth.php
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;

2
app/database_transactions/database_transaction_delete.php
View File

@@ -58,7 +58,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: database_transactions.php');
?>

3
app/destinations/destination_edit.php
View File

@@ -64,8 +64,7 @@
}
unset($prep_statement, $row);
if ($total_destinations >= $_SESSION['limit']['destinations']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_destinations'].' '.$_SESSION['limit']['destinations']['numeric'];
messages::add($text['message-maximum_destinations'].' '.$_SESSION['limit']['destinations']['numeric'], 'negative');
header('Location: destinations.php');
return;
}

2
app/devices/cmd.php
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);

2
app/devices/device_copy.php
View File

@@ -68,7 +68,7 @@
}
else {
$save = false;
$_SESSION['message'] = $text['message-duplicate'];
messages::add($text['message-duplicate']);
}
}
unset($prep_statement);

7
app/devices/device_edit.php
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");

4
app/devices/device_profile_edit.php
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

2
app/devices/device_vendor_delete.php
View File

@@ -58,7 +58,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: device_vendors.php');
?>

2
app/devices/device_vendor_function_delete.php
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);
?>

2
app/devices/device_vendor_restore.php
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');
?>

2
app/dialplan/dialplan_detail_delete.php
View File

@@ -81,7 +81,7 @@
}
//save the message to a session variable
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
//redirect the browser
header("Location: dialplan_edit.php?id=".$dialplan_uuid.(($app_uuid != '') ? "&app_uuid=".$app_uuid : null));

4
app/dialplan/dialplan_edit.php
View File

@@ -196,10 +196,10 @@
//set the message
if ($action == "add") {
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
else if ($action == "update") {
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
header("Location: ?id=".$dialplan_uuid.(($app_uuid != '') ? "&app_uuid=".$app_uuid : null));
exit;

2
app/dialplan/dialplan_xml.php
View File

@@ -104,7 +104,7 @@
$cache->delete("dialplan:".$dialplan_context);
//save the message to a session variable
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
//redirect the user
header("Location: dialplan_edit.php?id=".$dialplan_uuid."&".((strlen($app_uuid) > 0) ? "?app_uuid=".$app_uuid : null));

3
app/extensions/extension_edit.php
View File

@@ -63,8 +63,7 @@
}
unset($prep_statement, $row);
if ($total_extensions >= $_SESSION['limit']['extensions']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_extensions'].' '.$_SESSION['limit']['extensions']['numeric'];
messages::add($text['message-maximum_extensions'].' '.$_SESSION['limit']['extensions']['numeric'], 'negative');
header('Location: extensions.php');
return;
}

2
app/fax/fax_file_delete.php
View File

@@ -94,7 +94,7 @@ else {
$prep_statement->execute();
unset($prep_statement);
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
}
//redirect the user

2
app/fax/fax_log_delete.php
View File

@@ -31,7 +31,7 @@ if (strlen($id)>0) {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: fax_logs.php?id='.$fax_uuid);
?>

3
app/gateways/gateway_edit.php
View File

@@ -74,8 +74,7 @@
}
unset($prep_statement, $row);
if ($total_gateways >= $_SESSION['limit']['gateways']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_gateways'].' '.$_SESSION['limit']['gateways']['numeric'];
messages::add($text['message-maximum_gateways'].' '.$_SESSION['limit']['gateways']['numeric'], 'negative');
header('Location: gateways.php');
return;
}

2
app/ivr_menus/ivr_menu_delete.php
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");
?>

7
app/ivr_menus/ivr_menu_edit.php
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

2
app/ivr_menus/ivr_menu_option_delete.php
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);
?>

4
app/ivr_menus/resources/classes/ivr_menu.php
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

6
app/music_on_hold/music_on_hold.php
View File

@@ -158,7 +158,7 @@
//process, if possible
if (!$valid_file_type) {
$_SESSION['message'] = $text['message-unsupported_file_type'];
messages::add($text['message-unsupported_file_type']);
}
else {
@@ -257,7 +257,7 @@
}
//set message
$_SESSION['message'] = $text['message-upload_completed'];
messages::add($text['message-upload_completed']);
}
//require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php";
@@ -302,7 +302,7 @@
array_map('unlink', glob(path_join($stream_path, '*.ogg')));
}
//set message
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
}
//require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php";

2
app/music_on_hold/music_on_hold_delete.php
View File

@@ -57,7 +57,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: music_on_hold.php');
?>

2
app/phrases/phrase_detail_delete.php
View File

@@ -66,7 +66,7 @@ else {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: phrase_edit.php?id='.$phrase_uuid);
?>

2
app/pin_numbers/pin_number_delete.php
View File

@@ -59,7 +59,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: pin_numbers.php');
?>

2
app/recordings/recordings.php
View File

@@ -142,7 +142,7 @@
move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename);
//set the message
$_SESSION['message'] = $text['message-uploaded'].": ".htmlentities($recording_filename);
messages::add($text['message-uploaded'].": ".htmlentities($recording_filename));
//set the file name to be inserted as the recording description
$recording_description = base64_encode($_FILES['ulfile']['name']);

2
app/registrations/cmd.php
View File

@@ -66,7 +66,7 @@ else {
$response = event_socket_request($fp, "api ".$command);
$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);
}

2
app/ring_groups/ring_group_destination_delete.php
View File

@@ -55,7 +55,7 @@ else {
}
//save the message to a session variable
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
//redirect the browser
header("Location: ring_group_edit.php?id=$ring_group_uuid");

11
app/ring_groups/ring_group_edit.php
View File

@@ -57,7 +57,7 @@
$sql .= "and user_uuid = '".$user_uuid."' ";
$db->exec(check_sql($sql));
//save the message to a session variable
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
//redirect the browser
header("Location: ring_group_edit.php?id=$ring_group_uuid");
exit;
@@ -84,8 +84,7 @@
}
unset($prep_statement, $row);
if ($total_ring_groups >= $_SESSION['limit']['ring_groups']['numeric']) {
$_SESSION['message_mood'] = 'negative';
$_SESSION['message'] = $text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'];
messages::add($text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'], 'negative');
header('Location: ring_groups.php');
return;
}
@@ -149,7 +148,7 @@
$sql_insert .= ")";
$db->exec($sql_insert);
//save the message to a session variable
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
//redirect the browser
header("Location: ring_group_edit.php?id=$ring_group_uuid");
exit;
@@ -337,14 +336,14 @@
//set the message
if ($action == "add") {
//save the message to a session variable
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
//redirect the browser
header("Location: ring_group_edit.php?id=$ring_group_uuid");
exit;
}
if ($action == "update") {
//save the message to a session variable
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

2
app/sip_profiles/sip_profile_domain_delete.php
View File

@@ -70,7 +70,7 @@
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: sip_profile_edit.php?id='.$sip_profile_uuid);
?>

4
app/time_conditions/time_condition_edit.php
View File

@@ -527,10 +527,10 @@
//set the message
if ($action == "add") {
$_SESSION['message'] = $text['message-add'];
messages::add($text['message-add']);
}
else if ($action == "update") {
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
}
header("Location: time_condition_edit.php?id=".$dialplan_uuid.(($app_uuid != '') ? "&app_uuid=".$app_uuid : null));
return;

2
app/voicemails/voicemail_option_delete.php
View File

@@ -54,7 +54,7 @@ else {
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
messages::add($text['message-delete']);
header('Location: voicemail_edit.php?id='.$voicemail_uuid);
?>

2
app/voicemails/voicemail_option_edit.php
View File

@@ -105,7 +105,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql);
//redirect the user
$_SESSION['message'] = $text['message-update'];
messages::add($text['message-update']);
header('Location: voicemail_edit.php?id='.$voicemail_uuid);
return;
}