From aee7de9978a3d60081700abe07dc9a30adccd343 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 May 2017 15:59:14 -0600 Subject: [PATCH] Update call_forward.php --- app/calls/resources/classes/call_forward.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php index 63f958eb8f..8595b10cd3 100644 --- a/app/calls/resources/classes/call_forward.php +++ b/app/calls/resources/classes/call_forward.php @@ -128,22 +128,22 @@ include "root.php"; $presence_id = extension_presence_id($this->extension, $this->number_alias); if (strlen($caller_id_number) > 0) { - - //set the caller id if it is set - - if (strlen($caller_id_name) > 0) { + //set the caller id if it is set + if (strlen($caller_id_name) > 0) { $dial_string .= ",origination_caller_id_name=".$caller_id_name; $dial_string .= ",effective_caller_id_name=".$caller_id_name; } - - $dial_string .= ",origination_caller_id_number=".$caller_id_number; + $dial_string .= ",origination_caller_id_number=".$caller_id_number; $dial_string .= ",effective_caller_id_number=".$caller_id_number; - - } - - else { - - //set the outbound caller id number if the caller id number is a user + } + else { + //set the outbound caller id number if the caller id number is a user $dial_string .='{origination_caller_id_number=${cond(${from_user_exists} == true ? ${outbound_caller_id_number} : ${origination_caller_id_number})}}'; $dial_string .='{effective_caller_id_number=${cond(${from_user_exists} == true ? ${outbound_caller_id_number} : ${effective_caller_id_number})}}'; $dial_string .='{origination_caller_id_name=${cond(${from_user_exists} == true ? ${outbound_caller_id_name} : ${origination_caller_id_name})}}'; $dial_string .='{effective_caller_id_name=${cond(${from_user_exists} == true ? ${outbound_caller_id_name} : ${effective_caller_id_name})}}'; - - } + } // $presence_id = $this->forward_all_destination; $dial_string .= ",presence_id=".$presence_id."@".$_SESSION['domain_name'];