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

Better bridge profile support

This commit is contained in:
FusionPBX 2023-08-24 14:28:19 -06:00 committed by GitHub
parent fac9bad46f
commit 18b3c41f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
app/bridges/bridge_edit.php
View File

@ -54,9 +54,11 @@
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (!empty($_POST)) { if (!empty($_POST)) {
//view_array($_POST);
$bridge_uuid = $_POST["bridge_uuid"]; $bridge_uuid = $_POST["bridge_uuid"];
$bridge_name = $_POST["bridge_name"]; $bridge_name = $_POST["bridge_name"];
$bridge_action = $_POST["bridge_action"]; $bridge_action = $_POST["bridge_action"];
$bridge_profile = $_POST["bridge_profile"];
$bridge_variables = $_POST["bridge_variables"]; $bridge_variables = $_POST["bridge_variables"];
$bridge_gateways = $_POST["bridge_gateways"]; $bridge_gateways = $_POST["bridge_gateways"];
$destination_number = $_POST["destination_number"]; $destination_number = $_POST["destination_number"];
@ -139,8 +141,11 @@
$bridge_destination = trim($bridge_base, ','); $bridge_destination = trim($bridge_base, ',');
} }
} }
if ($bridge_action == 'profile' && empty($bridge_destination)) {
$bridge_destination = 'sofia/'.$bridge_profile.'/'.$destination_number;
}
//add the variables back into the bridg_destination value //add the variables back into the bridge_destination value
if (!empty($bridge_variables)) { if (!empty($bridge_variables)) {
$variables = ''; $variables = '';
foreach($bridge_variables as $key => $value) { foreach($bridge_variables as $key => $value) {
@ -161,6 +166,7 @@
$array['bridges'][0]['bridge_destination'] = $bridge_destination; $array['bridges'][0]['bridge_destination'] = $bridge_destination;
$array['bridges'][0]['bridge_enabled'] = $bridge_enabled; $array['bridges'][0]['bridge_enabled'] = $bridge_enabled;
$array['bridges'][0]['bridge_description'] = $bridge_description; $array['bridges'][0]['bridge_description'] = $bridge_description;
//view_array($array);
//save to the data //save to the data
$database = new database; $database = new database;
@ -223,12 +229,42 @@
$i++; $i++;
} }
//get the bridge variables from the database bridge_destination value
$database_variables = []; $x = 0;
if (!empty($bridge_destination)) {
//get the variables from inside the { and } brackets
preg_match('/^\{([^}]+)\}/', $bridge_destination, $matches);
//create a variables array from the comma delimitted string
$variables = explode(",", $matches[1]);
//strip the variables from the $bridge_destination variable
$bridge_destination = str_replace("{$matches[0]}", '', $bridge_destination);
//build a bridge variables data set
$x = 0;
foreach($variables as $variable) {
$pairs = explode("=", $variable);
$database_variables[$x]['name'] = $pairs[0];
$database_variables[$x]['value'] = $pairs[1];
$database_variables[$x]['label'] = ucwords(str_replace('_', ' ', $pairs[0]));
$database_variables[$x]['label'] = str_replace('Effective Caller Id', 'Caller ID', $database_variables[$x]['label']);
$x++;
}
}
//get the bridge_action from the bridge_destination //get the bridge_action from the bridge_destination
if (!empty($bridge_destination)) { if (!empty($bridge_destination)) {
if (substr($bridge_destination, 0, 1) == '{') { if (substr($bridge_destination, 0, 1) == '{') {
$bridge_parts = explode('}', $bridge_destination); $bridge_parts = explode('}', $bridge_destination);
//get the variables from inside the { and } brackets
preg_match('/^\{([^}]+)\}/', $bridge_destination, $matches);
//strip the variables from the $bridge_destination variable
$bridge_destination = str_replace("{$matches[0]}", '', $bridge_destination);
} }
$bridge_array = explode("/", $bridge_parts[1]); $bridge_array = explode("/", $bridge_destination);
if ($bridge_array[0] == 'sofia') { if ($bridge_array[0] == 'sofia') {
if ($bridge_array[1] == 'gateway') { if ($bridge_array[1] == 'gateway') {
$bridge_action = 'gateway'; $bridge_action = 'gateway';
@ -249,33 +285,6 @@
} }
} }
//create a variables array from the comma delimitted string
$variables = explode(",", $matches[1]);
//get the bridge variables from the database bridge_destination value
$database_variables = []; $x = 0;
if (!empty($bridge_destination)) {
//get the variables from inside the { and } brackets
preg_match('/\{([^}]+)\}/', $bridge_destination, $matches);
//create a variables array from the comma delimitted string
$variables = explode(",", $matches[1]);
//strip the variables from the $bridge_destination variable
$bridge_destination = str_replace("{$matches[0]}", '', $bridge_destination);
//build a bridge variables data set
$x = 0;
foreach($variables as $variable) {
$pairs = explode("=", $variable);
$database_variables[$x]['name'] = $pairs[0];
$database_variables[$x]['value'] = $pairs[1];
$database_variables[$x]['label'] = ucwords(str_replace('_', ' ', $pairs[0]));
$database_variables[$x]['label'] = str_replace('Effective Caller Id', 'Caller ID', $database_variables[$x]['label']);
$x++;
}
}
//merge the session and database bridge arrays together //merge the session and database bridge arrays together
$bridge_variables = $session_variables; $bridge_variables = $session_variables;
foreach($database_variables as $row) { foreach($database_variables as $row) {
@ -431,6 +440,7 @@
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
if (!empty($bridge_variables)) {
echo "<tr id='tr_bridge_variables'>\n"; echo "<tr id='tr_bridge_variables'>\n";
echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-bridge_variables']."\n"; echo " ".$text['label-bridge_variables']."\n";
@ -446,6 +456,7 @@
echo $text['description-bridge_variables']."\n"; echo $text['description-bridge_variables']."\n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
}
echo "<tr id='tr_bridge_profile'>\n"; echo "<tr id='tr_bridge_profile'>\n";
echo "<td class='vncell' valign='top' align='left' nowrap>\n"; echo "<td class='vncell' valign='top' align='left' nowrap>\n";