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

Merge pull request #1098 from moteus/toll_allow_forward

Browse Source 
Set Toll Allow for call forward/follow me
This commit is contained in:
FusionPBX
2015-08-14 08:34:17 -06:00
parent 65f0ddd438 f50c2a4d46
commit fe45b3c036
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/calls/resources/classes/call_forward.php
+4 -1
View File
@@ -38,6 +38,7 @@ include "root.php";
public $forward_all_destination;
public $forward_all_enabled;
private $dial_string;
private $toll_allow;
public $accountcode;
public $forward_caller_id_uuid;
public $outbound_caller_id_name;
@@ -58,6 +59,7 @@ include "root.php";
foreach ($result as &$row) {
$this->extension = $row["extension"];
$this->accountcode = $row["accountcode"];
$this->toll_allow = $row["toll_allow"];
$this->outbound_caller_id_name = $row["outbound_caller_id_name"];
$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
}
@@ -73,6 +75,7 @@ include "root.php";
$dial_string .= ",domain_name=".$_SESSION['domain_name'];
$dial_string .= ",domain=".$_SESSION['domain_name'];
$dial_string .= ",extension_uuid=".$this->extension_uuid;
$dial_string .= ",toll_allow='".$this->toll_allow."'";
if (strlen($this->accountcode) > 0) {
$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
$dial_string .= ",accountcode=".$this->accountcode;
@@ -140,7 +143,7 @@ include "root.php";
}
else {
$sql .= "forward_all_destination = '$this->forward_all_destination', ";
$sql .= "dial_string = '".$this->dial_string."', ";
$sql .= "dial_string = '".check_str($this->dial_string)."', ";
$sql .= "forward_all_enabled = 'true' ";
}
$sql .= "where domain_uuid = '$this->domain_uuid' ";
app/calls/resources/classes/follow_me.php
+4 -1
View File
@@ -43,6 +43,7 @@ include "root.php";
public $outbound_caller_id_name;
public $outbound_caller_id_number;
private $extension;
private $toll_allow;
public $destination_data_1;
public $destination_type_1;
@@ -247,6 +248,7 @@ include "root.php";
foreach ($result as &$row) {
$this->extension = $row["extension"];
$this->accountcode = $row["accountcode"];
$this->toll_allow = $row["toll_allow"];
$this->outbound_caller_id_name = $row["outbound_caller_id_name"];
$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
}
@@ -330,6 +332,7 @@ include "root.php";
$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
$dial_string .= ",accountcode=".$this->accountcode;
}
$dial_string .= ",toll_allow='".$this->toll_allow."'";
$dial_string .= "}";
$x = 0;
foreach ($result as &$row) {
@@ -419,7 +422,7 @@ include "root.php";
}
$sql = "update v_extensions set ";
$sql .= "dial_string = '".$dial_string."', ";
$sql .= "dial_string = '".check_str($dial_string)."', ";
$sql .= "dial_domain = '".$_SESSION['domain_name']."' ";
$sql .= "where domain_uuid = '".$this->domain_uuid."' ";
$sql .= "and follow_me_uuid = '".$this->follow_me_uuid."' ";