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

Change the order of operation to fix an issue when destination range was added.

This commit is contained in:
FusionPBX 2021-08-10 12:39:09 -06:00 committed by GitHub
parent 7d59a0f4a1
commit 164467aea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
app/destinations/destination_edit.php
View File

@ -80,6 +80,10 @@
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (count($_POST) > 0) { if (count($_POST) > 0) {
//get the uuid
if ($action == "update" && is_uuid($_POST["destination_uuid"])) {
$destination_uuid = $_POST["destination_uuid"];
}
//set the variables //set the variables
$dialplan_uuid = $_POST["dialplan_uuid"]; $dialplan_uuid = $_POST["dialplan_uuid"];
@ -185,6 +189,43 @@
return; return;
} }
//get the destination row values
if ($action == 'update' && is_uuid($destination_uuid)) {
$sql = "select * from v_destinations ";
$sql .= "where destination_uuid = :destination_uuid ";
$parameters['destination_uuid'] = $destination_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
unset($sql, $parameters);
}
//get the dialplan_uuid from the database
if (is_array($row) && @sizeof($row) != 0) {
$dialplan_uuid = $row["dialplan_uuid"];
}
//if the user doesn't have the correct permission then
//override destination_number and destination_context values
if (is_array($row) && @sizeof($row) != 0) {
if (!permission_exists('destination_trunk_prefix')) {
$destination_trunk_prefix = $row["destination_trunk_prefix"];
}
if (!permission_exists('destination_area_code')) {
$destination_area_code = $row["destination_area_code"];
}
if (!permission_exists('destination_number')) {
$destination_prefix = $row["destination_prefix"];
$destination_number = $row["destination_number"];
}
if (!permission_exists('destination_condition_field')) {
$destination_condition_field = $row["destination_condition_field"];
}
if (!permission_exists('destination_context')) {
$destination_context = $row["destination_context"];
}
}
unset($row);
//build the destination_numbers array //build the destination_numbers array
$array = explode('-', $destination_number); $array = explode('-', $destination_number);
$array = array_map('trim', $array); $array = array_map('trim', $array);
@ -253,47 +294,6 @@
unset($sql, $parameters, $row); unset($sql, $parameters, $row);
} }
//get the uuid
if ($action == "update" && is_uuid($_POST["destination_uuid"])) {
$destination_uuid = $_POST["destination_uuid"];
}
//get the destination row values
if ($action == 'update' && is_uuid($destination_uuid)) {
$sql = "select * from v_destinations ";
$sql .= "where destination_uuid = :destination_uuid ";
$parameters['destination_uuid'] = $destination_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
}
//get the dialplan_uuid from the database
if (is_array($row) && @sizeof($row) != 0) {
$dialplan_uuid = $row["dialplan_uuid"];
}
//if the user doesn't have the correct permission then
//override destination_number and destination_context values
if (is_array($row) && @sizeof($row) != 0) {
if (!permission_exists('destination_trunk_prefix')) {
$destination_trunk_prefix = $row["destination_trunk_prefix"];
}
if (!permission_exists('destination_area_code')) {
$destination_area_code = $row["destination_area_code"];
}
if (!permission_exists('destination_number')) {
$destination_number = $row["destination_number"];
$destination_prefix = $row["destination_prefix"];
}
if (!permission_exists('destination_condition_field')) {
$destination_condition_field = $row["destination_condition_field"];
}
if (!permission_exists('destination_context')) {
$destination_context = $row["destination_context"];
}
}
unset($sql, $parameters, $row);
//add the destinations and asscociated dialplans //add the destinations and asscociated dialplans
$x = 0; $x = 0;
foreach($destination_numbers as $destination_number) { foreach($destination_numbers as $destination_number) {