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

Fix multiple PHP warnings

Browse Source
This commit is contained in:
markjcrane
2025-11-01 19:58:21 -06:00
parent a675660473
commit bf5bb4f642
41 changed files with 539 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/dialplans/resources/classes/dialplan.php
View File

@@ -524,10 +524,10 @@
}
if ($regex_match) {
//get the variables
if ($field[dialplan_detail_type] == "set" && $field[dialplan_detail_tag] == "action") {
if ($field['dialplan_detail_type'] == "set" && $field['dialplan_detail_tag'] == "action") {
//only set variables with values not variables
if (strpos($field[dialplan_detail_data], '$') === false) {
$this->variables .= $field[dialplan_detail_data].",";
if (strpos($field['dialplan_detail_data'], '$') === false) {
$this->variables .= $field['dialplan_detail_data'].",";
}
}
//process the $x detail data variables
@@ -700,9 +700,12 @@
}
//define the values before they are used
$previous_dialplan_uuid = null;
$previous_dialplan_detail_group = null;
$dialplan_tag_status = null;
$previous_dialplan_uuid = '';
$previous_dialplan_detail_group = '';
$dialplan_tag_status = '';
$condition_attribute = '';
$condition_break = '';
$xml = '';
//loop through the results to get the xml from the dialplan_xml field or from dialplan details table
$x = 0;
@@ -869,7 +872,7 @@
}
//get the condition break attribute
$condition_break = "";
$condition_break = '';
if ($dialplan_detail_break) {
if (!empty($dialplan_detail_break)) {
$condition_break = " break=\"" . $dialplan_detail_break . "\"";
@@ -974,7 +977,7 @@
if ($condition_attribute && (!empty($condition_attribute))) {
$xml .= " <condition " . $condition_attribute . $condition_break . "/>\n";
}
else if (!empty($condition) && substr($string, -1) == ">") {
else if (!empty($condition) && substr($condition, -1) == ">") {
$xml .= $condition . "\n";
}
else if (!empty($condition)) {
@@ -1035,29 +1038,35 @@
$xml_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/switch/conf/dialplan/*.xml");
foreach ($xml_list as $xml_file) {
//get and parse the xml
$xml_string = file_get_contents($xml_file);
//get the order number prefix from the file name
$name_array = explode('_', basename($xml_file));
if (is_numeric($name_array[0])) {
$dialplan_order = $name_array[0];
}
else {
$dialplan_order = 0;
}
$dialplan->dialplan_order = $dialplan_order;
$xml_string = file_get_contents($xml_file);
$this->xml = $xml_string;
$this->import();
//get the order number prefix from the file name
$name_array = explode('_', basename($xml_file));
if (is_numeric($name_array[0])) {
$dialplan_order = $name_array[0];
}
else {
$dialplan_order = 0;
}
//set the xml string
$this->xml = $xml_string;
//get the domains
$sql = 'select * from v_domains';
$domains = $this->database->select($sql, null, 'all');
$this->import($domains);
unset($sql);
}
//update the dialplan order
$sql[] = "update v_dialplans set dialplan_order = '870' where dialplan_order = '980' and dialplan_name = 'cidlookup' ";
$sql[] = "update v_dialplans set dialplan_order = '880' where dialplan_order = '990' and dialplan_name = 'call_screen' ";
$sql[] = "update v_dialplans set dialplan_order = '890' where dialplan_order = '999' and dialplan_name = 'local_extension' ";
foreach ($sql as $query) {
$sql_array[] = "update v_dialplans set dialplan_order = '870' where dialplan_order = '980' and dialplan_name = 'cidlookup' ";
$sql_array[] = "update v_dialplans set dialplan_order = '880' where dialplan_order = '990' and dialplan_name = 'call_screen' ";
$sql_array[] = "update v_dialplans set dialplan_order = '890' where dialplan_order = '999' and dialplan_name = 'local_extension' ";
foreach ($sql_array as $query) {
$this->database->execute($query);
}
unset($sql, $query);
unset($sql_array, $query);
//add xml for each dialplan where the dialplan xml is empty
$this->source = "details";