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

Define the maximum dialplan order number

Browse Source 
Maximum order set to 300 to prevent loops with call-forward-all
This commit is contained in:
markjcrane
2025-10-31 14:58:10 -06:00
parent 6a36858102
commit 22e99a26c3
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dialplan_outbound/dialplan_outbound_add.php
View File

@@ -435,7 +435,7 @@
}
if (empty($dialplan_order)) {
$dialplan_order ='333';
$dialplan_order ='300';
}
$dialplan_context = $_SESSION['domain_name'];
$dialplan_continue = false;
@@ -895,6 +895,9 @@
unset($sql, $parameters);
}
//define the maximum dialplan order number - maximum order set to 300 to prevent loops with call-forward-all
$dialplan_order_max = 300;
//create token
$object = new token;
$token = $object->create($_SERVER['PHP_SELF']);
@@ -1311,16 +1314,13 @@ function type_onchange(dialplan_detail_type) {
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select name='dialplan_order' class='formfld'>\n";
//echo " <option></option>\n";
if (!empty($dialplan_order) && strlen(htmlspecialchars($dialplan_order))> 0) {
echo " <option selected='yes' value='".escape($dialplan_order)."'>".escape($dialplan_order)."</option>\n";
}
$i = 100;
while($i <= 999) {
for ($i = 100; $i <= $dialplan_order_max; $i+=10) {
if (strlen($i) == 1) { echo " <option value='00$i'>00$i</option>\n"; }
if (strlen($i) == 2) { echo " <option value='0$i'>0$i</option>\n"; }
if (strlen($i) == 3) { echo " <option value='$i'>$i</option>\n"; }
$i = $i + 10;
}
echo " </select>\n";
echo " <br />\n";

31
app/dialplans/dialplan_edit.php
View File

@@ -382,6 +382,17 @@
unset($sql, $parameters, $row);
}
//get the dialplan details in an array
$sql = "select ";
$sql .= "domain_uuid, dialplan_uuid, dialplan_detail_uuid, dialplan_detail_tag, dialplan_detail_type, dialplan_detail_data, ";
$sql .= "dialplan_detail_break, dialplan_detail_inline, dialplan_detail_group, dialplan_detail_order, dialplan_detail_enabled ";
$sql .= "from v_dialplan_details ";
$sql .= "where dialplan_uuid = :dialplan_uuid ";
$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
$parameters['dialplan_uuid'] = $dialplan_uuid;
$result = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
//set the defaults
if (empty($dialplan_context)) {
$dialplan_context = $_SESSION['domain_name'];
@@ -393,16 +404,13 @@
$dialplan_destination = false;
}
//get the dialplan details in an array
$sql = "select ";
$sql .= "domain_uuid, dialplan_uuid, dialplan_detail_uuid, dialplan_detail_tag, dialplan_detail_type, dialplan_detail_data, ";
$sql .= "dialplan_detail_break, dialplan_detail_inline, dialplan_detail_group, dialplan_detail_order, dialplan_detail_enabled ";
$sql .= "from v_dialplan_details ";
$sql .= "where dialplan_uuid = :dialplan_uuid ";
$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
$parameters['dialplan_uuid'] = $dialplan_uuid;
$result = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
//define the maximum dialplan order number
$dialplan_order_max = 999;
//outbound routes - limit the dialplan order no more than 300 to prevent loop with call-forward-all
if ($app_uuid == '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3') {
$dialplan_order_max = 300;
}
//create a new array that is sorted into groups and put the tags in order conditions, actions, anti-actions
//set the array index
@@ -673,8 +681,7 @@
echo " </td>\n";
echo " <td class='vtable' align='left' width='70%'>\n";
echo " <select name='dialplan_order' class='formfld'>\n";
$i=0;
while($i<=999) {
for ($i = 0; $i <= $dialplan_order_max; $i++) {
$selected = ($i == $dialplan_order) ? "selected" : null;
if (strlen($i) == 1) {
echo " <option value='00$i' ".$selected.">00$i</option>\n";