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

Update follow_me.php

This commit is contained in:
FusionPBX 2019-03-21 21:06:07 -06:00 committed by GitHub
parent 49797b36d8
commit d527e45959
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,11 +282,10 @@ include "root.php";
$prep_statement_2 = $db->prepare(check_sql($sql)); $prep_statement_2 = $db->prepare(check_sql($sql));
$prep_statement_2->execute(); $prep_statement_2->execute();
$result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED);
/* /*
$dial_string = "{";
$dial_string_caller_id_name = "\${effective_caller_id_name}"; $dial_string_caller_id_name = "\${effective_caller_id_name}";
$dial_string_caller_id_number = "\${effective_caller_id_number}"; $dial_string_caller_id_number = "\${effective_caller_id_number}";
if (strlen($this->follow_me_caller_id_uuid) > 0) { if (strlen($this->follow_me_caller_id_uuid) > 0) {
$sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name "; $sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name ";
$sql_caller .= "from v_destinations "; $sql_caller .= "from v_destinations ";
@ -307,7 +306,6 @@ include "root.php";
} }
} }
} }
$dial_string = "}";
*/ */
$x = 0; $x = 0;
@ -388,22 +386,22 @@ include "root.php";
} }
} }
else { else {
if (strlen($caller_id_number) > 0) { //if (strlen($caller_id_number) > 0) {
//set the caller id if it is set //set the caller id if it is set
if (strlen($caller_id_name) > 0) { //if (strlen($caller_id_name) > 0) {
$variables[] = "origination_caller_id_name=".$this->cid_name_prefix.$caller_id_name; // $variables[] = "origination_caller_id_name=".$this->cid_name_prefix.$caller_id_name;
$variables[] = "effective_caller_id_name=".$this->cid_name_prefix.$caller_id_name; // $variables[] = "effective_caller_id_name=".$this->cid_name_prefix.$caller_id_name;
} //}
$variables[] = "origination_caller_id_number=".$this->cid_number_prefix.$caller_id_number; //$variables[] = "origination_caller_id_number=".$this->cid_number_prefix.$caller_id_number;
$variables[] = "effective_caller_id_number=".$this->cid_number_prefix.$caller_id_number; //$variables[] = "effective_caller_id_number=".$this->cid_number_prefix.$caller_id_number;
} //}
else { //else {
//set the outbound caller id number if the caller id number is a user //set the outbound caller id number if the caller id number is a user
$variables[] = "origination_caller_id_number=\${cond(\${from_user_exists} == true ? \${outbound_caller_id_number} : \${origination_caller_id_number})}"; $variables[] = "origination_caller_id_number=\${cond(\${from_user_exists} == true ? ".$this->outbound_caller_id_number." : \${origination_caller_id_number})}";
$variables[] = "effective_caller_id_number=\${cond(\${from_user_exists} == true ? \${outbound_caller_id_number} : \${effective_caller_id_number})}"; $variables[] = "effective_caller_id_number=\${cond(\${from_user_exists} == true ? ".$this->outbound_caller_id_number." : \${effective_caller_id_number})}";
$variables[] = "origination_caller_id_name=\${cond(\${from_user_exists} == true ? \${outbound_caller_id_name} : \${origination_caller_id_name})}"; $variables[] = "origination_caller_id_name=\${cond(\${from_user_exists} == true ? ".$this->outbound_caller_id_name." : \${origination_caller_id_name})}";
$variables[] = "effective_caller_id_name=\${cond(\${from_user_exists} == true ? \${outbound_caller_id_name} : \${effective_caller_id_name})}"; $variables[] = "effective_caller_id_name=\${cond(\${from_user_exists} == true ? ".$this->outbound_caller_id_name." : \${effective_caller_id_name})}";
} //}
} }
//accountcode //accountcode