nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

When using dialplan details with the public context ensure call_direction, domain_name and domain_uuids is added to each dialplan detail group

Browse Source
This commit is contained in:
markjcrane
2023-07-15 18:32:25 -06:00
parent 689fe5c6b4
commit 278ae0376b
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -649,6 +649,19 @@
//get the dialplans from the dialplan details
if ($this->source == "details") {
//get the domains
if (!isset($domains)) {
$sql = "select * from v_domains ";
$database = new database;
$result = $database->select($sql, null, 'all');
if (!empty($result)) {
foreach($result as $row) {
$domains[$row['domain_uuid']] = $row['domain_name'];
}
}
unset($sql, $result, $row);
}
//get the data using a join between the dialplans and dialplan details tables
$sql = "select \n";
$sql .= "p.domain_uuid, p.dialplan_uuid, p.app_uuid, p.dialplan_context, p.dialplan_name, p.dialplan_number, \n";
@@ -691,6 +704,10 @@
$results = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);
//define the values before they are used
$previous_dialplan_uuid = null;
$previous_dialplan_detail_group = null;
//loop through the results to get the xml from the dialplan_xml field or from dialplan details table
$x = 0;
if (!empty($results)) {
@@ -902,18 +919,6 @@
if ($this->context == "public" || substr($this->context, 0, 7) == "public@" || substr($this->context, -7) == ".public") {
if ($dialplan_detail_tag == "action") {
if ($first_action) {
//get the domains
if (!isset($domains)) {
$sql = "select * from v_domains ";
$database = new database;
$result = $database->select($sql, null, 'all');
if (!empty($result)) {
foreach($result as $row) {
$domains[$row['domain_uuid']] = $row['domain_name'];
}
}
unset($sql, $result, $row);
}
//add the call direction and domain name and uuid
$xml .= " <action application=\"export\" data=\"call_direction=inbound\" inline=\"true\"/>\n";
if (!empty($domain_uuid)) {
@@ -934,6 +939,11 @@
$xml .= " <anti-action application=\"" . $dialplan_detail_type . "\" data=\"" . $dialplan_detail_data . "\"" . $detail_inline . "/>\n";
}
//reset back to first action if the group has changed
if ($previous_dialplan_detail_group != $dialplan_detail_group) {
$first_action = true;
}
//save the previous values
$previous_dialplan_uuid = $dialplan_uuid;
$previous_dialplan_detail_group = $dialplan_detail_group;