diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 574d999610..0bd7508cd3 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -193,6 +193,9 @@
$dialplan_xml = "\n";
$dialplan_xml .= " \n";
$dialplan_xml .= " \n";
+ $dialplan_xml .= " \n";
+ //$dialplan_xml .= " \n";
+ $dialplan_xml .= " \n";
$dialplan_xml .= " \n";
$dialplan_xml .= " \n";
$dialplan_xml .= "\n";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 02f612c9ff..41e17cd055 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -339,7 +339,7 @@
$dialplan["dialplan_xml"] .= " \n";
}
if (strlen($destination_hold_music) > 0) {
- $dialplan["dialplan_xml"] .= " \n";
+ $dialplan["dialplan_xml"] .= " \n";
}
if (strlen($destination_accountcode) > 0) {
$dialplan["dialplan_xml"] .= " \n";
@@ -477,7 +477,7 @@
if (strlen($destination_hold_music) > 0) {
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
- $dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "set";
+ $dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "export";
$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = "hold_music=".$destination_hold_music;
$dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = "true";
$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
index 779225234a..518a0246af 100644
--- a/app/scripts/resources/scripts/app/ring_groups/index.lua
+++ b/app/scripts/resources/scripts/app/ring_groups/index.lua
@@ -161,6 +161,7 @@
call_direction = session:getVariable("call_direction");
accountcode = session:getVariable("accountcode");
local_ip_v4 = session:getVariable("local_ip_v4")
+ hold_music = session:getVariable("hold_music");
end
--set caller id
@@ -809,8 +810,16 @@
--get the extension_uuid
cmd = "user_data ".. destination_number .."@"..domain_name.." var extension_uuid";
extension_uuid = trim(api:executeString(cmd));
+
+ --set hold music
+ if (hold_music == nil) then
+ hold_music = '';
+ else
+ hold_music = ",hold_music="..hold_music;
+ end
+
--send to user
- local dial_string_to_user = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid .. row.record_session .. "]user/" .. row.destination_number .. "@" .. domain_name;
+ local dial_string_to_user = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid=".. extension_uuid .. row.record_session .. hold_music .."]user/" .. row.destination_number .. "@" .. domain_name;
dial_string = dial_string_to_user;
elseif (tonumber(destination_number) == nil) then
--sip uri