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

Add alternative options for bridging calls for call forward and fix LCR option for follow me.

This commit is contained in:
Mark Crane 2015-03-21 22:49:12 +00:00
parent 621f5036e5
commit 268aaee702
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/calls/resources/classes/call_forward.php
View File

@ -86,7 +86,7 @@ include "root.php";
if (strlen($row_caller['destination_number']) > 0) {
$dial_string_caller_id_number = $row_caller['destination_number'];
$dial_string .= ",origination_caller_id_number=$dial_string_caller_id_number";
$dial_string .= ",outbound_caller_id_number=$dial_string_caller_id_number";
$dial_string .= ",outbound_caller_id_number=$dial_string_caller_id_number";
}
}
}
@ -96,13 +96,19 @@ include "root.php";
$dial_string .= "user/".$this->forward_all_destination."@".$_SESSION['domain_name'];
}
else {
$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $this->forward_all_destination);
//if (strlen($bridge[0]) > 0) {
// $dial_string .= $bridge[0];
//}
//else {
if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $this->forward_all_destination);
$dial_string .= $bridge[0];
}
elseif ($_SESSION['domain']['bridge']['text'] == "lcr") {
$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name']."/".$this->forward_all_destination;
}
elseif ($_SESSION['domain']['bridge']['text'] === "loopback") {
$dial_string .= "loopback/".$this->forward_all_destination;
//}
}
else {
$dial_string .= "loopback/".$this->forward_all_destination;
}
}
$this->dial_string = $dial_string;
}

4
app/calls/resources/classes/follow_me.php
View File

@ -417,7 +417,7 @@ include "root.php";
$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
if (is_numeric($row["follow_me_destination"])) {
if ($_SESSION['domain']['bridge']['text'] == "outbound") {
if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);
$dial_string .= $bridge[0].",";
}
@ -425,7 +425,7 @@ include "root.php";
$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];
}
elseif ($_SESSION['domain']['bridge']['text'] == "lcr") {
$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name'];
$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name']."/".$row["follow_me_destination"];
}
else {
$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];