From 5666962c9d6c6fd09dc1954740876fca86873f09 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 30 Apr 2014 09:30:09 +0000 Subject: [PATCH] add a way to customize the default dial string for follow me --- app/calls/resources/classes/follow_me.php | 22 ++++++++++++------- .../resources/classes/extension.php | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php index e8a9d9e5e9..f5c6b771c4 100644 --- a/app/calls/resources/classes/follow_me.php +++ b/app/calls/resources/classes/follow_me.php @@ -325,15 +325,21 @@ include "root.php"; foreach ($result as &$row) { $dial_string .= "["; if (extension_exists($row["follow_me_destination"])) { - $dial_string .= "outbound_caller_id_number=\${caller_id_number},"; - $dial_string .= "presence_id=".$row["follow_me_destination"]."@".$_SESSION['domain_name'].","; - if ($this->call_prompt == "true") { - $dial_string .= "group_confirm_key=exec,group_confirm_file=lua confirm.lua,"; + if (strlen($_SESSION['domain']['dial_string']['text']) == 0) { + $dial_string .= "outbound_caller_id_number=\${caller_id_number},"; + $dial_string .= "presence_id=".$row["follow_me_destination"]."@".$_SESSION['domain_name'].","; + if ($this->call_prompt == "true") { + $dial_string .= "group_confirm_key=exec,group_confirm_file=lua confirm.lua,"; + } + $dial_string .= "leg_delay_start=".$row["follow_me_delay"].","; + $dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]"; + $dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")},"; + //$dial_string .= "user/".$row["follow_me_destination"]."@".$_SESSION['domain_name'].","; + } + else { + $dial_string = $_SESSION['domain']['dial_string']['text']; + $dial_string = str_replace("\${dialed_user}", $row["follow_me_destination"], $dial_string); } - $dial_string .= "leg_delay_start=".$row["follow_me_delay"].","; - $dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]"; - $dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")},"; - //$dial_string .= "user/".$row["follow_me_destination"]."@".$_SESSION['domain_name'].","; } else { $dial_string .= "outbound_caller_id_number=\${outbound_caller_id_number},"; diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php index be3baff49b..9aebf89096 100644 --- a/app/extensions/resources/classes/extension.php +++ b/app/extensions/resources/classes/extension.php @@ -215,7 +215,7 @@ } else { $dial_string = "{sip_invite_domain=\${domain_name},leg_timeout=".$call_timeout.",presence_id=\${dialed_user}@\${dialed_domain}}\${sofia_contact(\${dialed_user}@\${dialed_domain})}"; - } + } } $xml .= "\n";