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

Add dialplan condition regex

This commit is contained in:
markjcrane 2023-07-14 20:44:40 -06:00
parent b9e6a89a37
commit 1f0c30529b
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,7 +681,8 @@
$sql .= "p.dialplan_uuid asc, \n"; $sql .= "p.dialplan_uuid asc, \n";
$sql .= "s.dialplan_detail_group asc, \n"; $sql .= "s.dialplan_detail_group asc, \n";
$sql .= "case s.dialplan_detail_tag \n"; $sql .= "case s.dialplan_detail_tag \n";
$sql .= "when 'condition' then 1 \n"; $sql .= "when 'condition' then 0 \n";
$sql .= "when 'regex' then 1 \n";
$sql .= "when 'action' then 2 \n"; $sql .= "when 'action' then 2 \n";
$sql .= "when 'anti-action' then 3 \n"; $sql .= "when 'anti-action' then 3 \n";
$sql .= "else 100 end, \n"; $sql .= "else 100 end, \n";
@ -739,7 +740,12 @@
$condition_attribute = ""; $condition_attribute = "";
$condition_tag_status = "closed"; $condition_tag_status = "closed";
} }
else if ($condition && (!empty($condition))) { else if (!empty($condition) && substr($condition, -1) == ">") {
$xml .= " ".$condition;
$condition = "";
$condition_tag_status = "closed";
}
else if (!empty($condition)) {
$xml .= " ".$condition . "/>"; $xml .= " ".$condition . "/>";
$condition = ""; $condition = "";
$condition_tag_status = "closed"; $condition_tag_status = "closed";
@ -771,7 +777,7 @@
$condition = ""; $condition = "";
$condition_attribute = ""; $condition_attribute = "";
} }
if ($dialplan_detail_tag == "condition") { if (isset($dialplan_detail_tag) && $dialplan_detail_tag == "condition" || $dialplan_detail_tag == "regex") {
//determine the type of condition //determine the type of condition
if ($dialplan_detail_type == "hour") { if ($dialplan_detail_type == "hour") {
$condition_type = 'time'; $condition_type = 'time';
@ -813,9 +819,14 @@
$condition_type = 'default'; $condition_type = 'default';
} }
// finalize any previous pending condition statements //finalize any previous pending condition statements
if ($condition_tag_status == "open") { if ($condition_tag_status == "open") {
if (!empty($condition)) { if (!empty($condition) && substr($condition, -1) == ">") {
$xml .= $condition . "\n";
$condition = '';
$condition_tag_status = "closed";
}
else if (!empty($condition)) {
$xml .= $condition . "/>\n"; $xml .= $condition . "/>\n";
$condition = ''; $condition = '';
$condition_tag_status = "closed"; $condition_tag_status = "closed";
@ -846,7 +857,15 @@
//condition tag but leave off the ending //condition tag but leave off the ending
if ($condition_type == "default") { if ($condition_type == "default") {
$condition = " <condition field=\"" . $dialplan_detail_type . "\" expression=\"" . $dialplan_detail_data . "\"" . $condition_break; if (isset($dialplan_detail_type) && $dialplan_detail_tag == 'condition' && $dialplan_detail_type == 'regex') {
$condition = " <condition regex=\"" . $dialplan_detail_data . "\"" . $condition_break.">";
}
elseif (isset($dialplan_detail_type) && $dialplan_detail_tag == 'regex') {
$condition = " <regex field=\"" . $dialplan_detail_type . "\" expression=\"" . $dialplan_detail_data . "\"" . $condition_break . "/>";
}
else {
$condition = " <condition field=\"" . $dialplan_detail_type . "\" expression=\"" . $dialplan_detail_data . "\"" . $condition_break;
}
} }
else if ($condition_type == "time") { else if ($condition_type == "time") {
if ($condition_attribute) { if ($condition_attribute) {
@ -869,7 +888,11 @@
$xml .= " <condition " . $condition_attribute . $condition_break . ">\n"; $xml .= " <condition " . $condition_attribute . $condition_break . ">\n";
$condition_attribute = ""; $condition_attribute = "";
} }
else if ($condition && (!empty($condition))) { else if (!empty($condition) && !empty($condition_tag_status) && substr($condition, -1) == ">") {
$xml .= $condition . "\n";
$condition = "";
}
else if (!empty($condition) && !empty($condition_tag_status)) {
$xml .= $condition . ">\n"; $xml .= $condition . ">\n";
$condition = ""; $condition = "";
} }
@ -924,7 +947,7 @@
} }
unset($row); unset($row);
// prevent partial dialplan (pass=nil may be error in sql or empty resultset) //prevent partial dialplan (pass=nil may be error in sql or empty resultset)
if (isset($pass) && $pass == false) { if (isset($pass) && $pass == false) {
if (!empty($results)) { if (!empty($results)) {
echo 'error while build context: ' . $this->context; echo 'error while build context: ' . $this->context;
@ -934,10 +957,13 @@
//close the extension tag if it was left open //close the extension tag if it was left open
if ($dialplan_tag_status == "open") { if ($dialplan_tag_status == "open") {
if ($condition_tag_status == "open") { if ($condition_tag_status == "open") {
if ($condition_attribute and (!empty($condition_attribute))) { if ($condition_attribute && (!empty($condition_attribute))) {
$xml .= " <condition " . $condition_attribute . $condition_break . "/>\n"; $xml .= " <condition " . $condition_attribute . $condition_break . "/>\n";
} }
else if ($condition && (!empty($condition))) { else if (!empty($condition) && substr($string, -1) == ">") {
$xml .= $condition . "\n";
}
else if (!empty($condition)) {
$xml .= $condition . "/>\n"; $xml .= $condition . "/>\n";
} }
else { else {