From c3b12c217d362e2e2a5db9073868170fd38c019e Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 28 Apr 2016 16:56:44 -0600 Subject: [PATCH] Cleanup the indentation ... tabs and whitespace after the last pull request. --- app/access_controls/root.php | 6 ++--- app/adminer/root.php | 6 ++--- app/backup/root.php | 6 ++--- app/call_block/root.php | 6 ++--- app/call_broadcast/root.php | 6 ++--- app/call_center_active/root.php | 6 ++--- app/call_centers/root.php | 6 ++--- app/call_flows/root.php | 6 ++--- app/calls/root.php | 6 ++--- app/calls_active/root.php | 6 ++--- app/click_to_call/root.php | 6 ++--- app/conference_centers/root.php | 6 ++--- app/conferences/root.php | 6 ++--- app/conferences_active/root.php | 6 ++--- app/contacts/root.php | 6 ++--- app/destinations/root.php | 6 ++--- app/devices/root.php | 6 ++--- app/dialplan/root.php | 6 ++--- app/dialplan_inbound/root.php | 6 ++--- app/dialplan_outbound/app_defaults.php | 2 +- app/dialplan_outbound/root.php | 6 ++--- app/edit/root.php | 6 ++--- app/emails/root.php | 6 ++--- app/exec/root.php | 6 ++--- app/extensions/root.php | 6 ++--- app/fax/root.php | 6 ++--- app/fifo/root.php | 6 ++--- app/fifo_list/root.php | 6 ++--- app/follow_me/root.php | 6 ++--- app/gateways/root.php | 6 ++--- app/ivr_menus/root.php | 6 ++--- app/log_viewer/root.php | 6 ++--- app/modules/root.php | 6 ++--- app/music_on_hold/root.php | 6 ++--- app/operator_panel/root.php | 6 ++--- app/phrases/root.php | 6 ++--- app/provision/root.php | 6 ++--- app/recordings/root.php | 6 ++--- app/registrations/root.php | 6 ++--- app/ring_groups/root.php | 6 ++--- app/services/root.php | 6 ++--- app/settings/root.php | 6 ++--- app/sip_profiles/root.php | 6 ++--- app/sip_status/root.php | 6 ++--- app/system/root.php | 6 ++--- app/time_conditions/root.php | 6 ++--- app/traffic_graph/root.php | 6 ++--- app/vars/root.php | 6 ++--- app/voicemail_greetings/root.php | 6 ++--- app/voicemails/root.php | 6 ++--- app/xml_cdr/root.php | 6 ++--- core/apps/root.php | 6 ++--- core/databases/root.php | 6 ++--- core/default_settings/app_defaults.php | 2 +- core/default_settings/root.php | 6 ++--- core/domain_settings/root.php | 6 ++--- core/install/install.php | 2 +- core/install/root.php | 6 ++--- core/menu/root.php | 6 ++--- core/notifications/root.php | 6 ++--- core/upgrade/root.php | 6 ++--- core/upgrade/upgrade.php | 15 +++++------- core/user_settings/root.php | 6 ++--- core/users/root.php | 6 ++--- resources/check_auth.php | 32 +++++++++++++------------- resources/classes/root.php | 6 ++--- resources/classes/schema.php | 2 +- resources/classes/switch_settings.php | 13 ++++++----- resources/root.php | 6 ++--- root.php | 6 ++--- secure/root.php | 6 ++--- secure/v_mailto.php | 28 +++++++++++----------- themes/default/root.php | 6 ++--- 73 files changed, 242 insertions(+), 244 deletions(-) diff --git a/app/access_controls/root.php b/app/access_controls/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/access_controls/root.php +++ b/app/access_controls/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/adminer/root.php b/app/adminer/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/adminer/root.php +++ b/app/adminer/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/backup/root.php b/app/backup/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/backup/root.php +++ b/app/backup/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/call_block/root.php b/app/call_block/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/call_block/root.php +++ b/app/call_block/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/call_broadcast/root.php b/app/call_broadcast/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/call_broadcast/root.php +++ b/app/call_broadcast/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/call_center_active/root.php b/app/call_center_active/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/call_center_active/root.php +++ b/app/call_center_active/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/call_centers/root.php b/app/call_centers/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/call_centers/root.php +++ b/app/call_centers/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/call_flows/root.php b/app/call_flows/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/call_flows/root.php +++ b/app/call_flows/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/calls/root.php b/app/calls/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/calls/root.php +++ b/app/calls/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/calls_active/root.php b/app/calls_active/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/calls_active/root.php +++ b/app/calls_active/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/click_to_call/root.php b/app/click_to_call/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/click_to_call/root.php +++ b/app/click_to_call/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/conference_centers/root.php b/app/conference_centers/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/conference_centers/root.php +++ b/app/conference_centers/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/conferences/root.php b/app/conferences/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/conferences/root.php +++ b/app/conferences/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/conferences_active/root.php b/app/conferences_active/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/conferences_active/root.php +++ b/app/conferences_active/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/contacts/root.php b/app/contacts/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/contacts/root.php +++ b/app/contacts/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/destinations/root.php b/app/destinations/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/destinations/root.php +++ b/app/destinations/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/devices/root.php b/app/devices/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/devices/root.php +++ b/app/devices/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/dialplan/root.php b/app/dialplan/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/dialplan/root.php +++ b/app/dialplan/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/dialplan_inbound/root.php b/app/dialplan_inbound/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/dialplan_inbound/root.php +++ b/app/dialplan_inbound/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/dialplan_outbound/app_defaults.php b/app/dialplan_outbound/app_defaults.php index 62d182909d..114c07073c 100644 --- a/app/dialplan_outbound/app_defaults.php +++ b/app/dialplan_outbound/app_defaults.php @@ -26,7 +26,7 @@ //make sure that enum uses sofia internal in the enum.conf.xml file if ($domains_processed == 1) { - $switch_conf_dir = $_SESSION['switch']['conf']['dir']; + $switch_conf_dir = $_SESSION['switch']['conf']['dir']; $file_contents = file_get_contents($switch_conf_dir."/autoload_configs/enum.conf.xml"); $file_contents_new = str_replace("service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/\${use_profile}/\$1", "service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/internal/\$1", $file_contents); if ($file_contents != $file_contents_new) { diff --git a/app/dialplan_outbound/root.php b/app/dialplan_outbound/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/dialplan_outbound/root.php +++ b/app/dialplan_outbound/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/edit/root.php b/app/edit/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/edit/root.php +++ b/app/edit/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/emails/root.php b/app/emails/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/emails/root.php +++ b/app/emails/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/exec/root.php b/app/exec/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/exec/root.php +++ b/app/exec/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/extensions/root.php b/app/extensions/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/extensions/root.php +++ b/app/extensions/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/fax/root.php b/app/fax/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/fax/root.php +++ b/app/fax/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/fifo/root.php b/app/fifo/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/fifo/root.php +++ b/app/fifo/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/fifo_list/root.php b/app/fifo_list/root.php index cc8ae3bcff..b6d02ea421 100644 --- a/app/fifo_list/root.php +++ b/app/fifo_list/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/follow_me/root.php b/app/follow_me/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/follow_me/root.php +++ b/app/follow_me/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/gateways/root.php b/app/gateways/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/gateways/root.php +++ b/app/gateways/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/ivr_menus/root.php b/app/ivr_menus/root.php index cc8ae3bcff..b6d02ea421 100644 --- a/app/ivr_menus/root.php +++ b/app/ivr_menus/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/log_viewer/root.php b/app/log_viewer/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/log_viewer/root.php +++ b/app/log_viewer/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/modules/root.php b/app/modules/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/modules/root.php +++ b/app/modules/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/music_on_hold/root.php b/app/music_on_hold/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/music_on_hold/root.php +++ b/app/music_on_hold/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/operator_panel/root.php b/app/operator_panel/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/operator_panel/root.php +++ b/app/operator_panel/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/phrases/root.php b/app/phrases/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/phrases/root.php +++ b/app/phrases/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/provision/root.php b/app/provision/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/provision/root.php +++ b/app/provision/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/recordings/root.php b/app/recordings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/recordings/root.php +++ b/app/recordings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/registrations/root.php b/app/registrations/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/registrations/root.php +++ b/app/registrations/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/ring_groups/root.php b/app/ring_groups/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/ring_groups/root.php +++ b/app/ring_groups/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/services/root.php b/app/services/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/services/root.php +++ b/app/services/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/settings/root.php b/app/settings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/settings/root.php +++ b/app/settings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/sip_profiles/root.php b/app/sip_profiles/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/sip_profiles/root.php +++ b/app/sip_profiles/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/sip_status/root.php b/app/sip_status/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/sip_status/root.php +++ b/app/sip_status/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/system/root.php b/app/system/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/system/root.php +++ b/app/system/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/time_conditions/root.php b/app/time_conditions/root.php index cc8ae3bcff..89cc1aa8ab 100644 --- a/app/time_conditions/root.php +++ b/app/time_conditions/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/traffic_graph/root.php b/app/traffic_graph/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/traffic_graph/root.php +++ b/app/traffic_graph/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/vars/root.php b/app/vars/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/vars/root.php +++ b/app/vars/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/voicemail_greetings/root.php b/app/voicemail_greetings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/voicemail_greetings/root.php +++ b/app/voicemail_greetings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/voicemails/root.php b/app/voicemails/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/voicemails/root.php +++ b/app/voicemails/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/app/xml_cdr/root.php b/app/xml_cdr/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/app/xml_cdr/root.php +++ b/app/xml_cdr/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/apps/root.php b/core/apps/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/apps/root.php +++ b/core/apps/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/databases/root.php b/core/databases/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/databases/root.php +++ b/core/databases/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index d8d1223b01..73751a608a 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -98,7 +98,7 @@ if ($domains_processed == 1) { $array[$x]['default_setting_value'] = '0'; $array[$x]['default_setting_enabled'] = 'false'; $array[$x]['default_setting_description'] = 'use non-default port if enabled and non-zero'; - $x++; + $x++; $array[$x]['default_setting_category'] = 'email'; $array[$x]['default_setting_subcategory'] = 'smtp_from'; $array[$x]['default_setting_name'] = 'var'; diff --git a/core/default_settings/root.php b/core/default_settings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/default_settings/root.php +++ b/core/default_settings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/domain_settings/root.php b/core/domain_settings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/domain_settings/root.php +++ b/core/domain_settings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/install/install.php b/core/install/install.php index abf6544a58..db4ed4a646 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -49,7 +49,7 @@ $db_create = ''; $db_create_username = ''; $db_create_password = ''; - $db = NULL; + $db = NULL; //detect the iso country code from the locale //$locale = Locale::getDefault(); diff --git a/core/install/root.php b/core/install/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/install/root.php +++ b/core/install/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/menu/root.php b/core/menu/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/menu/root.php +++ b/core/menu/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/notifications/root.php b/core/notifications/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/notifications/root.php +++ b/core/notifications/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/upgrade/root.php b/core/upgrade/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/upgrade/root.php +++ b/core/upgrade/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php index 7de3bbec35..e422b549cb 100644 --- a/core/upgrade/upgrade.php +++ b/core/upgrade/upgrade.php @@ -25,17 +25,14 @@ */ //check the permission - if(defined('STDIN')) { -// $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); -// preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); -// $document_root = $matches[1]; -// set_include_path($document_root); - $format = 'text'; //html, text - include "root.php"; + $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); + preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); + $document_root = $matches[1]; + set_include_path($document_root); require_once "resources/require.php"; - -// $_SERVER["DOCUMENT_ROOT"] = $document_root; + $_SERVER["DOCUMENT_ROOT"] = $document_root; + $format = 'text'; //html, text } else { include "root.php"; diff --git a/core/user_settings/root.php b/core/user_settings/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/user_settings/root.php +++ b/core/user_settings/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/core/users/root.php b/core/users/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/core/users/root.php +++ b/core/users/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/resources/check_auth.php b/resources/check_auth.php index f5d1647193..9c5b0b35a3 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -110,27 +110,27 @@ require_once "resources/require.php"; if (strlen(check_str($_REQUEST["domain_name"])) > 0) { $domain_name = check_str($_REQUEST["domain_name"]); } - if (isset($_SESSION["ldap"]["certpath"])) { - $s="LDAPTLS_CERT=" . $_SESSION["ldap"]["certpath"]["text"]; - putenv($s); - } - if (isset($_SESSION["ldap"]["certkey"])) { - $s="LDAPTLS_KEY=" . $_SESSION["ldap"]["certkey"]["text"]; - putenv($s); - } - $host=$_SESSION["ldap"]["server_host"]["text"]; - $port=$_SESSION["ldap"]["server_port"]["numeric"]; + if (isset($_SESSION["ldap"]["certpath"])) { + $s="LDAPTLS_CERT=" . $_SESSION["ldap"]["certpath"]["text"]; + putenv($s); + } + if (isset($_SESSION["ldap"]["certkey"])) { + $s="LDAPTLS_KEY=" . $_SESSION["ldap"]["certkey"]["text"]; + putenv($s); + } + $host=$_SESSION["ldap"]["server_host"]["text"]; + $port=$_SESSION["ldap"]["server_port"]["numeric"]; $connect = ldap_connect($host) or die("Could not connect to the LDAP server."); //ldap_set_option($connect, LDAP_OPT_NETWORK_TIMEOUT, 10); ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3); - //ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7); + //ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7); $bind_dn = $_SESSION["ldap"]["user_attribute"]["text"]."=".$username.",".$_SESSION["ldap"]["user_dn"]["text"]; - $bind_pw = $_REQUEST["password"]; - //Note: As of 4/16, the call below will fail randomly. Php debug reports ldap_bind - //called below with all arguments '*uninitialized*'. However, the debugger - //single-stepping just before the failing call correctly displays all the values. - $bind = ldap_bind($connect, $bind_dn, $bind_pw ); + $bind_pw = $_REQUEST["password"]; + //Note: As of 4/16, the call below will fail randomly. PHP debug reports ldap_bind + //called below with all arguments '*uninitialized*'. However, the debugger + //single-stepping just before the failing call correctly displays all the values. + $bind = ldap_bind($connect, $bind_dn, $bind_pw); if ($bind) { $_SESSION['username'] = $username; } diff --git a/resources/classes/root.php b/resources/classes/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/resources/classes/root.php +++ b/resources/classes/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/resources/classes/schema.php b/resources/classes/schema.php index aa8fd0f434..2f4eefd513 100644 --- a/resources/classes/schema.php +++ b/resources/classes/schema.php @@ -460,7 +460,7 @@ if (!class_exists('schema')) { //set the global variable global $db, $upgrade_data_types, $text,$output_format; - if ($format=='') $format = $output_format; + if ($format=='') $format = $output_format; //get the db variables $config = new config; diff --git a/resources/classes/switch_settings.php b/resources/classes/switch_settings.php index 070744b2e6..a01afad1b2 100644 --- a/resources/classes/switch_settings.php +++ b/resources/classes/switch_settings.php @@ -67,14 +67,15 @@ if (!class_exists('switch_settings')) { } } - { //connect to event socket - $esl = new event_socket; - $esl->connect($this->event_socket_ip_address, $this->event_socket_port, $this->event_socket_password); + //connect to event socket + $esl = new event_socket; + $esl->connect($this->event_socket_ip_address, $this->event_socket_port, $this->event_socket_password); - //run the api command - $result = $esl->request('api global_getvar'); - } //close event socket + //run the api command + $result = $esl->request('api global_getvar'); + //close event socket + fclose($fp); //set the result as a named array $vars = array(); diff --git a/resources/root.php b/resources/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/resources/root.php +++ b/resources/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/root.php b/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/root.php +++ b/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/secure/root.php b/secure/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/secure/root.php +++ b/secure/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){ diff --git a/secure/v_mailto.php b/secure/v_mailto.php index c59375d184..63bb485b3b 100644 --- a/secure/v_mailto.php +++ b/secure/v_mailto.php @@ -135,11 +135,11 @@ //prepare smtp server settings // load default smtp settings $smtp['host'] = (strlen($_SESSION['email']['smtp_host']['var'])?$_SESSION['email']['smtp_host']['var']:'127.0.0.1'); - if (isset($_SESSION['email']['smtp_port'])) { - $smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric']; - } else { - $smtp['port'] = 0; - } + if (isset($_SESSION['email']['smtp_port'])) { + $smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric']; + } else { + $smtp['port'] = 0; + } $smtp['secure'] = $_SESSION['email']['smtp_secure']['var']; $smtp['auth'] = $_SESSION['email']['smtp_auth']['var']; $smtp['username'] = $_SESSION['email']['smtp_username']['var']; @@ -178,17 +178,17 @@ include "resources/phpmailer/class.phpmailer.php"; include "resources/phpmailer/class.smtp.php"; $mail = new PHPMailer(); - if (isset($_SESSION['email']['method'])) { - switch($_SESSION['email']['method']['text']) { - case 'sendmail': $mail->IsSendmail(); break; - case 'qmail': $mail->IsQmail(); break; - case 'mail': $mail->IsMail(); break; - default: $mail->IsSMTP(); break; - } - } else $mail->IsSMTP(); + if (isset($_SESSION['email']['method'])) { + switch($_SESSION['email']['method']['text']) { + case 'sendmail': $mail->IsSendmail(); break; + case 'qmail': $mail->IsQmail(); break; + case 'mail': $mail->IsMail(); break; + default: $mail->IsSMTP(); break; + } + } else $mail->IsSMTP(); $mail->SMTPAuth = $smtp['auth']; $mail->Host = $smtp['host']; - if ($smtp['port']!=0) $mail->Port=$smtp['port']; + if ($smtp['port']!=0) $mail->Port=$smtp['port']; if ($smtp['secure'] != '') { $mail->SMTPSecure = $smtp['secure']; } diff --git a/themes/default/root.php b/themes/default/root.php index cc8ae3bcff..6fdf32f37b 100644 --- a/themes/default/root.php +++ b/themes/default/root.php @@ -25,7 +25,7 @@ */ // make sure the PATH_SEPARATOR is defined - umask(2); + umask(2); if (!defined("PATH_SEPARATOR")) { if (strpos($_ENV["OS"], "Win") !== false) { define("PATH_SEPARATOR", ";"); @@ -34,8 +34,8 @@ } } - if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; - + if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; + // make sure the document_root is set $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); if(PHP_SAPI == 'cli'){