nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor PHP code (#7574)

Browse Source 
* Use settings-get method
- get default, domain and user settings
- Replace _SESSION

* Simplify get domain paging

* Change isset using empty

* Fix token name and hash

* Add new default settings category: contact, name: default_sort_column, and default_sort_order

* Update app_config.php

* Update footer.php

* Fix require.php and core/dashboard/index.php (#7563)

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Fix require.php and core/dashboard/index.php

* Update destinations.php

* Update permission.php

* Update require.php

---------

Co-authored-by: FusionPBX <markjcrane@gmail.com>
Co-authored-by: FusionPBX <mark@fusionpbx.com>

* Update header.php

* Use settings get classes (#7567)

* access_control

* azure

* azure

* basic_operator_panel

* bridges

* call_block

* call_broadcast

* call_center

* call_flows

* call_forward

* call_recordings

* do_not_disturb

* feature_event_notify

* follow_me

* remove unused object properties

* fix esl command

* fix esl command

* conference_centers

* conference_centers - remove whitespace

* conference_controls

* conference_profiles

* conference_profiles

* Delete core/websockets/resources/classes/socket_exception.php.original~

* Delete core/websockets/resources/classes/websocket_server.php.original~

* conferences

* destinations

* device

* dialplan

* email_queue

* event_guard

* extension_settings

* extension

* fax

* fax_queue

* fifo

* gateways

* ivr_menu

* modules

* switch_music_on_hold

* number_translations

* phrases

* pin_numbers

* provision

* switch_recordings

* registrations

* ring_groups

* sip_profiles

* sofia_global_settings

* streams

* presence

* switch_files

* time_conditions

* vars

* voicemail_greetings

* voicemail

* ringbacks

* contacts

* xml_cdr

* authentication

* dashboard

* default_settings

* domain_settings

* email_templates

* permission

* user_logs

* user_settings

* users

* button

* cache

* captcha

* remove cli_option

* remove directory.php for switch_directory class

* email

* file

* groups

* event_socket use config object

* Use intval to give an integer port

* switch_settings

* tones

* fix object used before initialization

* menu

* fix copy paste error for switch_files.php

* always include require.php for framework files

* Fix missing properties

* set the action

* Use the $database object

* Add missing class properties

* Fix the domain_name

* Use public scope for domain_uuid and domain_name

* Add missing parameters

* Correct the user_uuid parameter

* Add json_validate and use it in the dashboard
update indentation on functions.php

* Intialize the active_registrations variable

* Define the $parameters

* Set a default value for user_setting_enabled

* Add condition domain_uuid not empty

* Add not empty condition for domain_uuid

* Declare the global variables

* Update how the defaults are set use ??

* Use ?? to set the default values

* Update call_center_queue_edit.php

* Prevent an error

* Add domain_name property

* Fix the null coalescing operator

* Removed domain_uuid from the URL

* Change condition to check sip_profile_domain_name

* Refactor domain_uuid declaration and comments

Removed redundant domain_uuid declaration and updated comments.

* Account for an empty value

* Refactor constructor to use settings array

Updated constructor to accept settings array for domain UUID and database initialization.

* Refactor xml_cdr.php to improve variable organization

Removed duplicate domain_uuid declaration and reorganized private variables for better structure.

* Enhance transcription button logic and icon display

Updated transcription button visibility conditions and improved application icon handling in the call flow summary.

* Refactor settings initialization in domains.php

Updated settings initialization to include domain_uuid and user_uuid.

* Modify domain change condition in require.php

Updated condition to check if 'domain_change' is not empty before proceeding.

* Set default_setting_enabled to true by default

* Enhance domain UUID check in access controls

* Enhance domain UUID check in settings list

* Refactor category display logic in vars.php

* Simplify list row URL generation

Removed domain UUID check from list row URL construction.

* Refactor module category display logic

* Fix SQL query by removing parameters variable

* Initialize result_count variable for call recordings

* Refactor leg variable usage in xml_cdr_details.php

* Update conference_room_edit.php

* Change GET to REQUEST for order and search variables

* Set timezone and SQL time format in recordings.php

Added timezone and SQL time format settings.

* Set default for ring group greeting

* Improve domain UUID check in stream listing

* Handle null voicemail_option_param safely

* Add file existence check for greeting files

Check if greeting file exists before getting size and date.

* Improve domain UUID check in email templates

* Update FIFO strategy dropdown and description text

* Add multilingual agent descriptions

Added multilingual descriptions for agents in the app_languages.php file.

* Add music on hold descriptions

* Add the chime list description

Updated copyright year from 2024 to 2025.

* Fix domain UUID check and handle email subject decoding

* Add null coalescing for $value in email_test.php

Ensure $value is not null by providing a default empty string.

* Handle undefined dialplan_uuid in input field

* Add translations for 'Status' label in multiple languages

* Fix typo in config instance check

---------

Co-authored-by: frytimo <tim@fusionpbx.com>
This commit is contained in:
FusionPBX
2025-10-15 21:24:59 -06:00
committed by GitHub
parent e4ca0bf47d
commit dda18481ec
249 changed files with 5180 additions and 4798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
resources/switch.php
View File

@@ -115,14 +115,14 @@ function filename_safe($filename) {
function save_gateway_xml() {
//declare the global variables
global $database, $settings, $domain_uuid, $config;
//skip saving the gateway xml if the directory is not set
if (empty($_SESSION['switch']['sip_profiles']['dir'])) {
if (empty($settings->get('switch', 'sip_profiles'))) {
return;
}
//declare the global variables
global $database, $domain_uuid, $config;
//delete all old gateways to prepare for new ones
if (count($_SESSION["domains"]) > 1) {
$v_needle = 'v_'.$_SESSION['domain_name'].'-';
@@ -130,7 +130,7 @@ function save_gateway_xml() {
else {
$v_needle = 'v_';
}
$gateway_list = glob($_SESSION['switch']['sip_profiles']['dir'] . "/*/".$v_needle."*.xml");
$gateway_list = glob($settings->get('switch', 'sip_profiles') . "/*/".$v_needle."*.xml");
foreach ($gateway_list as $gateway_file) {
unlink($gateway_file);
}
@@ -149,7 +149,7 @@ function save_gateway_xml() {
$profile = "external";
}
//open the xml file
$fout = fopen($_SESSION['switch']['sip_profiles']['dir']."/".$profile."/v_".strtolower($row['gateway_uuid']).".xml","w");
$fout = fopen($settings->get('switch', 'sip_profiles')."/".$profile."/v_".strtolower($row['gateway_uuid']).".xml","w");
//build the xml
$xml .= "<include>\n";
$xml .= " <gateway name=\"" . strtolower($row['gateway_uuid']) . "\">\n";
@@ -254,63 +254,63 @@ function save_gateway_xml() {
}
function save_var_xml() {
if (!empty($_SESSION['switch']['conf']) && is_array($_SESSION['switch']['conf'])) {
//declare the global variables
global $database, $config, $domain_uuid;
//declare the global variables
global $database, $config, $settings, $domain_uuid;
//skip this function if the conf directory is empty
if (empty($_SESSION['switch']['conf']['dir'])) {
return false;
}
//open the vars.xml file
$fout = fopen($_SESSION['switch']['conf']['dir']."/vars.xml","w");
//get the hostname
$hostname = trim(event_socket_request_cmd('api switchname'));
if (empty($hostname)) {
$hostname = trim(gethostname());
}
if (empty($hostname)) {
return;
}
//build the xml
$sql = "select * from v_vars ";
$sql .= "where var_enabled = true ";
$sql .= "order by var_category, var_order asc ";
$variables = $database->select($sql, null, 'all');
$prev_var_category = '';
$xml = '';
if (!empty($variables)) {
foreach ($variables as $row) {
if ($row['var_category'] != 'Provision') {
if ($prev_var_category != $row['var_category']) {
$xml .= "\n<!-- ".$row['var_category']." -->\n";
}
if (empty($row['var_command'])) { $row['var_command'] = 'set'; }
if ($row['var_category'] == 'Exec-Set') { $row['var_command'] = 'exec-set'; }
if (empty($row['var_hostname'])) {
$xml .= "<X-PRE-PROCESS cmd=\"".$row['var_command']."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
} elseif ($row['var_hostname'] == $hostname) {
$xml .= "<X-PRE-PROCESS cmd=\"".$row['var_command']."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
}
}
$prev_var_category = $row['var_category'];
}
}
$xml .= "\n";
fwrite($fout, $xml);
unset($sql, $variables, $xml);
fclose($fout);
//apply settings
$_SESSION["reload_xml"] = true;
//$cmd = "api reloadxml";
//event_socket_request_cmd($cmd);
//unset($cmd);
//skip this function if the conf directory is empty
$switch_conf_dir = $settings->get('switch', 'conf', $config->get('switch.conf.dir', ''));
if (empty($switch_conf_dir)) {
return false;
}
//open the vars.xml file
$fout = fopen($switch_conf_dir."/vars.xml","w");
//get the hostname
$hostname = trim(event_socket_request_cmd('api switchname'));
if (empty($hostname)) {
$hostname = trim(gethostname());
}
if (empty($hostname)) {
return;
}
//build the xml
$sql = "select * from v_vars ";
$sql .= "where var_enabled = true ";
$sql .= "order by var_category, var_order asc ";
$variables = $database->select($sql, null, 'all');
$prev_var_category = '';
$xml = '';
if (!empty($variables)) {
foreach ($variables as $row) {
if ($row['var_category'] != 'Provision') {
if ($prev_var_category != $row['var_category']) {
$xml .= "\n<!-- ".$row['var_category']." -->\n";
}
if (empty($row['var_command'])) { $row['var_command'] = 'set'; }
if ($row['var_category'] == 'Exec-Set') { $row['var_command'] = 'exec-set'; }
if (empty($row['var_hostname'])) {
$xml .= "<X-PRE-PROCESS cmd=\"".$row['var_command']."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
} elseif ($row['var_hostname'] == $hostname) {
$xml .= "<X-PRE-PROCESS cmd=\"".$row['var_command']."\" data=\"".$row['var_name']."=".$row['var_value']."\" />\n";
}
}
$prev_var_category = $row['var_category'];
}
}
$xml .= "\n";
fwrite($fout, $xml);
unset($sql, $variables, $xml);
fclose($fout);
//apply settings
$_SESSION["reload_xml"] = true;
//$cmd = "api reloadxml";
//event_socket_request_cmd($cmd);
//unset($cmd);
}
function outbound_route_to_bridge($domain_uuid, $destination_number, array $channel_variables=null) {
@@ -525,7 +525,8 @@ function extension_exists($extension) {
}
function extension_presence_id($extension, $number_alias = false) {
global $database, $domain_uuid;
//declare the global variables
global $database, $domain_uuid, $settings;
if ($number_alias === false) {
$sql = "select extension, number_alias from v_extensions ";
@@ -548,7 +549,7 @@ function extension_presence_id($extension, $number_alias = false) {
}
if (!empty($number_alias)) {
if ($_SESSION['provision']['number_as_presence_id']['text'] === 'true') {
if ($settings->get('provision', 'number_as_presence_id') === 'true') {
return $number_alias;
}
}
@@ -556,6 +557,7 @@ function extension_presence_id($extension, $number_alias = false) {
}
function get_recording_filename($id) {
//declare the global variables
global $database, $domain_uuid;
$sql = "select * from v_recordings ";
@@ -589,9 +591,10 @@ if (!function_exists('phone_letter_to_number')) {
if (!function_exists('save_call_center_xml')) {
function save_call_center_xml() {
global $database, $domain_uuid;
//declare the global variables
global $database, $domain_uuid, $settings;
if (!empty($_SESSION['switch']['call_center']['dir'])) {
if (!empty($settings->get('switch', 'call_center'))) {
//get the call center queue array
$sql = "select * from v_call_center_queues ";
@@ -797,7 +800,7 @@ if (!function_exists('save_call_center_xml')) {
unset($v_tiers);
//write the XML config file
$fout = fopen($_SESSION['switch']['conf']['dir']."/autoload_configs/callcenter.conf.xml","w");
$fout = fopen($settings->get('switch', 'conf')."/autoload_configs/callcenter.conf.xml","w");
fwrite($fout, $file_contents);
fclose($fout);
@@ -812,6 +815,9 @@ if (!function_exists('save_call_center_xml')) {
if (!function_exists('switch_conf_xml')) {
function switch_conf_xml() {
//declare the global variables
global $settings;
//get the contents of the template
if (file_exists('/usr/share/examples/fusionpbx/resources/templates/conf')) {
$path = "/usr/share/examples/fusionpbx/resources/templates/conf";
@@ -858,7 +864,7 @@ if (!function_exists('switch_conf_xml')) {
unset ($v_mailer_app_args);
//write the XML config file
$fout = fopen($_SESSION['switch']['conf']['dir']."/autoload_configs/switch.conf.xml","w");
$fout = fopen($settings->get('switch', 'conf')."/autoload_configs/switch.conf.xml","w");
fwrite($fout, $file_contents);
fclose($fout);
@@ -892,7 +898,7 @@ if (!function_exists('xml_cdr_conf_xml')) {
unset ($v_pass);
//write the XML config file
$switch_configuration_dir = !empty($_SESSION['switch']['conf']['dir']) ? $_SESSION['switch']['conf']['dir'] : '/etc/freeswitch';
$switch_configuration_dir = !empty($settings->get('switch', 'conf')) ? $settings->get('switch', 'conf') : '/etc/freeswitch';
$fout = fopen($switch_configuration_dir . "/autoload_configs/xml_cdr.conf.xml","w");
fwrite($fout, $file_contents);
fclose($fout);
@@ -905,15 +911,15 @@ if (!function_exists('xml_cdr_conf_xml')) {
if (!function_exists('save_sip_profile_xml')) {
function save_sip_profile_xml() {
//declare the global variables
global $database;
global $database, $settings;
//skip saving the sip profile xml if the directory is not set
if (empty($_SESSION['switch']['sip_profiles']['dir'])) {
if (empty($settings->get('switch', 'sip_profiles'))) {
return;
}
// make profile dir if needed
$profile_dir = $_SESSION['switch']['conf']['dir']."/sip_profiles";
$profile_dir = $settings->get('switch', 'conf')."/sip_profiles";
if (!is_readable($profile_dir)) {
mkdir($profile_dir, 0770, false);
}
@@ -986,13 +992,16 @@ if (!function_exists('save_sip_profile_xml')) {
if (!function_exists('save_switch_xml')) {
function save_switch_xml() {
if (is_readable($_SESSION['switch']['extensions']['dir'])) {
//define the global settings
global $settings;
if (is_readable($settings->get('switch', 'extensions'))) {
if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/extensions/resources/classes/extension.php")) {
$extension = new extension;
$extension->xml();
}
}
if (is_readable($_SESSION['switch']['conf']['dir'])) {
if (is_readable($settings->get('switch', 'conf'))) {
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/settings/app_config.php")) {
save_setting_xml();
}