From a72f1d6266cb4c70bb47b794b83c4ded7d4c4d14 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Fri, 31 Aug 2018 03:09:01 +0000 Subject: [PATCH] Change messages class to message --- app/access_controls/access_control_delete.php | 2 +- app/access_controls/access_control_edit.php | 4 ++-- app/access_controls/access_control_node_delete.php | 2 +- app/access_controls/access_control_node_edit.php | 4 ++-- app/backup/index.php | 12 ++++++------ app/bridges/bridge_delete.php | 2 +- app/bridges/bridges.php | 2 +- app/call_block/call_block_cdr_add.php | 2 +- app/call_block/call_block_delete.php | 2 +- app/call_block/call_block_edit.php | 4 ++-- app/call_broadcast/call_broadcast_delete.php | 2 +- app/call_broadcast/call_broadcast_edit.php | 4 ++-- app/call_broadcast/call_broadcast_stop.php | 2 +- app/call_centers/call_center_agent_delete.php | 2 +- app/call_centers/call_center_agent_edit.php | 4 ++-- app/call_centers/call_center_queue_delete.php | 2 +- app/call_centers/call_center_queue_edit.php | 6 +++--- app/call_centers/call_center_tier_edit.php | 2 +- app/call_flows/call_flow_delete.php | 2 +- app/call_flows/call_flow_edit.php | 4 ++-- app/call_recordings/call_recording_delete.php | 2 +- app/call_recordings/call_recordings.php | 2 +- app/calls/call_edit.php | 2 +- app/conference_centers/conference_center_delete.php | 2 +- app/conference_centers/conference_center_edit.php | 4 ++-- app/conference_centers/conference_room_delete.php | 2 +- app/conference_centers/conference_room_edit.php | 8 ++++---- .../conference_control_delete.php | 2 +- .../conference_control_detail_delete.php | 2 +- .../conference_control_detail_edit.php | 4 ++-- app/conference_controls/conference_control_edit.php | 4 ++-- .../conference_profile_delete.php | 2 +- app/conference_profiles/conference_profile_edit.php | 4 ++-- .../conference_profile_param_delete.php | 2 +- .../conference_profile_param_edit.php | 4 ++-- app/conferences/conference_delete.php | 2 +- app/conferences/conference_edit.php | 8 ++++---- app/contacts/contact_address_delete.php | 2 +- app/contacts/contact_address_edit.php | 4 ++-- app/contacts/contact_auth.php | 6 +++--- app/contacts/contact_delete.php | 2 +- app/contacts/contact_edit.php | 4 ++-- app/contacts/contact_email_delete.php | 2 +- app/contacts/contact_email_edit.php | 4 ++-- app/contacts/contact_group_delete.php | 2 +- app/contacts/contact_import_google.php | 2 +- app/contacts/contact_note_delete.php | 2 +- app/contacts/contact_note_edit.php | 4 ++-- app/contacts/contact_phone_delete.php | 2 +- app/contacts/contact_phone_edit.php | 4 ++-- app/contacts/contact_relation_delete.php | 2 +- app/contacts/contact_relation_edit.php | 4 ++-- app/contacts/contact_setting_delete.php | 2 +- app/contacts/contact_setting_edit.php | 4 ++-- app/contacts/contact_time_delete.php | 2 +- app/contacts/contact_time_edit.php | 4 ++-- app/contacts/contact_url_delete.php | 2 +- app/contacts/contact_url_edit.php | 4 ++-- app/contacts/contact_user_delete.php | 2 +- .../database_transaction_delete.php | 2 +- app/destinations/destination_delete.php | 2 +- app/destinations/destination_edit.php | 6 +++--- app/destinations/destinations.php | 2 +- app/devices/cmd.php | 4 ++-- app/devices/device_copy.php | 4 ++-- app/devices/device_dashboard.php | 2 +- app/devices/device_delete.php | 2 +- app/devices/device_edit.php | 6 +++--- app/devices/device_key_delete.php | 2 +- app/devices/device_key_edit.php | 4 ++-- app/devices/device_line_delete.php | 2 +- app/devices/device_line_edit.php | 4 ++-- app/devices/device_profile_copy.php | 2 +- app/devices/device_profile_delete.php | 2 +- app/devices/device_profile_edit.php | 4 ++-- app/devices/device_setting_delete.php | 4 ++-- app/devices/device_setting_edit.php | 4 ++-- app/devices/device_vendor_delete.php | 2 +- app/devices/device_vendor_edit.php | 4 ++-- app/devices/device_vendor_function_delete.php | 2 +- app/devices/device_vendor_function_edit.php | 2 +- app/devices/device_vendor_restore.php | 2 +- app/dialplan_inbound/dialplan_inbound_add.php | 2 +- app/dialplan_outbound/dialplan_outbound_add.php | 2 +- app/dialplans/dialplan_add.php | 2 +- app/dialplans/dialplan_copy.php | 2 +- app/dialplans/dialplan_detail_delete.php | 2 +- app/dialplans/dialplan_detail_edit.php | 4 ++-- app/dialplans/dialplan_edit.php | 4 ++-- app/dialplans/dialplan_xml.php | 2 +- app/dialplans/dialplans.php | 2 +- app/email_templates/email_template_delete.php | 2 +- app/email_templates/email_templates.php | 2 +- app/emails/email_cron.php | 2 +- app/emails/email_delete.php | 2 +- app/emails/email_view.php | 4 ++-- app/emails/emails.php | 4 ++-- app/extensions/extension_copy.php | 4 ++-- app/extensions/extension_dashboard.php | 2 +- app/extensions/extension_delete.php | 2 +- app/extensions/extension_edit.php | 6 +++--- app/fax/fax_copy.php | 2 +- app/fax/fax_delete.php | 2 +- app/fax/fax_edit.php | 8 ++++---- app/fax/fax_file_delete.php | 2 +- app/fax/fax_files_remote.php | 10 +++++----- app/fax/fax_log_delete.php | 2 +- app/fax/fax_send.php | 4 ++-- app/fifo/fifo_add.php | 2 +- app/gateways/gateway_copy.php | 2 +- app/gateways/gateway_delete.php | 2 +- app/gateways/gateway_edit.php | 6 +++--- app/ivr_menus/ivr_menu_copy.php | 2 +- app/ivr_menus/ivr_menu_delete.php | 2 +- app/ivr_menus/ivr_menu_edit.php | 6 +++--- app/ivr_menus/ivr_menu_option_delete.php | 2 +- app/ivr_menus/resources/classes/ivr_menu.php | 4 ++-- app/messages/message_delete.php | 2 +- app/messages/messages.php | 2 +- app/modules/module_delete.php | 2 +- app/modules/module_edit.php | 4 ++-- app/music_on_hold/music_on_hold.php | 6 +++--- app/music_on_hold/music_on_hold_delete.php | 2 +- app/music_on_hold/music_on_hold_edit.php | 4 ++-- app/number_translations/cmd.php | 4 ++-- .../number_translation_delete.php | 2 +- app/number_translations/number_translations.php | 2 +- app/phrases/phrase_delete.php | 2 +- app/phrases/phrase_detail_delete.php | 2 +- app/phrases/phrase_edit.php | 4 ++-- app/pin_numbers/pin_number_delete.php | 2 +- app/pin_numbers/pin_number_edit.php | 4 ++-- app/recordings/recording_delete.php | 2 +- app/recordings/recording_edit.php | 2 +- app/recordings/recordings.php | 2 +- app/registrations/cmd.php | 2 +- app/registrations/registrations.php | 2 +- app/ring_groups/ring_group_delete.php | 2 +- app/ring_groups/ring_group_destination_delete.php | 2 +- app/ring_groups/ring_group_destination_edit.php | 4 ++-- app/ring_groups/ring_group_edit.php | 10 +++++----- app/ring_groups/ring_group_forward.php | 2 +- app/services/service_delete.php | 2 +- app/services/service_edit.php | 4 ++-- app/settings/setting_edit.php | 4 ++-- app/sip_profiles/sip_profile_copy.php | 2 +- app/sip_profiles/sip_profile_delete.php | 2 +- app/sip_profiles/sip_profile_domain_delete.php | 2 +- app/sip_profiles/sip_profile_edit.php | 4 ++-- app/sip_profiles/sip_profile_setting_delete.php | 2 +- app/sip_status/cmd.php | 8 ++++---- app/streams/stream_delete.php | 2 +- app/streams/streams.php | 2 +- app/time_conditions/time_condition_edit.php | 4 ++-- app/time_conditions/time_conditions.php | 2 +- app/vars/var_delete.php | 2 +- app/vars/var_edit.php | 4 ++-- app/vars/vars.php | 2 +- .../voicemail_greeting_delete.php | 2 +- app/voicemail_greetings/voicemail_greeting_edit.php | 2 +- app/voicemail_greetings/voicemail_greetings.php | 4 ++-- app/voicemails/voicemail_delete.php | 2 +- app/voicemails/voicemail_edit.php | 8 ++++---- app/voicemails/voicemail_message_edit.php | 4 ++-- app/voicemails/voicemail_option_delete.php | 2 +- app/voicemails/voicemail_option_edit.php | 2 +- core/apps/apps_delete.php | 2 +- core/apps/apps_edit.php | 4 ++-- core/databases/database_delete.php | 2 +- core/databases/database_edit.php | 4 ++-- core/default_settings/default_setting_edit.php | 4 ++-- core/default_settings/default_settings.php | 6 +++--- core/default_settings/default_settings_reload.php | 2 +- core/domain_settings/domain_delete.php | 2 +- core/domain_settings/domain_edit.php | 4 ++-- core/domain_settings/domain_setting_delete.php | 2 +- core/domain_settings/domain_setting_edit.php | 4 ++-- core/domain_settings/domain_settings.php | 4 ++-- core/groups/group_permissions.php | 2 +- core/groups/groupadd.php | 4 ++-- core/groups/groupdelete.php | 2 +- core/groups/groupedit.php | 4 ++-- core/groups/groupmemberadd.php | 2 +- core/groups/groupmemberdelete.php | 2 +- core/groups/groups.php | 2 +- core/groups/permissions_copy.php | 2 +- core/groups/permissions_default.php | 2 +- core/menu/menu_delete.php | 2 +- core/menu/menu_edit.php | 4 ++-- core/menu/menu_item_delete.php | 2 +- core/menu/menu_item_edit.php | 6 +++--- core/menu/menu_item_move_down.php | 2 +- core/menu/menu_item_move_up.php | 2 +- core/menu/menu_restore_default.php | 2 +- core/notifications/notification_edit.php | 10 +++++----- core/upgrade/index.php | 12 ++++++------ core/users/user_delete.php | 2 +- core/users/user_edit.php | 8 ++++---- core/users/user_setting_delete.php | 2 +- core/users/user_setting_edit.php | 4 ++-- core/users/user_settings.php | 2 +- resources/check_auth.php | 2 +- resources/functions.php | 2 +- 203 files changed, 321 insertions(+), 321 deletions(-) diff --git a/app/access_controls/access_control_delete.php b/app/access_controls/access_control_delete.php index 315fac5112..44cb5bcb4f 100644 --- a/app/access_controls/access_control_delete.php +++ b/app/access_controls/access_control_delete.php @@ -73,7 +73,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: access_controls.php'); diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index d5ba56931f..38b6c7d014 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -108,7 +108,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($fp) { event_socket_request($fp, "api reloadacl"); } //add the message - messages::add($text['message-add']); + message::add($text['message-add']); //redirect the user header("Location: access_controls.php"); @@ -135,7 +135,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($fp) { event_socket_request($fp, "api reloadacl"); } //add the message - messages::add($text['message-update']); + message::add($text['message-update']); //redirect the user header("Location: access_controls.php"); diff --git a/app/access_controls/access_control_node_delete.php b/app/access_controls/access_control_node_delete.php index b6ce1e4a8d..816c2ea2d1 100644 --- a/app/access_controls/access_control_node_delete.php +++ b/app/access_controls/access_control_node_delete.php @@ -62,7 +62,7 @@ } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: access_control_edit.php?id='.$access_control_uuid); ?> diff --git a/app/access_controls/access_control_node_edit.php b/app/access_controls/access_control_node_edit.php index 40b667213a..b1875c7b7a 100644 --- a/app/access_controls/access_control_node_edit.php +++ b/app/access_controls/access_control_node_edit.php @@ -128,7 +128,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if ($fp) { event_socket_request($fp, "api reloadacl"); } //add the message - messages::add($text['message-add']); + message::add($text['message-add']); //redirect the browser header('Location: access_control_edit.php?id='.escape($access_control_uuid)); @@ -158,7 +158,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if ($fp) { event_socket_request($fp, "api reloadacl"); } //add the message - messages::add($text['message-update']); + message::add($text['message-update']); //redirect the browser header('Location: access_control_edit.php?id='.escape($access_control_uuid)); diff --git a/app/backup/index.php b/app/backup/index.php index 4cca7015e4..3f8385934e 100644 --- a/app/backup/index.php +++ b/app/backup/index.php @@ -81,14 +81,14 @@ else { } else { //set response message - messages::add($text['message-backup_failed_format'] . $response_txt, 'negative'); + message::add($text['message-backup_failed_format'] . $response_txt, 'negative'); header("Location: ".$_SERVER['PHP_SELF']); exit; } } else { //set response message - messages::add($text['message-backup_failed_paths'], 'negative'); + message::add($text['message-backup_failed_paths'], 'negative'); header("Location: ".$_SERVER['PHP_SELF']); exit; } @@ -124,7 +124,7 @@ else { } if (!$valid_format) { @unlink($backup_path.'/'.$backup_file); - messages::add($text['message-restore_failed_format'], 'negative'); + message::add($text['message-restore_failed_format'], 'negative'); header("Location: ".$_SERVER['PHP_SELF']); exit; } @@ -134,11 +134,11 @@ else { $response_txt = "
" . implode("
", $response); if ($restore_errlevel == 0) { //set response message - messages::add($text['message-restore_completed']); + message::add($text['message-restore_completed']); header("Location: ".$_SERVER['PHP_SELF']); exit; } else { - messages::add($text['message-restore_failed_extract'] . $response_txt, 'negative'); + message::add($text['message-restore_failed_extract'] . $response_txt, 'negative'); header("Location: ".$_SERVER['PHP_SELF']); exit; } @@ -146,7 +146,7 @@ else { } else { //set response message - messages::add($text['message-restore_failed_upload'], 'negative'); + message::add($text['message-restore_failed_upload'], 'negative'); header("Location: ".$_SERVER['PHP_SELF']); exit; } diff --git a/app/bridges/bridge_delete.php b/app/bridges/bridge_delete.php index 159c177c2f..0a8a7a260a 100644 --- a/app/bridges/bridge_delete.php +++ b/app/bridges/bridge_delete.php @@ -33,7 +33,7 @@ $text = $language->get(); //delete the message - messages::add($text['message-delete']); + message::add($text['message-delete']); //delete the data if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('bridge_delete')) { diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 822780134f..979b071b48 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -60,7 +60,7 @@ $obj = new bridges; $obj->delete($bridges); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/call_block/call_block_cdr_add.php b/app/call_block/call_block_cdr_add.php index c59ecfc42c..df3401e42d 100644 --- a/app/call_block/call_block_cdr_add.php +++ b/app/call_block/call_block_cdr_add.php @@ -102,7 +102,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['label-add-complete']); + message::add($text['label-add-complete']); } diff --git a/app/call_block/call_block_delete.php b/app/call_block/call_block_delete.php index 56a0b8ebd9..9c33468d40 100644 --- a/app/call_block/call_block_delete.php +++ b/app/call_block/call_block_delete.php @@ -76,7 +76,7 @@ else { } //redirect the browser - messages::add($text['label-delete-complete']); + message::add($text['label-delete-complete']); header("Location: call_block.php"); return; diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index 385c0105f0..fc61137220 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -151,7 +151,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['label-add-complete']); + message::add($text['label-add-complete']); header("Location: call_block.php"); return; } //if ($action == "add") @@ -186,7 +186,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['label-update-complete']); + message::add($text['label-update-complete']); header("Location: call_block.php"); return; } //if ($action == "update") diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php index 193955a476..e7a3c8cd7e 100644 --- a/app/call_broadcast/call_broadcast_delete.php +++ b/app/call_broadcast/call_broadcast_delete.php @@ -54,7 +54,7 @@ else { } -messages::add($text['confirm-delete']); +message::add($text['confirm-delete']); header("Location: call_broadcast.php"); return; diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index edd46023b6..479d8eb74e 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -222,7 +222,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['confirm-add']); + message::add($text['confirm-add']); header("Location: call_broadcast.php"); return; } //if ($action == "add") @@ -270,7 +270,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['confirm-update']); + message::add($text['confirm-update']); header("Location: call_broadcast.php"); return; } //if ($action == "update") diff --git a/app/call_broadcast/call_broadcast_stop.php b/app/call_broadcast/call_broadcast_stop.php index 3737729236..7957e4ac61 100644 --- a/app/call_broadcast/call_broadcast_stop.php +++ b/app/call_broadcast/call_broadcast_stop.php @@ -52,7 +52,7 @@ else { if ($fp) { $cmd = "sched_del ".$uuid; $result = event_socket_request($fp, 'api '.$cmd); - messages::add(htmlentities($result)); + message::add(htmlentities($result)); } } diff --git a/app/call_centers/call_center_agent_delete.php b/app/call_centers/call_center_agent_delete.php index dd5f60b2ef..f6d07dd55f 100644 --- a/app/call_centers/call_center_agent_delete.php +++ b/app/call_centers/call_center_agent_delete.php @@ -83,7 +83,7 @@ remove_config_from_cache('configuration:callcenter.conf'); //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: call_center_agents.php"); return; diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php index bb44ed4241..d33dc61caa 100644 --- a/app/call_centers/call_center_agent_edit.php +++ b/app/call_centers/call_center_agent_edit.php @@ -249,10 +249,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: call_center_agents.php"); return; diff --git a/app/call_centers/call_center_queue_delete.php b/app/call_centers/call_center_queue_delete.php index 103d134b28..f5a2fb3ea0 100644 --- a/app/call_centers/call_center_queue_delete.php +++ b/app/call_centers/call_center_queue_delete.php @@ -103,7 +103,7 @@ } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: call_center_queues.php"); return; diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php index 4266960b94..aa8c21ab1a 100644 --- a/app/call_centers/call_center_queue_edit.php +++ b/app/call_centers/call_center_queue_edit.php @@ -65,7 +65,7 @@ } unset($prep_statement, $row); if ($total_call_center_queues >= $_SESSION['limit']['call_center_queues']['numeric']) { - messages::add($text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'], 'negative'); + message::add($text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'], 'negative'); header('Location: call_center_queues.php'); return; } @@ -301,10 +301,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } } diff --git a/app/call_centers/call_center_tier_edit.php b/app/call_centers/call_center_tier_edit.php index bdb04244f7..91bfa0503f 100644 --- a/app/call_centers/call_center_tier_edit.php +++ b/app/call_centers/call_center_tier_edit.php @@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } unset($prep_statement); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: call_center_queue_edit.php?id=".$queue_uuid); return; diff --git a/app/call_flows/call_flow_delete.php b/app/call_flows/call_flow_delete.php index 3058e81b2a..d06ac4eeb8 100644 --- a/app/call_flows/call_flow_delete.php +++ b/app/call_flows/call_flow_delete.php @@ -91,7 +91,7 @@ if (strlen($id)>0) { } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: call_flows.php"); return; diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 601e045949..5b1a4ac54b 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -242,10 +242,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: call_flows.php"); return; diff --git a/app/call_recordings/call_recording_delete.php b/app/call_recordings/call_recording_delete.php index 09bdbae11d..e771f1f658 100644 --- a/app/call_recordings/call_recording_delete.php +++ b/app/call_recordings/call_recording_delete.php @@ -47,7 +47,7 @@ $obj->delete($_GET["id"]); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); //redirect the user header('Location: call_recordings.php'); diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php index d82d9e0dc6..e995d534f8 100644 --- a/app/call_recordings/call_recordings.php +++ b/app/call_recordings/call_recordings.php @@ -77,7 +77,7 @@ $obj = new call_recordings; $obj->delete($call_recordings); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php index bdd992a1c8..2773555a06 100644 --- a/app/calls/call_edit.php +++ b/app/calls/call_edit.php @@ -383,7 +383,7 @@ } //redirect the user - messages::add($text['confirm-update']); + message::add($text['confirm-update']); header("Location: ".$_REQUEST['return_url']); return; diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php index 293ff74567..5498037200 100644 --- a/app/conference_centers/conference_center_delete.php +++ b/app/conference_centers/conference_center_delete.php @@ -90,7 +90,7 @@ else { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: conference_centers.php"); return; diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 662878cb4b..0b001a8a1d 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -177,10 +177,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: conference_centers.php"); return; diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php index 5688e141fa..0c07d31f0c 100644 --- a/app/conference_centers/conference_room_delete.php +++ b/app/conference_centers/conference_room_delete.php @@ -91,7 +91,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: conference_rooms.php"); return; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 2dff725f8f..1cc7d03532 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -171,7 +171,7 @@ unset($sql); } - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: conference_room_edit.php?id=".escape($conference_room_uuid)); return; } @@ -360,7 +360,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); } - messages::add($text['message-add']); + message::add($text['message-add']); } //if ($action == "add") if ($action == "update" && permission_exists('conference_room_edit')) { @@ -426,7 +426,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); } //if ($action == "update") //assign the user to the meeting @@ -450,7 +450,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); } header("Location: conference_room_edit.php?id=".escape($conference_room_uuid)); diff --git a/app/conference_controls/conference_control_delete.php b/app/conference_controls/conference_control_delete.php index eb8894f635..8f7c635266 100644 --- a/app/conference_controls/conference_control_delete.php +++ b/app/conference_controls/conference_control_delete.php @@ -43,7 +43,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: conference_controls.php'); ?> \ No newline at end of file diff --git a/app/conference_controls/conference_control_detail_delete.php b/app/conference_controls/conference_control_detail_delete.php index 6d8407fe5b..20673b2672 100644 --- a/app/conference_controls/conference_control_detail_delete.php +++ b/app/conference_controls/conference_control_detail_delete.php @@ -36,7 +36,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: conference_control_detail_edit.php?id='.$conference_control_uuid); ?> \ No newline at end of file diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php index a013dee354..f98275701a 100644 --- a/app/conference_controls/conference_control_detail_edit.php +++ b/app/conference_controls/conference_control_detail_edit.php @@ -92,7 +92,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header('Location: conference_control_edit.php?id='.$conference_control_uuid); return; @@ -110,7 +110,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header('Location: conference_control_edit.php?id='.$conference_control_uuid); return; diff --git a/app/conference_controls/conference_control_edit.php b/app/conference_controls/conference_control_edit.php index d57f58ed4b..d4288ce3e6 100644 --- a/app/conference_controls/conference_control_edit.php +++ b/app/conference_controls/conference_control_edit.php @@ -82,10 +82,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: conference_controls.php"); return; diff --git a/app/conference_profiles/conference_profile_delete.php b/app/conference_profiles/conference_profile_delete.php index d192cb0c5a..868c91b4d6 100644 --- a/app/conference_profiles/conference_profile_delete.php +++ b/app/conference_profiles/conference_profile_delete.php @@ -43,7 +43,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: conference_profiles.php'); ?> diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php index 23b4289dc6..1c4fa4a5a3 100644 --- a/app/conference_profiles/conference_profile_edit.php +++ b/app/conference_profiles/conference_profile_edit.php @@ -81,7 +81,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: conference_profiles.php"); return; @@ -97,7 +97,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: conference_profiles.php"); return; diff --git a/app/conference_profiles/conference_profile_param_delete.php b/app/conference_profiles/conference_profile_param_delete.php index 0027df1948..1611190345 100644 --- a/app/conference_profiles/conference_profile_param_delete.php +++ b/app/conference_profiles/conference_profile_param_delete.php @@ -36,7 +36,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: conference_profile_param_edit.php?id='.$conference_profile_uuid); ?> diff --git a/app/conference_profiles/conference_profile_param_edit.php b/app/conference_profiles/conference_profile_param_edit.php index 80eef40ffe..1fcd943d8b 100644 --- a/app/conference_profiles/conference_profile_param_edit.php +++ b/app/conference_profiles/conference_profile_param_edit.php @@ -93,7 +93,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header('Location: conference_profile_edit.php?id='.$conference_profile_uuid); return; @@ -111,7 +111,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header('Location: conference_profile_edit.php?id='.$conference_profile_uuid); return; diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php index 8bc6f29259..b1c386d875 100644 --- a/app/conferences/conference_delete.php +++ b/app/conferences/conference_delete.php @@ -91,7 +91,7 @@ else { } //redirect the browser - messages::add($text['confirm-delete']); + message::add($text['confirm-delete']); header("Location: conferences.php"); return; diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 45d03bfce2..547c5188f5 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -80,7 +80,7 @@ $sql .= "and user_uuid = '".$user_uuid."' "; $db->exec(check_sql($sql)); - messages::add($text['confirm-delete']); + message::add($text['confirm-delete']); header("Location: conference_edit.php?id=".$conference_uuid); return; } @@ -107,7 +107,7 @@ $sql_insert .= ")"; $db->exec($sql_insert); //send a message - messages::add($text['confirm-add']); + message::add($text['confirm-add']); header("Location: conference_edit.php?id=".$conference_uuid); return; } @@ -217,7 +217,7 @@ dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); //add the message - messages::add($text['confirm-add']); + message::add($text['confirm-add']); } //if ($action == "add") if ($action == "update") { @@ -273,7 +273,7 @@ $db->query($sql); //add the message - messages::add($text['confirm-update']); + message::add($text['confirm-update']); } //if ($action == "update") //update the dialplan xml diff --git a/app/contacts/contact_address_delete.php b/app/contacts/contact_address_delete.php index 72c4e925ce..f5ca8161ea 100644 --- a/app/contacts/contact_address_delete.php +++ b/app/contacts/contact_address_delete.php @@ -55,7 +55,7 @@ else { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php index dd5b35145b..66bba572e9 100644 --- a/app/contacts/contact_address_edit.php +++ b/app/contacts/contact_address_edit.php @@ -161,7 +161,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -187,7 +187,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_auth.php b/app/contacts/contact_auth.php index 43e1fe2520..629c32500e 100644 --- a/app/contacts/contact_auth.php +++ b/app/contacts/contact_auth.php @@ -52,7 +52,7 @@ $_SESSION['contact_auth']['target'] = ($_SESSION['contact_auth']['target'] == '' if ($_SESSION['contact_auth']['source'] == 'google') { if ($_REQUEST['error']) { - messages::add(($text['message-'.$_REQUEST['error']] != '') ? $text['message-'.$_REQUEST['error']] : $_REQUEST['error'], 'negative'); + message::add(($text['message-'.$_REQUEST['error']] != '') ? $text['message-'.$_REQUEST['error']] : $_REQUEST['error'], 'negative'); header("Location: ".$_SESSION['contact_auth']['referer']); unset($_SESSION['contact_auth']); exit; @@ -60,7 +60,7 @@ if ($_SESSION['contact_auth']['source'] == 'google') { if (isset($_REQUEST['signout'])) { unset($_SESSION['contact_auth']['token']); - messages::add($text['message-google_signed_out']); + message::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; } @@ -110,7 +110,7 @@ if ($_SESSION['contact_auth']['source'] == 'google') { } else { - messages::add($text['message-access_denied'], 'negative'); + message::add($text['message-access_denied'], 'negative'); header("Location: ".$_SESSION['contact_auth']['referer']); unset($_SESSION['contact_auth']); exit; diff --git a/app/contacts/contact_delete.php b/app/contacts/contact_delete.php index e1038a8229..c6b6fdfad4 100644 --- a/app/contacts/contact_delete.php +++ b/app/contacts/contact_delete.php @@ -132,7 +132,7 @@ if (strlen($contact_uuid) > 0) { } if (!$included) { - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contacts.php"); return; } diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index d1f2b1b9cd..ee318ddab1 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -154,7 +154,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); $location = "contact_edit.php?id=".$contact_uuid; } //if ($action == "add") @@ -181,7 +181,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); $location = "contact_edit.php?id=".escape($contact_uuid); } //if ($action == "update") diff --git a/app/contacts/contact_email_delete.php b/app/contacts/contact_email_delete.php index 346b1ab563..d690699d96 100644 --- a/app/contacts/contact_email_delete.php +++ b/app/contacts/contact_email_delete.php @@ -52,7 +52,7 @@ if (strlen($id)>0) { unset($sql); } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php index 4e1d149adf..604e70c968 100644 --- a/app/contacts/contact_email_edit.php +++ b/app/contacts/contact_email_edit.php @@ -133,7 +133,7 @@ if (strlen($_GET["contact_uuid"]) > 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -150,7 +150,7 @@ if (strlen($_GET["contact_uuid"]) > 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_group_delete.php b/app/contacts/contact_group_delete.php index dc9c0e6435..d722e8a8fe 100644 --- a/app/contacts/contact_group_delete.php +++ b/app/contacts/contact_group_delete.php @@ -57,7 +57,7 @@ else { //redirect the browser if (!$included) { - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; } diff --git a/app/contacts/contact_import_google.php b/app/contacts/contact_import_google.php index 4e63df8532..c874019ce1 100644 --- a/app/contacts/contact_import_google.php +++ b/app/contacts/contact_import_google.php @@ -333,7 +333,7 @@ if ($_POST['a'] == 'import') { else { // no contacts imported - messages::add($text['message-contacts_imported']." ".$contacts_imported, 'negative'); + message::add($text['message-contacts_imported']." ".$contacts_imported, 'negative'); } } diff --git a/app/contacts/contact_note_delete.php b/app/contacts/contact_note_delete.php index d52000746c..4c2f72f538 100644 --- a/app/contacts/contact_note_delete.php +++ b/app/contacts/contact_note_delete.php @@ -52,7 +52,7 @@ if (strlen($id)>0) { unset($sql); } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php index f6e505e074..51a855b68c 100644 --- a/app/contacts/contact_note_edit.php +++ b/app/contacts/contact_note_edit.php @@ -117,7 +117,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -134,7 +134,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_phone_delete.php b/app/contacts/contact_phone_delete.php index 40c5296698..5f54438eca 100644 --- a/app/contacts/contact_phone_delete.php +++ b/app/contacts/contact_phone_delete.php @@ -55,7 +55,7 @@ else { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index 0f13b32aae..89d4434088 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -159,7 +159,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -182,7 +182,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_relation_delete.php b/app/contacts/contact_relation_delete.php index d9f31f314e..81886ad2af 100644 --- a/app/contacts/contact_relation_delete.php +++ b/app/contacts/contact_relation_delete.php @@ -53,7 +53,7 @@ if (strlen($id)>0) { unset($sql); } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_relation_edit.php b/app/contacts/contact_relation_edit.php index 80869d5350..74c2b19819 100644 --- a/app/contacts/contact_relation_edit.php +++ b/app/contacts/contact_relation_edit.php @@ -145,7 +145,7 @@ else { unset($sql); } - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -159,7 +159,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_setting_delete.php b/app/contacts/contact_setting_delete.php index 48bf4e0998..0e7fbf1e0e 100644 --- a/app/contacts/contact_setting_delete.php +++ b/app/contacts/contact_setting_delete.php @@ -56,7 +56,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php index ee8e89dd46..0dfe5b0d5e 100644 --- a/app/contacts/contact_setting_edit.php +++ b/app/contacts/contact_setting_edit.php @@ -166,10 +166,10 @@ //redirect the browser if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } header("Location: contact_edit.php?id=".escape($contact_uuid)); return; diff --git a/app/contacts/contact_time_delete.php b/app/contacts/contact_time_delete.php index 15004c5e76..3a688c4d74 100644 --- a/app/contacts/contact_time_delete.php +++ b/app/contacts/contact_time_delete.php @@ -56,7 +56,7 @@ else { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_time_edit.php b/app/contacts/contact_time_edit.php index 5dfc5947ab..5c24ad4125 100644 --- a/app/contacts/contact_time_edit.php +++ b/app/contacts/contact_time_edit.php @@ -119,7 +119,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -138,7 +138,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_url_delete.php b/app/contacts/contact_url_delete.php index cfd07061bf..de5a64a928 100644 --- a/app/contacts/contact_url_delete.php +++ b/app/contacts/contact_url_delete.php @@ -54,7 +54,7 @@ if (strlen($id)>0) { unset($sql); } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php index 176dd9c92e..479a497475 100644 --- a/app/contacts/contact_url_edit.php +++ b/app/contacts/contact_url_edit.php @@ -134,7 +134,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "add") @@ -151,7 +151,7 @@ else { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: contact_edit.php?id=".$contact_uuid); return; } //if ($action == "update") diff --git a/app/contacts/contact_user_delete.php b/app/contacts/contact_user_delete.php index 892364f2ac..01f7142598 100644 --- a/app/contacts/contact_user_delete.php +++ b/app/contacts/contact_user_delete.php @@ -57,7 +57,7 @@ else { //redirect the browser if (!$included) { - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: contact_edit.php?id=".$contact_uuid); return; } diff --git a/app/database_transactions/database_transaction_delete.php b/app/database_transactions/database_transaction_delete.php index 0677c0a531..e2701e243c 100644 --- a/app/database_transactions/database_transaction_delete.php +++ b/app/database_transactions/database_transaction_delete.php @@ -58,7 +58,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: database_transactions.php'); ?> \ No newline at end of file diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php index 43324fec5c..fc95e2c06f 100644 --- a/app/destinations/destination_delete.php +++ b/app/destinations/destination_delete.php @@ -112,7 +112,7 @@ $cache->delete("dialplan:".$destination_context); //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: destinations.php"); return; diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php index 4669abb485..9ff5f0f7ff 100644 --- a/app/destinations/destination_edit.php +++ b/app/destinations/destination_edit.php @@ -78,7 +78,7 @@ } unset($prep_statement, $row); if ($total_destinations >= $_SESSION['limit']['destinations']['numeric']) { - messages::add($text['message-maximum_destinations'].' '.$_SESSION['limit']['destinations']['numeric'], 'negative'); + message::add($text['message-maximum_destinations'].' '.$_SESSION['limit']['destinations']['numeric'], 'negative'); header('Location: destinations.php'); return; } @@ -656,10 +656,10 @@ //redirect the user if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: destination_edit.php?id=".escape($destination_uuid)."&type=".$destination_type); return; diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 40e3948028..673d4f1da5 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -60,7 +60,7 @@ $obj = new destinations; $obj->delete($destinations); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/devices/cmd.php b/app/devices/cmd.php index 4708cb15d2..132001f441 100644 --- a/app/devices/cmd.php +++ b/app/devices/cmd.php @@ -67,7 +67,7 @@ else { $response = event_socket_request($fp, "api log notice ".$command); //show the response - messages::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); + message::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); //close the connection fclose($fp); @@ -80,7 +80,7 @@ else { } else { //send the message - messages::add($text['button-applied'], 'positive', 3500); + message::add($text['button-applied'], 'positive', 3500); //send the redirect if (isset($_SERVER['HTTP_REFERER'])) { diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php index 80d49ed73a..70d3f3a0be 100644 --- a/app/devices/device_copy.php +++ b/app/devices/device_copy.php @@ -68,7 +68,7 @@ } else { $save = false; - messages::add($text['message-duplicate']); + message::add($text['message-duplicate']); } } unset($prep_statement); @@ -159,7 +159,7 @@ $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); $response = $database->message; - messages::add($text['message-copy']); + message::add($text['message-copy']); } //redirect diff --git a/app/devices/device_dashboard.php b/app/devices/device_dashboard.php index 12d9b148c9..39215eb1be 100644 --- a/app/devices/device_dashboard.php +++ b/app/devices/device_dashboard.php @@ -289,7 +289,7 @@ } //set the message - messages::add($text["message-$action"]); + message::add($text["message-$action"]); //redirect the browser header("Location: /core/user_settings/user_dashboard.php"); diff --git a/app/devices/device_delete.php b/app/devices/device_delete.php index f6be1b816d..6d29cd7be7 100644 --- a/app/devices/device_delete.php +++ b/app/devices/device_delete.php @@ -82,7 +82,7 @@ } //set the message and redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: devices.php"); return; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 9a025f2779..5134ee5c29 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -120,7 +120,7 @@ } unset($prep_statement, $row); if ($total_devices >= $_SESSION['limit']['devices']['numeric']) { - messages::add($text['message-maximum_devices'].' '.$_SESSION['limit']['devices']['numeric'], 'negative'); + message::add($text['message-maximum_devices'].' '.$_SESSION['limit']['devices']['numeric'], 'negative'); header('Location: devices.php'); return; } @@ -325,11 +325,11 @@ if ($save) { if ($action == "add") { //save the message to a session variable - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { //save the message to a session variable - messages::add($text['message-update']); + message::add($text['message-update']); } //redirect the browser header("Location: device_edit.php?id=$device_uuid"); diff --git a/app/devices/device_key_delete.php b/app/devices/device_key_delete.php index 424d6459ab..c453c9f4a8 100644 --- a/app/devices/device_key_delete.php +++ b/app/devices/device_key_delete.php @@ -54,7 +54,7 @@ else { } //send a redirect - messages::add($text['message-delete']); + message::add($text['message-delete']); if ($device_uuid != '') { header("Location: device_edit.php?id=".$device_uuid); } diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php index 50ca33084a..001bcfb34e 100644 --- a/app/devices/device_key_edit.php +++ b/app/devices/device_key_edit.php @@ -123,7 +123,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: device_edit.php?id=".$device_uuid); return; } //if ($action == "add") @@ -142,7 +142,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: device_edit.php?id=".$device_uuid); return; } //if ($action == "update") diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php index 67bae51384..028fd22eba 100644 --- a/app/devices/device_line_delete.php +++ b/app/devices/device_line_delete.php @@ -54,7 +54,7 @@ else { } //send a redirect - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: device_edit.php?id=".$device_uuid); return; diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php index 15a653223b..ff57e18d82 100644 --- a/app/devices/device_line_edit.php +++ b/app/devices/device_line_edit.php @@ -165,10 +165,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: device_edit.php?id=".$device_uuid); return; diff --git a/app/devices/device_profile_copy.php b/app/devices/device_profile_copy.php index 4384a13381..3c8007c1b3 100644 --- a/app/devices/device_profile_copy.php +++ b/app/devices/device_profile_copy.php @@ -115,7 +115,7 @@ $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); $response = $database->message; - messages::add($text['message-copy']); + message::add($text['message-copy']); } //redirect diff --git a/app/devices/device_profile_delete.php b/app/devices/device_profile_delete.php index 6c7aeab3b3..f629a03447 100644 --- a/app/devices/device_profile_delete.php +++ b/app/devices/device_profile_delete.php @@ -77,7 +77,7 @@ } //set the message and redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: device_profiles.php"); return; diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php index f9d2bfd1b3..e5c0cb05b0 100644 --- a/app/devices/device_profile_edit.php +++ b/app/devices/device_profile_edit.php @@ -177,11 +177,11 @@ if ($save) { if ($action == "add") { //save the message to a session variable - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { //save the message to a session variable - messages::add($text['message-update']); + message::add($text['message-update']); } //redirect the browser diff --git a/app/devices/device_setting_delete.php b/app/devices/device_setting_delete.php index 15c2aaa3b7..4615b7deac 100644 --- a/app/devices/device_setting_delete.php +++ b/app/devices/device_setting_delete.php @@ -67,13 +67,13 @@ else { //redirect to device profile if (is_uuid($device_profile_uuid)) { - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: device_profile_edit.php?id=".$device_profile_uuid); return; } //send a redirect - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: device_edit.php?id=".$device_uuid); return; diff --git a/app/devices/device_setting_edit.php b/app/devices/device_setting_edit.php index fac006657c..68015ef2ec 100644 --- a/app/devices/device_setting_edit.php +++ b/app/devices/device_setting_edit.php @@ -126,10 +126,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } //if ($action == "update") if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: device_edit.php?id=".$device_uuid); return; diff --git a/app/devices/device_vendor_delete.php b/app/devices/device_vendor_delete.php index b5b3dfa2cc..b69858ffdd 100644 --- a/app/devices/device_vendor_delete.php +++ b/app/devices/device_vendor_delete.php @@ -58,7 +58,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: device_vendors.php'); ?> \ No newline at end of file diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php index aa57963a76..610905bbc7 100644 --- a/app/devices/device_vendor_edit.php +++ b/app/devices/device_vendor_edit.php @@ -104,7 +104,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: device_vendors.php"); return; @@ -119,7 +119,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: device_vendors.php"); return; } //if ($action == "update") diff --git a/app/devices/device_vendor_function_delete.php b/app/devices/device_vendor_function_delete.php index 1c6490d793..c0afd53965 100644 --- a/app/devices/device_vendor_function_delete.php +++ b/app/devices/device_vendor_function_delete.php @@ -59,7 +59,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: device_vendor_function_edit.php?id='.$device_vendor_uuid); ?> \ No newline at end of file diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php index 23b4e60aa6..01e03c9bdf 100644 --- a/app/devices/device_vendor_function_edit.php +++ b/app/devices/device_vendor_function_edit.php @@ -39,7 +39,7 @@ $sql .= "where device_vendor_function_group_uuid = '".$device_vendor_function_group_uuid."' "; $db->exec(check_sql($sql)); //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: device_vendor_function_edit.php?id=".escape($device_vendor_function_uuid) ."&device_vendor_uuid=".escape($device_vendor_uuid)); return; } diff --git a/app/devices/device_vendor_restore.php b/app/devices/device_vendor_restore.php index 87f9d6e0ed..e64482ec34 100644 --- a/app/devices/device_vendor_restore.php +++ b/app/devices/device_vendor_restore.php @@ -159,7 +159,7 @@ } //if num_rows } // if prep_statement - messages::add($text['message-restore']); + message::add($text['message-restore']); header('Location: device_vendors.php'); ?> diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index 871976afc2..370a24736f 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -412,7 +412,7 @@ save_dialplan_xml(); //redirect message - messages::add($text['confirm-update-complete']); + message::add($text['confirm-update-complete']); header("Location: ".PROJECT_PATH."/app/dialplans/dialplans.php?app_uuid=c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4"); return; } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php index 8eaf08677e..bd727ff7ca 100644 --- a/app/dialplan_outbound/dialplan_outbound_add.php +++ b/app/dialplan_outbound/dialplan_outbound_add.php @@ -651,7 +651,7 @@ save_dialplan_xml(); //redirect the browser - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: ".PROJECT_PATH."/app/dialplans/dialplans.php?app_uuid=8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3"); return; } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php index 65edf8d731..e7115faa20 100644 --- a/app/dialplans/dialplan_add.php +++ b/app/dialplans/dialplan_add.php @@ -259,7 +259,7 @@ $switch_result = event_socket_request($fp, 'api '.$switch_cmd); } - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: ".PROJECT_PATH."/app/dialplans/dialplans.php"); return; } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/app/dialplans/dialplan_copy.php b/app/dialplans/dialplan_copy.php index 712c33c097..7a24051920 100644 --- a/app/dialplans/dialplan_copy.php +++ b/app/dialplans/dialplan_copy.php @@ -150,7 +150,7 @@ save_dialplan_xml(); //send a redirect - messages::add($text['message-copy']); + message::add($text['message-copy']); switch ($app_uuid) { case "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4": //inbound routes case "8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3": //outbound routes diff --git a/app/dialplans/dialplan_detail_delete.php b/app/dialplans/dialplan_detail_delete.php index 5b35e41a96..54ca044921 100644 --- a/app/dialplans/dialplan_detail_delete.php +++ b/app/dialplans/dialplan_detail_delete.php @@ -81,7 +81,7 @@ } //save the message to a session variable - messages::add($text['message-delete']); + message::add($text['message-delete']); //redirect the browser header("Location: dialplan_edit.php?id=".$dialplan_uuid.(($app_uuid != '') ? "&app_uuid=".$app_uuid : null)); diff --git a/app/dialplans/dialplan_detail_edit.php b/app/dialplans/dialplan_detail_edit.php index 2321665aac..aeddf1be7d 100644 --- a/app/dialplans/dialplan_detail_edit.php +++ b/app/dialplans/dialplan_detail_edit.php @@ -143,7 +143,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $switch_result = event_socket_request($fp, 'api '.$switch_cmd); } - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid); return; } //if ($action == "add") @@ -178,7 +178,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $switch_result = event_socket_request($fp, 'api '.$switch_cmd); } - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid); return; } //if ($action == "update") diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php index 278f5eaf60..390c27323f 100644 --- a/app/dialplans/dialplan_edit.php +++ b/app/dialplans/dialplan_edit.php @@ -201,10 +201,10 @@ //set the message if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } else if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: ?id=".escape($dialplan_uuid).(($app_uuid != '') ? "&app_uuid=".escape($app_uuid) : null)); exit; diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php index 17f59b9c6f..fce91e334b 100644 --- a/app/dialplans/dialplan_xml.php +++ b/app/dialplans/dialplan_xml.php @@ -104,7 +104,7 @@ $cache->delete("dialplan:".$dialplan_context); //save the message to a session variable - messages::add($text['message-update']); + message::add($text['message-update']); //redirect the user header("Location: dialplan_edit.php?id=".$dialplan_uuid."&".((strlen($app_uuid) > 0) ? "app_uuid=".$app_uuid : null)); diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php index f430d0a0b5..0404b8605c 100644 --- a/app/dialplans/dialplans.php +++ b/app/dialplans/dialplans.php @@ -75,7 +75,7 @@ $cache->delete("dialplan:".$dialplan_context); //set the message - messages::add($text['message-update']); + message::add($text['message-update']); } //set the http values as php variables diff --git a/app/email_templates/email_template_delete.php b/app/email_templates/email_template_delete.php index 8f749bcd55..99ed88eb7c 100644 --- a/app/email_templates/email_template_delete.php +++ b/app/email_templates/email_template_delete.php @@ -56,7 +56,7 @@ } //delete the message - messages::add($text['message-delete']); + message::add($text['message-delete']); //redirect the user header('Location: email_templates.php'); diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php index ea7f299e59..0e755fde44 100644 --- a/app/email_templates/email_templates.php +++ b/app/email_templates/email_templates.php @@ -57,7 +57,7 @@ $obj = new email_templates; $obj->delete($email_templates); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/emails/email_cron.php b/app/emails/email_cron.php index e34822b782..f736f2381c 100644 --- a/app/emails/email_cron.php +++ b/app/emails/email_cron.php @@ -35,7 +35,7 @@ require_once "secure/v_mailto.php"; if ($mailer_error == '') { //get the message - messages::add($text['message-message_resent']); + message::add($text['message-message_resent']); //delete the email $sql = "delete from v_emails "; diff --git a/app/emails/email_delete.php b/app/emails/email_delete.php index 4d7672f46e..a0cda08ab1 100644 --- a/app/emails/email_delete.php +++ b/app/emails/email_delete.php @@ -52,7 +52,7 @@ else { $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); unset($sql, $prep_statement); - messages::add($text['message-delete']); + message::add($text['message-delete']); } //redirect user diff --git a/app/emails/email_view.php b/app/emails/email_view.php index 81b2b0c2b3..3345aed842 100644 --- a/app/emails/email_view.php +++ b/app/emails/email_view.php @@ -66,7 +66,7 @@ else { } if (!$msg_found) { - messages::add($text['message-invalid_email']); + message::add($text['message-invalid_email']); header("Location: emails.php"); exit; } @@ -121,7 +121,7 @@ else { } } else { - messages::add($text['message-decoding_error'].(($mime->error != '') ? ': '.htmlspecialchars($mime->error) : null)); + message::add($text['message-decoding_error'].(($mime->error != '') ? ': '.htmlspecialchars($mime->error) : null)); header("Location: emails.php"); exit; } diff --git a/app/emails/emails.php b/app/emails/emails.php index c7e9e06d28..b961c48a96 100644 --- a/app/emails/emails.php +++ b/app/emails/emails.php @@ -85,7 +85,7 @@ else { $msg = $email; require_once "secure/v_mailto.php"; if ($mailer_error == '') { - messages::add($text['message-message_resent']); + message::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,7 +93,7 @@ else { } } else { - messages::add($text['message-resend_failed'].": ".$mailer_error, 'negative', 4000); + message::add($text['message-resend_failed'].": ".$mailer_error, 'negative', 4000); if (permission_exists('emails_all') && $_REQUEST['showall'] == 'true') { header("Location: emails.php?showall=true"); } else { diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php index 34e8290c14..5e819d31e8 100644 --- a/app/extensions/extension_copy.php +++ b/app/extensions/extension_copy.php @@ -55,7 +55,7 @@ // skip the copy if the domain extension already exists $extension = new extension; if ($extension->exists($_SESSION['domain_uuid'], $extension_new)) { - messages::add($text['message-duplicate'], 'negative'); + message::add($text['message-duplicate'], 'negative'); header("Location: extensions.php"); return; } @@ -236,7 +236,7 @@ } //redirect the user - messages::add($text['message-copy']); + message::add($text['message-copy']); header("Location: extensions.php"); return; diff --git a/app/extensions/extension_dashboard.php b/app/extensions/extension_dashboard.php index 7fb8f817a9..2234261d96 100644 --- a/app/extensions/extension_dashboard.php +++ b/app/extensions/extension_dashboard.php @@ -112,7 +112,7 @@ } //set the message - messages::add($text['message-update']); + message::add($text['message-update']); //redirect the browser header("Location: /core/user_settings/user_dashboard.php"); diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php index d0962e878d..3130d2dba1 100644 --- a/app/extensions/extension_delete.php +++ b/app/extensions/extension_delete.php @@ -175,7 +175,7 @@ } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: extensions.php"); return; diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 48b56fd9fa..908d85a812 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -63,7 +63,7 @@ } unset($prep_statement, $row); if ($total_extensions >= $_SESSION['limit']['extensions']['numeric']) { - messages::add($text['message-maximum_extensions'].' '.$_SESSION['limit']['extensions']['numeric'], 'negative'); + message::add($text['message-maximum_extensions'].' '.$_SESSION['limit']['extensions']['numeric'], 'negative'); header('Location: extensions.php'); return; } @@ -552,7 +552,7 @@ //show the action and redirect the user if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); //prepare for alternating the row style $c = 0; $row_style["0"] = "row_style0"; @@ -590,7 +590,7 @@ return; } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: extension_edit.php?id=".$extension_uuid); return; } diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php index f3e4de56ec..0e3e70684f 100644 --- a/app/fax/fax_copy.php +++ b/app/fax/fax_copy.php @@ -139,7 +139,7 @@ else { unset($sql); //redirect the user - messages::add($text['confirm-copy']); + message::add($text['confirm-copy']); header("Location: fax.php"); return; diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php index 7f2f09af48..b4273a95ed 100644 --- a/app/fax/fax_delete.php +++ b/app/fax/fax_delete.php @@ -91,7 +91,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: fax.php"); return; diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index ef68f6a55a..083bd7201f 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -140,7 +140,7 @@ $db->exec(check_sql($sql)); //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: fax_edit.php?id=".$fax_uuid); return; } @@ -168,7 +168,7 @@ $db->exec($sql_insert); //redirect the browser - messages::add($text['confirm-add']); + message::add($text['confirm-add']); header("Location: fax_edit.php?id=".$fax_uuid); return; } @@ -381,10 +381,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //redirect the browser if ($action == "update" && permission_exists('fax_extension_edit')) { - messages::add($text['confirm-update']); + message::add($text['confirm-update']); } if ($action == "add" && permission_exists('fax_extension_add')) { - messages::add($text['confirm-add']); + message::add($text['confirm-add']); } header("Location: fax.php"); return; diff --git a/app/fax/fax_file_delete.php b/app/fax/fax_file_delete.php index e2781260cb..7cb21399fb 100644 --- a/app/fax/fax_file_delete.php +++ b/app/fax/fax_file_delete.php @@ -94,7 +94,7 @@ else { $prep_statement->execute(); unset($prep_statement); - messages::add($text['message-delete']); + message::add($text['message-delete']); } //redirect the user diff --git a/app/fax/fax_files_remote.php b/app/fax/fax_files_remote.php index aa7bbc3f88..487a8ab80b 100644 --- a/app/fax/fax_files_remote.php +++ b/app/fax/fax_files_remote.php @@ -90,7 +90,7 @@ else { $fax_email_connection .= "/".(($fax_email_connection_validate == 'false') ? "no" : null)."validate-cert"; $fax_email_connection .= "}".$fax_email_connection_mailbox; if (!$connection = imap_open($fax_email_connection, $fax_email_connection_username, $fax_email_connection_password)) { - messages::add($text['message-cannot_connect']."(".imap_last_error().")", 'neative'); + message::add($text['message-cannot_connect']."(".imap_last_error().")", 'neative'); header("Location: fax.php"); exit; } @@ -131,7 +131,7 @@ else { } else{ //redirect user - messages::add($text['message-download_failed'], 'negative'); + message::add($text['message-download_failed'], 'negative'); header("Location: ?id=".$fax_uuid); exit; } @@ -148,21 +148,21 @@ else { $fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name']; @unlink($fax_dir.'/'.$fax_extension.'/inbox/'.$attachment['name']); //redirect user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: ?id=".$fax_uuid); exit; } } else { //redirect user - messages::add($text['message-delete_failed'], 'negative'); + message::add($text['message-delete_failed'], 'negative'); header("Location: ?id=".$fax_uuid); exit; } } else { //redirect user - messages::add($text['message-delete_failed'], 'negative'); + message::add($text['message-delete_failed'], 'negative'); header("Location: ?id=".$fax_uuid); exit; } diff --git a/app/fax/fax_log_delete.php b/app/fax/fax_log_delete.php index bf815ceb3e..5526b7338c 100755 --- a/app/fax/fax_log_delete.php +++ b/app/fax/fax_log_delete.php @@ -31,7 +31,7 @@ if (strlen($id)>0) { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: fax_logs.php?id='.$fax_uuid); ?> \ No newline at end of file diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index db13478624..05595177f2 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -656,7 +656,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){ else { if (!$included) { //nothing to send, redirect the browser - messages::add($text['message-invalid-fax'], 'negative'); + message::add($text['message-invalid-fax'], 'negative'); header("Location: fax_send.php?id=".$fax_uuid); exit; } @@ -806,7 +806,7 @@ function fax_split_dtmf(&$fax_number, &$fax_dtmf){ if (!$included) { //redirect the browser - messages::add($response, 'default'); + message::add($response, 'default'); if (permission_exists('fax_active_view')) { header("Location: fax_active.php?id=".$fax_uuid); } diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php index 97dac59887..77ec59ce28 100644 --- a/app/fifo/fifo_add.php +++ b/app/fifo/fifo_add.php @@ -276,7 +276,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $cache->delete("dialplan:".$_SESSION["context"]); //redirect the user - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: ".PROJECT_PATH."/app/dialplans/dialplans.php?app_uuid=16589224-c876-aeb3-f59f-523a1c0801f7"); return; diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index f43531587a..c696990ee4 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -172,7 +172,7 @@ save_gateway_xml(); //redirect the user - messages::add($text['message-copy']); + message::add($text['message-copy']); header("Location: gateways.php"); return; diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php index 23a1a6d867..8e16c3266c 100644 --- a/app/gateways/gateway_delete.php +++ b/app/gateways/gateway_delete.php @@ -113,7 +113,7 @@ if (strlen($_GET["id"])>0) { } //redirect the users - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: gateways.php"); return; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 2ca13012db..d74076a377 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -74,7 +74,7 @@ } unset($prep_statement, $row); if ($total_gateways >= $_SESSION['limit']['gateways']['numeric']) { - messages::add($text['message-maximum_gateways'].' '.$_SESSION['limit']['gateways']['numeric'], 'negative'); + message::add($text['message-maximum_gateways'].' '.$_SESSION['limit']['gateways']['numeric'], 'negative'); header('Location: gateways.php'); return; } @@ -268,10 +268,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: gateways.php"); return; diff --git a/app/ivr_menus/ivr_menu_copy.php b/app/ivr_menus/ivr_menu_copy.php index 25430fff4c..3fa5307275 100644 --- a/app/ivr_menus/ivr_menu_copy.php +++ b/app/ivr_menus/ivr_menu_copy.php @@ -169,7 +169,7 @@ } //redirect the user - messages::add($text['message-copy']); + message::add($text['message-copy']); header("Location: ivr_menus.php"); return; diff --git a/app/ivr_menus/ivr_menu_delete.php b/app/ivr_menus/ivr_menu_delete.php index 6e8a83bdbf..c638eb7405 100644 --- a/app/ivr_menus/ivr_menu_delete.php +++ b/app/ivr_menus/ivr_menu_delete.php @@ -96,7 +96,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: ivr_menus.php"); ?> diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php index 0888ce3373..7a240a6636 100644 --- a/app/ivr_menus/ivr_menu_edit.php +++ b/app/ivr_menus/ivr_menu_edit.php @@ -72,7 +72,7 @@ } unset($prep_statement, $row); if ($total_ivr_menus >= $_SESSION['limit']['ivr_menus']['numeric']) { - messages::add($text['message-maximum_ivr_menus'].' '.$_SESSION['limit']['ivr_menus']['numeric'], 'negative'); + message::add($text['message-maximum_ivr_menus'].' '.$_SESSION['limit']['ivr_menus']['numeric'], 'negative'); header('Location: ivr_menus.php'); return; } @@ -311,12 +311,12 @@ //set the add message if ($action == "add" && permission_exists('ivr_menu_add')) { - messages::add($text['message-add']); + message::add($text['message-add']); } //set the update message if ($action == "update" && permission_exists('ivr_menu_edit')) { - messages::add($text['message-update']); + message::add($text['message-update']); } //redirect the user diff --git a/app/ivr_menus/ivr_menu_option_delete.php b/app/ivr_menus/ivr_menu_option_delete.php index f170f8e25f..cb141db64e 100644 --- a/app/ivr_menus/ivr_menu_option_delete.php +++ b/app/ivr_menus/ivr_menu_option_delete.php @@ -63,7 +63,7 @@ $cache->delete("dialplan:".$_SESSION["context"]); //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: ivr_menu_edit.php?id='.$ivr_menu_uuid); ?> diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php index 55bf60f4d9..14d7318e63 100644 --- a/app/ivr_menus/resources/classes/ivr_menu.php +++ b/app/ivr_menus/resources/classes/ivr_menu.php @@ -190,12 +190,12 @@ include "root.php"; //set the add message if ($action == "add" && permission_exists('ivr_menu_add')) { - messages::add($text['message-add']); + message::add($text['message-add']); } //set the update message if ($action == "update" && permission_exists('ivr_menu_edit')) { - messages::add($text['message-update']); + message::add($text['message-update']); } //return the result diff --git a/app/messages/message_delete.php b/app/messages/message_delete.php index a39e992eb1..1e1159776f 100644 --- a/app/messages/message_delete.php +++ b/app/messages/message_delete.php @@ -33,7 +33,7 @@ $text = $language->get(); //delete the message - messages::add($text['message-delete']); + message::add($text['message-delete']); //delete the data if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('message_delete')) { diff --git a/app/messages/messages.php b/app/messages/messages.php index 74c7882876..edbbe02176 100644 --- a/app/messages/messages.php +++ b/app/messages/messages.php @@ -60,7 +60,7 @@ $obj = new messages; $obj->delete($messages); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/modules/module_delete.php b/app/modules/module_delete.php index ee63388c9b..678412a36f 100644 --- a/app/modules/module_delete.php +++ b/app/modules/module_delete.php @@ -51,7 +51,7 @@ if (strlen($id)>0) { unset($sql); } -messages::add($text['message-delete']); +message::add($text['message-delete']); header("Location: modules.php"); return; diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php index 0d9ec87946..004648f102 100644 --- a/app/modules/module_edit.php +++ b/app/modules/module_edit.php @@ -123,7 +123,7 @@ $module = new modules;; $module->xml(); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: modules.php"); return; } //if ($action == "add") @@ -144,7 +144,7 @@ $module = new modules;; $module->xml(); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: modules.php"); return; } //if ($action == "update") diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 31c425e729..e9db596db7 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -158,7 +158,7 @@ //process, if possible if (!$valid_file_type) { - messages::add($text['message-unsupported_file_type']); + message::add($text['message-unsupported_file_type']); } else { @@ -257,7 +257,7 @@ } //set message - messages::add($text['message-upload_completed']); + message::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 - messages::add($text['message-delete']); + message::add($text['message-delete']); } //require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php"; diff --git a/app/music_on_hold/music_on_hold_delete.php b/app/music_on_hold/music_on_hold_delete.php index 280fc39a1f..a7c1dc26ca 100644 --- a/app/music_on_hold/music_on_hold_delete.php +++ b/app/music_on_hold/music_on_hold_delete.php @@ -65,7 +65,7 @@ $music->reload(); //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: music_on_hold.php'); ?> diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php index 9b0e6d1c6b..d839f34983 100644 --- a/app/music_on_hold/music_on_hold_edit.php +++ b/app/music_on_hold/music_on_hold_edit.php @@ -157,7 +157,7 @@ $music->reload(); //set the message and redirect the user - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: music_on_hold.php"); return; } //if ($action == "add") @@ -199,7 +199,7 @@ $music->reload(); //set the message and redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: music_on_hold.php"); return; } //if ($action == "update") diff --git a/app/number_translations/cmd.php b/app/number_translations/cmd.php index e959a71a3e..2e4c81a231 100644 --- a/app/number_translations/cmd.php +++ b/app/number_translations/cmd.php @@ -47,13 +47,13 @@ if ($fp) { //reloadxml if ($cmd == "api reloadxml") { - messages::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); unset($cmd); } //reload mod_translate if ($cmd == "api reload mod_translate") { - messages::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); unset($cmd); } diff --git a/app/number_translations/number_translation_delete.php b/app/number_translations/number_translation_delete.php index c243d25672..579f1b159e 100644 --- a/app/number_translations/number_translation_delete.php +++ b/app/number_translations/number_translation_delete.php @@ -31,7 +31,7 @@ $text = $language->get(); //delete the message - messages::add($text['message-delete']); + message::add($text['message-delete']); //delete the data if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('number_translation_delete')) { diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php index 0047eb788d..2b36eaf30b 100644 --- a/app/number_translations/number_translations.php +++ b/app/number_translations/number_translations.php @@ -53,7 +53,7 @@ $obj = new number_translations; $obj->delete($number_translations); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/phrases/phrase_delete.php b/app/phrases/phrase_delete.php index a2300a74e0..1a4e9e7a53 100644 --- a/app/phrases/phrase_delete.php +++ b/app/phrases/phrase_delete.php @@ -65,7 +65,7 @@ if ($phrase_uuid != '') { save_phrases_xml(); //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: phrases.php"); return; ?> \ No newline at end of file diff --git a/app/phrases/phrase_detail_delete.php b/app/phrases/phrase_detail_delete.php index b5945ab8e5..d919bb4981 100644 --- a/app/phrases/phrase_detail_delete.php +++ b/app/phrases/phrase_detail_delete.php @@ -66,7 +66,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: phrase_edit.php?id='.$phrase_uuid); ?> \ No newline at end of file diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php index 628d21449d..3f25998468 100644 --- a/app/phrases/phrase_edit.php +++ b/app/phrases/phrase_edit.php @@ -170,7 +170,7 @@ } //send a redirect - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: phrase_edit.php?id=".$phrase_uuid); return; } //if ($action == "add") @@ -239,7 +239,7 @@ } //send a redirect - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: phrase_edit.php?id=".$phrase_uuid); return; diff --git a/app/pin_numbers/pin_number_delete.php b/app/pin_numbers/pin_number_delete.php index 42007fee04..4f4bed16b2 100644 --- a/app/pin_numbers/pin_number_delete.php +++ b/app/pin_numbers/pin_number_delete.php @@ -59,7 +59,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: pin_numbers.php'); ?> \ No newline at end of file diff --git a/app/pin_numbers/pin_number_edit.php b/app/pin_numbers/pin_number_edit.php index 3a568749db..2ee4c15afc 100644 --- a/app/pin_numbers/pin_number_edit.php +++ b/app/pin_numbers/pin_number_edit.php @@ -108,7 +108,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: pin_numbers.php"); return; @@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: pin_numbers.php"); return; diff --git a/app/recordings/recording_delete.php b/app/recordings/recording_delete.php index 5b055164f6..a4c91e28fc 100644 --- a/app/recordings/recording_delete.php +++ b/app/recordings/recording_delete.php @@ -72,7 +72,7 @@ if (strlen($id)>0) { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: recordings.php"); return; ?> \ No newline at end of file diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php index 2ac9158228..c639ade871 100644 --- a/app/recordings/recording_edit.php +++ b/app/recordings/recording_edit.php @@ -97,7 +97,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: recordings.php"); return; } //if (permission_exists('recording_edit')) { diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 1592fcfa8a..8d51a2ac40 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -139,7 +139,7 @@ move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename); //set the message - messages::add($text['message-uploaded'].": ".htmlentities($recording_filename)); + message::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']); diff --git a/app/registrations/cmd.php b/app/registrations/cmd.php index 5db8ecc9af..4ee76a0b55 100644 --- a/app/registrations/cmd.php +++ b/app/registrations/cmd.php @@ -70,7 +70,7 @@ $response = event_socket_request($fp, "api ".$command); $response = event_socket_request($fp, "api log notice ".$command); //show the response - messages::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); + message::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); //close the connection fclose($fp); } diff --git a/app/registrations/registrations.php b/app/registrations/registrations.php index 6332ec915e..6885141e73 100644 --- a/app/registrations/registrations.php +++ b/app/registrations/registrations.php @@ -138,7 +138,7 @@ //show the response if (isset($response)) { - messages::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); + message::add($text['label-event']." ".ucwords($cmd)."     ".$text['label-response'].htmlentities($response)); } //define variables diff --git a/app/ring_groups/ring_group_delete.php b/app/ring_groups/ring_group_delete.php index 003ab7eef5..1266966fa6 100644 --- a/app/ring_groups/ring_group_delete.php +++ b/app/ring_groups/ring_group_delete.php @@ -106,7 +106,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: ring_groups.php"); return; diff --git a/app/ring_groups/ring_group_destination_delete.php b/app/ring_groups/ring_group_destination_delete.php index 688bec3b9d..853fb48479 100644 --- a/app/ring_groups/ring_group_destination_delete.php +++ b/app/ring_groups/ring_group_destination_delete.php @@ -55,7 +55,7 @@ else { } //save the message to a session variable - messages::add($text['message-delete']); + message::add($text['message-delete']); //redirect the browser header("Location: ring_group_edit.php?id=$ring_group_uuid"); diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php index 754e2c00ac..69aa4ec24c 100644 --- a/app/ring_groups/ring_group_destination_edit.php +++ b/app/ring_groups/ring_group_destination_edit.php @@ -132,7 +132,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: ring_group_edit.php?id=".$ring_group_uuid); return; } //if ($action == "add") @@ -153,7 +153,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: ring_group_edit.php?id=".$ring_group_uuid); return; } //if ($action == "update") diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 757beeac5b..1fdfc4cdef 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -57,7 +57,7 @@ $sql .= "and user_uuid = '".$user_uuid."' "; $db->exec(check_sql($sql)); //save the message to a session variable - messages::add($text['message-delete']); + message::add($text['message-delete']); //redirect the browser header("Location: ring_group_edit.php?id=$ring_group_uuid"); exit; @@ -84,7 +84,7 @@ } unset($prep_statement, $row); if ($total_ring_groups >= $_SESSION['limit']['ring_groups']['numeric']) { - messages::add($text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'], 'negative'); + message::add($text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'], 'negative'); header('Location: ring_groups.php'); return; } @@ -152,7 +152,7 @@ $sql_insert .= ")"; $db->exec($sql_insert); //save the message to a session variable - messages::add($text['message-add']); + message::add($text['message-add']); //redirect the browser header("Location: ring_group_edit.php?id=$ring_group_uuid"); exit; @@ -341,14 +341,14 @@ //set the message if ($action == "add") { //save the message to a session variable - messages::add($text['message-add']); + message::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 - messages::add($text['message-update']); + message::add($text['message-update']); } } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php index e3be2abdcc..8ef51e31c2 100644 --- a/app/ring_groups/ring_group_forward.php +++ b/app/ring_groups/ring_group_forward.php @@ -69,7 +69,7 @@ unset($sql); } //redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: ".$_REQUEST['return_url']); exit; } diff --git a/app/services/service_delete.php b/app/services/service_delete.php index 18061136ba..792bd89517 100644 --- a/app/services/service_delete.php +++ b/app/services/service_delete.php @@ -53,7 +53,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: services.php"); return; diff --git a/app/services/service_edit.php b/app/services/service_edit.php index 1dd17d4f6d..674a4aa45d 100644 --- a/app/services/service_edit.php +++ b/app/services/service_edit.php @@ -115,7 +115,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: services.php"); return; } //if ($action == "add") @@ -133,7 +133,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: services.php"); return; } //if ($action == "update") diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php index c4b5e2b648..722da18a4e 100644 --- a/app/settings/setting_edit.php +++ b/app/settings/setting_edit.php @@ -141,7 +141,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //synchronize settings save_setting_xml(); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: setting_edit.php"); return; } //if ($action == "add") @@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //synchronize settings save_setting_xml(); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: setting_edit.php"); return; } //if ($action == "update") diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php index a88a992fd8..7307a058ca 100644 --- a/app/sip_profiles/sip_profile_copy.php +++ b/app/sip_profiles/sip_profile_copy.php @@ -161,7 +161,7 @@ $_SESSION["reload_xml"] = true; //redirect the user - messages::add($text['message-copy']); + message::add($text['message-copy']); header("Location: ".PROJECT_PATH."/app/sip_profiles/sip_profiles.php"); return; diff --git a/app/sip_profiles/sip_profile_delete.php b/app/sip_profiles/sip_profile_delete.php index 34ca185228..a9b9602b75 100644 --- a/app/sip_profiles/sip_profile_delete.php +++ b/app/sip_profiles/sip_profile_delete.php @@ -109,7 +109,7 @@ } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: sip_profiles.php"); return; diff --git a/app/sip_profiles/sip_profile_domain_delete.php b/app/sip_profiles/sip_profile_domain_delete.php index 13a7c2b5c4..2f8255df29 100644 --- a/app/sip_profiles/sip_profile_domain_delete.php +++ b/app/sip_profiles/sip_profile_domain_delete.php @@ -70,7 +70,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: sip_profile_edit.php?id='.$sip_profile_uuid); ?> diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index 7998d19304..42b96e02ec 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -167,10 +167,10 @@ //redirect the user if (isset($action)) { if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header('Location: sip_profile_edit.php?id='.escape($sip_profile_uuid)); return; diff --git a/app/sip_profiles/sip_profile_setting_delete.php b/app/sip_profiles/sip_profile_setting_delete.php index a753b1c7fc..3803b1610f 100644 --- a/app/sip_profiles/sip_profile_setting_delete.php +++ b/app/sip_profiles/sip_profile_setting_delete.php @@ -59,7 +59,7 @@ if (strlen($id)>0) { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: sip_profile_edit.php?id=".$sip_profile_uuid); return; diff --git a/app/sip_status/cmd.php b/app/sip_status/cmd.php index fa4d67e650..552a00febd 100644 --- a/app/sip_status/cmd.php +++ b/app/sip_status/cmd.php @@ -49,7 +49,7 @@ if ($cmd == "api reloadxml") { //reloadxml if ($cmd == "api reloadxml") { - messages::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); unset($cmd); } @@ -58,7 +58,7 @@ //rescan the external profile to look for new or stopped gateways $tmp_cmd = 'api sofia profile external rescan'; - messages::add(rtrim(event_socket_request($fp, $tmp_cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $tmp_cmd)), 'alert'); unset($tmp_cmd); } @@ -70,13 +70,13 @@ //reloadacl if ($cmd == "api reloadacl") { - messages::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); unset($cmd); } //sofia profile if (substr($cmd, 0, 17) == "api sofia profile") { - messages::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); + message::add(rtrim(event_socket_request($fp, $cmd)), 'alert'); } //close the connection diff --git a/app/streams/stream_delete.php b/app/streams/stream_delete.php index 42d519d439..8ea0791519 100644 --- a/app/streams/stream_delete.php +++ b/app/streams/stream_delete.php @@ -30,7 +30,7 @@ $text = $language->get(); //delete the message - messages::add($text['message-delete']); + message::add($text['message-delete']); //delete the data if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('stream_delete')) { diff --git a/app/streams/streams.php b/app/streams/streams.php index a146ea7a5f..55a3ea6cb6 100644 --- a/app/streams/streams.php +++ b/app/streams/streams.php @@ -57,7 +57,7 @@ $obj = new streams; $obj->delete($streams); //delete message - messages::add($text['message-delete']); + message::add($text['message-delete']); } } diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php index 0ab7e01a0b..a85a5a2f85 100644 --- a/app/time_conditions/time_condition_edit.php +++ b/app/time_conditions/time_condition_edit.php @@ -527,10 +527,10 @@ //set the message if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } else if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } header("Location: time_condition_edit.php?id=".$dialplan_uuid.(($app_uuid != '') ? "&app_uuid=".$app_uuid : null)); return; diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index dddaf31c8e..68f848b349 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -52,7 +52,7 @@ $sql .= "and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' "; $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); } //set the http values as php variables diff --git a/app/vars/var_delete.php b/app/vars/var_delete.php index 84e464ce4e..3949e76920 100644 --- a/app/vars/var_delete.php +++ b/app/vars/var_delete.php @@ -60,7 +60,7 @@ } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: vars.php"); return; diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php index fdeb313038..e341fcbb3f 100644 --- a/app/vars/var_edit.php +++ b/app/vars/var_edit.php @@ -141,7 +141,7 @@ save_var_xml(); //set the message and redirect the user - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: vars.php"); return; } //if ($action == "add") @@ -173,7 +173,7 @@ save_var_xml(); //set the message and redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: vars.php"); return; } //if ($action == "update") diff --git a/app/vars/vars.php b/app/vars/vars.php index 78e2586d84..332470bc78 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -55,7 +55,7 @@ //synchronize the configuration save_var_xml(); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: vars.php?id=".$_REQUEST['id']); exit; } diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php index e70a886503..ea78e2f2da 100644 --- a/app/voicemail_greetings/voicemail_greeting_delete.php +++ b/app/voicemail_greetings/voicemail_greeting_delete.php @@ -77,7 +77,7 @@ if (strlen($voicemail_greeting_uuid) > 0) { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: voicemail_greetings.php?id=".$voicemail_id); return; ?> \ No newline at end of file diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php index 21913c6250..ec193677d4 100644 --- a/app/voicemail_greetings/voicemail_greeting_edit.php +++ b/app/voicemail_greetings/voicemail_greeting_edit.php @@ -90,7 +90,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: voicemail_greetings.php?id=".$voicemail_id); return; } //if (permission_exists('voicemail_greeting_edit')) { diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index dff184efbe..b4cb20c213 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -186,7 +186,7 @@ $prep_statement->execute(); unset($prep_statement); - messages::add($text['message-uploaded'].": ".$_FILES['file']['name']); + message::add($text['message-uploaded'].": ".$_FILES['file']['name']); break; } else { @@ -226,7 +226,7 @@ $prep_statement->execute(); unset($prep_statement); - messages::add($text['message-greeting_selected']); + message::add($text['message-greeting_selected']); header("Location: voicemail_greetings.php?id=".$voicemail_id."&order_by=".$order_by."&order=".$order); exit; } diff --git a/app/voicemails/voicemail_delete.php b/app/voicemails/voicemail_delete.php index 4d9233bd26..1ed1c745c3 100644 --- a/app/voicemails/voicemail_delete.php +++ b/app/voicemails/voicemail_delete.php @@ -62,7 +62,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: voicemails.php"); return; diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php index 64bca590ad..89cb6445ca 100644 --- a/app/voicemails/voicemail_edit.php +++ b/app/voicemails/voicemail_edit.php @@ -88,7 +88,7 @@ voicemail_uuid = '".$voicemail_uuid."'"; $db->exec(check_sql($sqld)); //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: voicemail_edit.php?id=".$voicemail_uuid); return; } @@ -116,7 +116,7 @@ )"; $db->exec(check_sql($sqli)); //redirect the browser - messages::add($text['message-add']); + message::add($text['message-add']); } if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { @@ -184,7 +184,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); } //if ($action == "add") if ($action == "update" && permission_exists('voicemail_edit')) { @@ -208,7 +208,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); } //if ($action == "update") diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php index 8a7d088847..d51e4b98eb 100644 --- a/app/voicemails/voicemail_message_edit.php +++ b/app/voicemails/voicemail_message_edit.php @@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: voicemail_edit.php?id=".$voicemail_uuid); return; } //if ($action == "add") @@ -146,7 +146,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: voicemail_edit.php?id=".$voicemail_uuid); return; } //if ($action == "update") diff --git a/app/voicemails/voicemail_option_delete.php b/app/voicemails/voicemail_option_delete.php index 892fc2269a..bf9a9e0876 100644 --- a/app/voicemails/voicemail_option_delete.php +++ b/app/voicemails/voicemail_option_delete.php @@ -58,7 +58,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header('Location: voicemail_edit.php?id='.$voicemail_uuid); ?> diff --git a/app/voicemails/voicemail_option_edit.php b/app/voicemails/voicemail_option_edit.php index 4cfa12390e..7bea44e1c5 100644 --- a/app/voicemails/voicemail_option_edit.php +++ b/app/voicemails/voicemail_option_edit.php @@ -105,7 +105,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header('Location: voicemail_edit.php?id='.$voicemail_uuid); return; } diff --git a/core/apps/apps_delete.php b/core/apps/apps_delete.php index 138c7e2da7..9f9b2d1fd6 100644 --- a/core/apps/apps_delete.php +++ b/core/apps/apps_delete.php @@ -89,7 +89,7 @@ if (strlen($id) > 0) { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: apps.php"); return; diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php index 101d44be40..f705417f10 100644 --- a/core/apps/apps_edit.php +++ b/core/apps/apps_edit.php @@ -88,7 +88,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //$db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: apps.php"); return; } //if ($action == "add") @@ -100,7 +100,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //$db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: apps.php"); return; } //if ($action == "update") diff --git a/core/databases/database_delete.php b/core/databases/database_delete.php index a6fed78ec5..d5411a8cf2 100644 --- a/core/databases/database_delete.php +++ b/core/databases/database_delete.php @@ -54,7 +54,7 @@ else { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: databases.php"); return; diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php index 5114246e21..26a096fd10 100644 --- a/core/databases/database_edit.php +++ b/core/databases/database_edit.php @@ -141,7 +141,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "app_defaults.php"; //redirect the browser - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: databases.php"); return; } //if ($action == "add") @@ -167,7 +167,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "app_defaults.php"; //redirect the browser - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: databases.php"); return; } //if ($action == "update") diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 7b2f362b29..0e981f2971 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -153,12 +153,12 @@ //set the message and redirect the user if ($action == "add" && permission_exists('default_setting_add')) { - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category); return; } if ($action == "update" && permission_exists('default_setting_edit')) { - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category); return; } diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index 6f9f58f06b..d4337bfce7 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -57,7 +57,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: default_settings.php".(($search != '') ? "?search=".escape($search) : null)."#anchor_".escape($category)); exit; } @@ -171,7 +171,7 @@ } else { // set message - messages::add($text['message-copy_failed']); + message::add($text['message-copy_failed']); } header("Location: default_settings.php".(($search != '') ? "?search=".escape($search) : null)); @@ -194,7 +194,7 @@ } else { // set message - messages::add($text['message-delete_failed'], 'negative'); + message::add($text['message-delete_failed'], 'negative'); } header("Location: default_settings.php".(($search != '') ? "?search=".escape($search) : null)); diff --git a/core/default_settings/default_settings_reload.php b/core/default_settings/default_settings_reload.php index 00551980da..8eb3ef8c0b 100644 --- a/core/default_settings/default_settings_reload.php +++ b/core/default_settings/default_settings_reload.php @@ -45,7 +45,7 @@ $domain = new domains(); $domain->db = $db; $domain->set(); -messages::add($text['message-settings_reloaded']); +message::add($text['message-settings_reloaded']); header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)); ?> \ No newline at end of file diff --git a/core/domain_settings/domain_delete.php b/core/domain_settings/domain_delete.php index 58e437fb2b..6f2d301dbc 100644 --- a/core/domain_settings/domain_delete.php +++ b/core/domain_settings/domain_delete.php @@ -210,7 +210,7 @@ if (strlen($id) > 0) { } //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: domains.php"); return; diff --git a/core/domain_settings/domain_edit.php b/core/domain_settings/domain_edit.php index e528788eff..3dd3d8b207 100644 --- a/core/domain_settings/domain_edit.php +++ b/core/domain_settings/domain_edit.php @@ -602,7 +602,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //redirect the browser if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); if (!permission_exists('domain_add')) { //admin, updating own domain header("Location: domain_edit.php"); } @@ -611,7 +611,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } } if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: domains.php"); } return; diff --git a/core/domain_settings/domain_setting_delete.php b/core/domain_settings/domain_setting_delete.php index dcd3e2ec18..09b16f2b2e 100644 --- a/core/domain_settings/domain_setting_delete.php +++ b/core/domain_settings/domain_setting_delete.php @@ -56,7 +56,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: domain_edit.php?id=".$domain_uuid); return; diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 0db576ea32..c9400e453c 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -317,10 +317,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //redirect the browser if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } header("Location: domain_edit.php?id=".$domain_uuid); return; diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index ec09f5c5d5..772af8b72c 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -55,7 +55,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: domain_edit.php?id=".$domain_uuid); exit; } @@ -79,7 +79,7 @@ } else { // set message - messages::add($text['message-delete_failed'], 'negative'); + message::add($text['message-delete_failed'], 'negative'); } header("Location: domain_edit.php?id=".escape($_REQUEST["domain_uuid"])); diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php index 0ee2216dbf..250f55177c 100644 --- a/core/groups/group_permissions.php +++ b/core/groups/group_permissions.php @@ -314,7 +314,7 @@ } } - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: groups.php"); return; } diff --git a/core/groups/groupadd.php b/core/groups/groupadd.php index 71b65b2a42..904a05aa4f 100644 --- a/core/groups/groupadd.php +++ b/core/groups/groupadd.php @@ -95,11 +95,11 @@ // $info[2] is the driver specific error string } - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: groups.php"); } else { - messages::add($text['message-group_exists'], 'negative'); + message::add($text['message-group_exists'], 'negative'); header("Location: groupadd.php"); } diff --git a/core/groups/groupdelete.php b/core/groups/groupdelete.php index d20cd9d6a7..0a0f483c80 100644 --- a/core/groups/groupdelete.php +++ b/core/groups/groupdelete.php @@ -92,7 +92,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: groups.php"); ?> \ No newline at end of file diff --git a/core/groups/groupedit.php b/core/groups/groupedit.php index 48bd71ffb3..aa4e2ee941 100644 --- a/core/groups/groupedit.php +++ b/core/groups/groupedit.php @@ -188,11 +188,11 @@ } } - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: groups.php"); } else { - messages::add($text['message-group_exists'], 'negative'); + message::add($text['message-group_exists'], 'negative'); header("Location: groupedit.php?id=".$group_uuid); } diff --git a/core/groups/groupmemberadd.php b/core/groups/groupmemberadd.php index 1187cc24aa..37fc24b7ae 100644 --- a/core/groups/groupmemberadd.php +++ b/core/groups/groupmemberadd.php @@ -81,7 +81,7 @@ } //redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: groupmembers.php?group_uuid=".$group_uuid."&group_name=".$group_name); ?> \ No newline at end of file diff --git a/core/groups/groupmemberdelete.php b/core/groups/groupmemberdelete.php index 8cfe4d5bae..96b39ba7c4 100644 --- a/core/groups/groupmemberdelete.php +++ b/core/groups/groupmemberdelete.php @@ -64,7 +64,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: groupmembers.php?group_uuid=".$group_uuid."&group_name=".$group_name); ?> \ No newline at end of file diff --git a/core/groups/groups.php b/core/groups/groups.php index b432e0d6b7..1198ea21f5 100644 --- a/core/groups/groups.php +++ b/core/groups/groups.php @@ -62,7 +62,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); } //get the groups diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php index 5781cde481..57ff586637 100644 --- a/core/groups/permissions_copy.php +++ b/core/groups/permissions_copy.php @@ -115,7 +115,7 @@ unset ($prep_statement); //redirect the user - messages::add($text['message-copy']); + message::add($text['message-copy']); } //redirect diff --git a/core/groups/permissions_default.php b/core/groups/permissions_default.php index f6b9f421c6..1928ed95aa 100644 --- a/core/groups/permissions_default.php +++ b/core/groups/permissions_default.php @@ -51,7 +51,7 @@ //redirect the users if (!$included) { //show a message to the user - messages::add($text['message-restore']); + message::add($text['message-restore']); header("Location: groups.php"); return; } diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php index dad1e3dd6b..2de7b3f883 100644 --- a/core/menu/menu_delete.php +++ b/core/menu/menu_delete.php @@ -85,7 +85,7 @@ else { } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: menu.php"); return; diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 114a787cce..d44a8f88d4 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -112,7 +112,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $menu->restore(); //redirect the user back to the main menu - messages::add($text['message-add']); + message::add($text['message-add']); header("Location: menu.php"); return; } //if ($action == "add") @@ -128,7 +128,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //redirect the user back to the main menu - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: menu.php"); return; } //if ($action == "update") diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php index d2f2b85aaf..86c330c14d 100644 --- a/core/menu/menu_item_delete.php +++ b/core/menu/menu_item_delete.php @@ -68,7 +68,7 @@ if (count($_GET)>0) { unset($sql); //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: menu_edit.php?id=".$menu_uuid); return; } diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index 8a221748ca..e512b70011 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -51,7 +51,7 @@ else { $sql .= "where menu_item_group_uuid = '".$menu_item_group_uuid."' "; $db->exec(check_sql($sql)); //redirect the browser - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$menu_item_uuid."&menu_uuid=".$menu_uuid); return; } @@ -280,10 +280,10 @@ else { //set response message if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } //redirect the user diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php index 7728001a95..099aca1e78 100644 --- a/core/menu/menu_item_move_down.php +++ b/core/menu/menu_item_move_down.php @@ -80,7 +80,7 @@ if (count($_GET)>0) { } //redirect the user - messages::add($text['message-moved_down']); + message::add($text['message-moved_down']); header("Location: menu_list.php?menu_item_id=".$menu_item_id); return; } diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php index 9529c3cdc5..05a51579e1 100644 --- a/core/menu/menu_item_move_up.php +++ b/core/menu/menu_item_move_up.php @@ -67,7 +67,7 @@ if (count($_GET)>0) { } //redirect the user - messages::add($text['message-moved_up']); + message::add($text['message-moved_up']); header("Location: menu_list.php?menu_item_id=".$menu_item_id); return; } diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index 367e3c8161..f75d5db840 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -66,7 +66,7 @@ //redirect if (!$included) { //show a message to the user - messages::add($text['message-restore']); + message::add($text['message-restore']); header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".$menu_uuid); return; } diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php index b9407192cd..a3688a604b 100644 --- a/core/notifications/notification_edit.php +++ b/core/notifications/notification_edit.php @@ -138,7 +138,7 @@ else { if ($response['result'] == 'submitted') { // set message - messages::add($text['message-demographics_submitted']); + message::add($text['message-demographics_submitted']); } header("Location: notification_edit.php"); @@ -196,7 +196,7 @@ else { } } // redirect - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: notification_edit.php"); exit; } @@ -208,7 +208,7 @@ else { ($project_notification_method == 'email' && $project_notification_recipient == '') ) { $_SESSION["postback"] = $_POST; - messages::add($text['message-invalid_recipient'], 'negative'); + message::add($text['message-invalid_recipient'], 'negative'); header("Location: notification_edit.php"); exit; } @@ -259,10 +259,10 @@ else { $project_events == 'false' && $project_news == 'false' ) { - messages::add($text['message-update']." - ".$text['message-no_channels'], 'alert'); + message::add($text['message-update']." - ".$text['message-no_channels'], 'alert'); } else { - messages::add($text['message-update']); + message::add($text['message-update']); } // redirect header("Location: notification_edit.php"); diff --git a/core/upgrade/index.php b/core/upgrade/index.php index f94671e0ea..f5480e2f9c 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -77,10 +77,10 @@ } chdir($cwd); if ($update_failed) { - messages::add($text['message-upgrade_source_failed'], 'negative', $message_timeout); + message::add($text['message-upgrade_source_failed'], 'negative', $message_timeout); } else { - messages::add($text['message-upgrade_source'], null, $message_timeout); + message::add($text['message-upgrade_source'], null, $message_timeout); } } @@ -90,7 +90,7 @@ require_once "resources/classes/schema.php"; $obj = new schema(); $_SESSION["response"]["schema"] = $obj->schema("html"); - messages::add($text['message-upgrade_schema'], null, $message_timeout); + message::add($text['message-upgrade_schema'], null, $message_timeout); } // process the apps defaults @@ -98,7 +98,7 @@ require_once "resources/classes/domains.php"; $domain = new domains; $domain->upgrade(); - messages::add($text['message-upgrade_apps'], null, $message_timeout); + message::add($text['message-upgrade_apps'], null, $message_timeout); } // restore defaults of the selected menu @@ -109,14 +109,14 @@ $included = true; require_once("core/menu/menu_restore_default.php"); unset($sel_menu); - messages::add($text['message-upgrade_menu'], null, $message_timeout); + message::add($text['message-upgrade_menu'], null, $message_timeout); } // restore default permissions if ($do["permissions"] && permission_exists("group_edit")) { $included = true; require_once("core/groups/permissions_default.php"); - messages::add($text['message-upgrade_permissions'], null, $message_timeout); + message::add($text['message-upgrade_permissions'], null, $message_timeout); } header("Location: ".PROJECT_PATH."/core/upgrade/index.php"); diff --git a/core/users/user_delete.php b/core/users/user_delete.php index 110f313cfc..e2d0871501 100644 --- a/core/users/user_delete.php +++ b/core/users/user_delete.php @@ -102,7 +102,7 @@ } //redirect the user - messages::add($text['message-delete']); + message::add($text['message-delete']); header("Location: users.php"); ?> \ No newline at end of file diff --git a/core/users/user_edit.php b/core/users/user_edit.php index 3daa9dc791..ddc0b19e74 100644 --- a/core/users/user_edit.php +++ b/core/users/user_edit.php @@ -63,7 +63,7 @@ } unset($prep_statement, $row); if ($total_users >= $_SESSION['limit']['users']['numeric']) { - messages::add($text['message-maximum_users'].' '.$_SESSION['limit']['users']['numeric'], 'negative'); + message::add($text['message-maximum_users'].' '.$_SESSION['limit']['users']['numeric'], 'negative'); header('Location: users.php'); exit; } @@ -90,7 +90,7 @@ $sql .= "and user_uuid = '".$user_uuid."' "; $db->exec(check_sql($sql)); //redirect the user - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: user_edit.php?id=".$user_uuid); return; } @@ -152,7 +152,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") { } if ($msg_error != '') { - messages::add($msg_error, 'negative'); + message::add($msg_error, 'negative'); if ($action == 'edit') { header("Location: user_edit.php?id=".$user_uuid); } @@ -467,7 +467,7 @@ if (count($_POST) > 0 && $_POST["persistform"] != "1") { } //redirect the browser - messages::add($text['message-update']); + message::add($text['message-update']); if ($_REQUEST['action'] == $text['button-add'] || !permission_exists('user_edit')) { header("Location: user_edit.php?id=".$user_uuid); } diff --git a/core/users/user_setting_delete.php b/core/users/user_setting_delete.php index 22abbd3d21..c3ac872f9b 100644 --- a/core/users/user_setting_delete.php +++ b/core/users/user_setting_delete.php @@ -60,7 +60,7 @@ } else { // set message - messages::add($text['message-delete_failed'], 'negative'); + message::add($text['message-delete_failed'], 'negative'); } header("Location: user_edit.php?id=".check_str($_REQUEST["user_uuid"])); diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php index d29ace71ab..1067836c39 100644 --- a/core/users/user_setting_edit.php +++ b/core/users/user_setting_edit.php @@ -319,10 +319,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //redirect the browser if ($action == "update") { - messages::add($text['message-update']); + message::add($text['message-update']); } if ($action == "add") { - messages::add($text['message-add']); + message::add($text['message-add']); } header("Location: user_edit.php?id=".$user_uuid); return; diff --git a/core/users/user_settings.php b/core/users/user_settings.php index a5a0b70d81..0661e58a00 100644 --- a/core/users/user_settings.php +++ b/core/users/user_settings.php @@ -52,7 +52,7 @@ $db->exec(check_sql($sql)); unset($sql); - messages::add($text['message-update']); + message::add($text['message-update']); header("Location: user_edit.php?id=".$user_uuid); exit; } diff --git a/resources/check_auth.php b/resources/check_auth.php index eec0180c6d..be82e87620 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -100,7 +100,7 @@ //redirect the user to the login page $target_path = ($_REQUEST["path"] != '') ? $_REQUEST["path"] : $_SERVER["PHP_SELF"]; - messages::add($text['message-invalid_credentials'], 'negative'); + message::add($text['message-invalid_credentials'], 'negative'); header("Location: ".PROJECT_PATH."/login.php?path=".urlencode($target_path)); exit; } diff --git a/resources/functions.php b/resources/functions.php index b9323ce7ec..17c9ae39e1 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -1029,7 +1029,7 @@ function format_string ($format, $data) { $msg_errors[] = '1+ '.$text['label-special_characters']; } if (is_array($msg_errors) && sizeof($msg_errors) > 0) { - messages::add($_SESSION["message"] = $text['message-password_requirements'].': '.implode(', ', $msg_errors), 'negative', 6000); + message::add($_SESSION["message"] = $text['message-password_requirements'].': '.implode(', ', $msg_errors), 'negative', 6000); return false; } else {