From 53a7ef3756f1069346aff20d555cf811a2206143 Mon Sep 17 00:00:00 2001
From: luis daniel lucio quiroz <dlucio@okay.com.mx>
Date: Wed, 24 Jun 2015 16:49:07 +0000
Subject: [PATCH] caller id fixed

---
 app/calls/resources/classes/call_forward.php | 10 ++++++++++
 app/calls/resources/classes/follow_me.php    | 18 +++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php
index 56f36821f8..7aa2718aca 100644
--- a/app/calls/resources/classes/call_forward.php
+++ b/app/calls/resources/classes/call_forward.php
@@ -40,6 +40,8 @@ include "root.php";
 		private $dial_string;
 		public $accountcode;
 		public $forward_caller_id_uuid;
+		public $outbound_caller_id_name;
+		public $outbound_caller_id_number;
 
 		public function set() {
 			//set the global variable
@@ -56,6 +58,8 @@ include "root.php";
 					foreach ($result as &$row) {
 						$this->extension = $row["extension"];
 						$this->accountcode = $row["accountcode"];
+						$this->outbound_caller_id_name = $row["outbound_caller_id_name"];
+						$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
 					}
 				}
 				unset ($prep_statement);
@@ -91,6 +95,12 @@ include "root.php";
 							}
 						}
 					}
+					else{
+						$dial_string .= ",outbound_caller_id_name=".$this->outbound_caller_id_name;
+						$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+						$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+						$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+					}
 
 					$dial_string .= "}";
 					if (extension_exists($this->forward_all_destination)) {
diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index be2e0215ad..4adeae93ac 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -39,6 +39,8 @@ include "root.php";
 		public $accountcode;
 		public $follow_me_enabled;
 		public $follow_me_caller_id_uuid;
+		public $outbound_caller_id_name;
+		public $outbound_caller_id_number;
 		private $extension;
 
 		public $destination_data_1;
@@ -297,6 +299,9 @@ include "root.php";
 				if (count($result) > 0) {
 					foreach ($result as &$row) {
 						$this->extension = $row["extension"];
+						$this->accountcode = $row["accountcode"];
+						$this->outbound_caller_id_name = $row["outbound_caller_id_name"];
+						$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
 					}
 				}
 
@@ -411,13 +416,16 @@ include "root.php";
 							}
 							else {
 								$dial_string .= "[";
-								$dial_string .= "outbound_caller_id_number=$dial_string_caller_id_number,";
-								$dial_string .= "presence_id=".$this->extension."@".$_SESSION['domain_name'].",";
+								$dial_string .= "outbound_caller_id_name=".$this->outbound_caller_id_name;
+								$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+								$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+								$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+								$dial_string .= ",presence_id=".$this->extension."@".$_SESSION['domain_name'];
 								if ($row["follow_me_prompt"] == "1") {
-									$dial_string .= "group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
+									$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
 								}
-								$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
-								$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
+								$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" || $_SESSION['domain']['bridge']['text'] == "bridge") {
 										$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);