From b0a7b3d027d6a9c3c608ae2b58591e1f65e913ff Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sun, 3 Feb 2013 06:47:19 +0000 Subject: [PATCH] After adding ringback to the dialplan add the loopback to call forward and follow me. Doing this resolves issue with outbound caller id, multiple conditions on outbound routes, fail over and more. --- app/calls/resources/classes/switch_call_forward.php | 10 +++++----- app/calls/resources/classes/switch_follow_me.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/calls/resources/classes/switch_call_forward.php b/app/calls/resources/classes/switch_call_forward.php index 3b66f13129..ae28956b1d 100644 --- a/app/calls/resources/classes/switch_call_forward.php +++ b/app/calls/resources/classes/switch_call_forward.php @@ -48,12 +48,12 @@ include "root.php"; } else { $bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $this->forward_all_destination); - if (strlen($bridge[0]) > 0) { - $dial_string .= $bridge[0]; - } - else { + //if (strlen($bridge[0]) > 0) { + // $dial_string .= $bridge[0]; + //} + //else { $dial_string .= "loopback/".$this->forward_all_destination; - } + //} } $this->dial_string = $dial_string; } diff --git a/app/calls/resources/classes/switch_follow_me.php b/app/calls/resources/classes/switch_follow_me.php index afafa68847..94956ba439 100644 --- a/app/calls/resources/classes/switch_follow_me.php +++ b/app/calls/resources/classes/switch_follow_me.php @@ -300,12 +300,12 @@ include "root.php"; } else { $bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]); - if (strlen($bridge[0]) > 0) { - $dial_string .= "".$bridge[0].","; - } - else { + //if (strlen($bridge[0]) > 0) { + // $dial_string .= "".$bridge[0].","; + //} + //else { $dial_string .= "loopback/".$row["follow_me_destination"].","; - } + //} } } $this->dial_string = trim($dial_string, ",");