dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add condition_app and condition_data 

This allows caller ID routing with one destination.
This commit is contained in:
FusionPBX 2023-07-04 14:45:40 -06:00 committed by GitHub
parent 07ff69b53d
commit 6f73009728
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/destinations/destination_edit.php
View File

@ -129,8 +129,11 @@
if (isset($row['condition_expression']) && !empty($row['condition_expression'])) {
if ($row['condition_field'] == 'caller_id_number') {
$row['condition_expression'] = preg_replace('#[^\+0-9\*]#', '', $row['condition_expression']);
$action_array = explode(":", $row['condition_action'], 2);
$conditions[$i]['condition_field'] = $row['condition_field'];
$conditions[$i]['condition_expression'] = $row['condition_expression'];
$conditions[$i]['condition_app'] = $action_array[0];
$conditions[$i]['condition_data'] = $action_array[1];
$i++;
}
}
@ -474,7 +477,15 @@
else {
$condition_expression = str_replace("+", "\+", $row['condition_expression']);
}
$dialplan["dialplan_xml"] .= " <condition field=\"".xml::sanitize($row['condition_field'])."\" expression=\"^".xml::sanitize($condition_expression)."$\"/>\n";
$dialplan["dialplan_xml"] .= " <condition regex=\"all\" break=\"never\">\n";
$dialplan["dialplan_xml"] .= " <regex field=\"".$dialplan_detail_type."\" expression=\"".xml::sanitize($destination_number_regex)."\"/>\n";
$dialplan["dialplan_xml"] .= " <regex field=\"".xml::sanitize($row['condition_field'])."\" expression=\"^".xml::sanitize($condition_expression)."$\"/>\n";
if (isset($row['condition_app']) && !empty($row['condition_app'])) {
if ($destination->valid($row['condition_app'].':'.$row['condition_data'])) {
$dialplan["dialplan_xml"] .= " <action application=\"".xml::sanitize($row['condition_app'])."\" data=\"".xml::sanitize($row['condition_data'])."\"/>\n";
}
}
$dialplan["dialplan_xml"] .= " </condition>\n";
}
}
@ -550,7 +561,7 @@
else {
$condition_expression = str_replace("+", "\+", $row['condition_expression']);
}
//add to the dialplan_details array
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$dialplan["dialplan_details"][$y]["dialplan_uuid"] = $dialplan_uuid;
@ -1124,13 +1135,16 @@
$i=0;
foreach ($destination_conditions as $row) { $i++; }
$destination_conditions[$i]['condition_field'] = '';
$destination_conditions[$i]['condition_expression'] = '';
$destination_conditions[$i]['condition_app'] = '';
$destination_conditions[$i]['condition_data'] = '';
}
else {
$destination_conditions[0]['condition_field'] = '';
$destination_conditions[0]['condition_expression'] = '';
$destination_conditions[0]['condition_app'] = '';
$destination_conditions[0]['condition_data'] = '';
}
//get the dialplan details in an array
$sql = "select * from v_dialplan_details ";
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
@ -1163,7 +1177,6 @@
}
unset($limit);
//remove previous fax details
$x = 0;
foreach($dialplan_details as $row) {
@ -1187,7 +1200,6 @@
}
//increment the row id
$x++;
}
//set the defaults
if (empty($destination_order)) { $destination_order = '100'; }
@ -1508,6 +1520,10 @@
echo " </select>\n";
echo " <input class='formfld' type='text' name=\"destination_conditions[$x][condition_expression]\" id='destination_conditions' maxlength='255' value=\"".escape($row['condition_expression'])."\">\n";
echo " <br />\n";
echo $destination->select('dialplan', "destination_conditions[$x][condition_action]", $row['condition_app'].':'.$row['condition_data'])."<br />\n";
if (!empty($row['condition_app'])) {
echo " <br />\n";
}
$x++;
}
echo " ".$text['description-destination_conditions']."\n";