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

Add better support for destination alternate

Browse Source 
Get the destination actions from columns in the destination table instead of filtering through the dialplan details. If a destination action app is set or export then use inline = true.
This commit is contained in:
FusionPBX
2021-06-03 21:30:31 -06:00
committed by GitHub
parent c0b8b1df08
commit b21572fb44
1 changed files with 43 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
app/destinations/destination_edit.php
View File

@@ -386,6 +386,7 @@
$dialplan_detail_order = $dialplan_detail_order + 10; $dialplan_detail_order = $dialplan_detail_order + 10;
//check the destination number //check the destination number
$y=0;
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid; $dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "condition"; $dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "condition";
if (strlen($destination_condition_field) > 0) { if (strlen($destination_condition_field) > 0) {
@@ -609,31 +610,39 @@
} }
//add the actions //add the actions
if (is_array($dialplan_details)) { if ($destination->valid($destination_app.':'.$destination_data)) {
foreach ($dialplan_details as $row) { //add to the dialplan_details array
if (strlen($row["dialplan_detail_data"]) > 1) { $dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$actions = explode(":", $row["dialplan_detail_data"]); $dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
$dialplan_detail_type = array_shift($actions); $dialplan["dialplan_details"][$y]["dialplan_detail_type"] = $destination_app;
$dialplan_detail_data = join(':', $actions); $dialplan["dialplan_details"][$y]["dialplan_detail_data"] = $destination_data;
$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
//add to the dialplan_details array //set inline to true
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid; if ($destination_app == 'set' || $destination_data == 'export') {
$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action"; $dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = 'true';
$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = $dialplan_detail_type;
if ($destination->valid($dialplan_detail_type.':'.$dialplan_detail_data)) {
$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = $dialplan_detail_data;
}
$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
$dialplan_detail_order = $dialplan_detail_order + 10;
//set the destination app and data
$destination_app = $dialplan_detail_type;
$destination_data = $dialplan_detail_data;
//increment the array id
$y++;
}
} }
$y++;
//increment the dialplan detail order
$dialplan_detail_order = $dialplan_detail_order + 10;
}
if ($destination->valid($destination_alternate_app.':'.$destination_alternate_data)) {
//add to the dialplan_details array
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = $destination_alternate_app;
$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = $destination_alternate_data;
$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
//set inline to true
if ($destination_alternate_app == 'set' || $destination_alternate_app == 'export') {
$dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = 'true';
}
$y++;
//increment the dialplan detail order
$dialplan_detail_order = $dialplan_detail_order + 10;
} }
//delete the previous details //delete the previous details
@@ -1110,52 +1119,17 @@
echo "</tr>\n"; echo "</tr>\n";
} }
if ($_SESSION['destinations']['dialplan_details']['boolean'] == "false") { echo "<tr id='tr_actions'>\n";
echo "<tr id='tr_actions'>\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo " ".$text['label-detail_action']."\n";
echo " ".$text['label-detail_action']."\n"; echo "</td>\n";
echo "</td>\n"; echo "<td class='vtable' align='left'>\n";
echo "<td class='vtable' align='left'>\n"; $destination_action = $destination_app.":".$destination_data;
$destination_action = $destination_app.":".$destination_data; echo $destination->select('dialplan', 'destination_action', $destination_action);
echo $destination->select('dialplan', 'destination_action', $destination_action); echo "<br />\n";
echo "<br />\n"; $destination_alternate_action = $destination_alternate_app.":".$destination_alternate_data;
$destination_alternate_action = $destination_alternate_app.":".$destination_alternate_data; echo $destination->select('dialplan', 'destination_alternate_action', $destination_alternate_action);
echo $destination->select('dialplan', 'destination_alternate_action', $destination_alternate_action); echo "</td>\n";
echo "</td>\n";
echo "</tr>\n";
}
if ($_SESSION['destinations']['dialplan_details']['boolean'] == "true") {
echo "<tr id='tr_actions'>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-detail_action']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
$x = 0;
$order = 10;
if (is_array($dialplan_details) && @sizeof($dialplan_details) != 0) {
foreach($dialplan_details as $row) {
if ($row["dialplan_detail_tag"] != "condition") {
if ($row["dialplan_detail_tag"] == "action" && ($row["dialplan_detail_type"] == "set" || $row["dialplan_detail_type"] == "export") && strpos($row["dialplan_detail_data"], "accountcode") == 0) { continue; } //exclude set:accountcode actions
if (strlen($row['dialplan_detail_uuid']) > 0) {
echo " <input name='dialplan_details[".$x."][dialplan_detail_uuid]' type='hidden' value=\"".escape($row['dialplan_detail_uuid'])."\">\n";
}
echo " <input name='dialplan_details[".$x."][dialplan_detail_type]' type='hidden' value=\"".escape($row['dialplan_detail_type'])."\">\n";
echo " <input name='dialplan_details[".$x."][dialplan_detail_order]' type='hidden' value=\"".$order."\">\n";
$data = $row['dialplan_detail_data'];
$label = explode("XML", $data);
$divider = ($row['dialplan_detail_type'] != '') ? ":" : null;
$detail_action = $row['dialplan_detail_type'].$divider.$row['dialplan_detail_data'];
echo $destination->select('dialplan', 'dialplan_details['.$x.'][dialplan_detail_data]', $detail_action)."<br />\n";
}
$order = $order + 10;
$x++;
}
}
unset($dialplan_details, $row);
echo "</td>\n";
echo "</tr>\n";
}
if (permission_exists('destination_fax')) { if (permission_exists('destination_fax')) {
$sql = "select * from v_fax "; $sql = "select * from v_fax ";