dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ring group hold_music 

This commit fixes a problem for music on hold defined in global-variables and domain-variables dialplans.
This commit is contained in:
FusionPBX 2023-11-02 12:18:28 -06:00 committed by GitHub
parent 86373fd3b4
commit 71349f56b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/switch/resources/scripts/app/ring_groups/index.lua
View File

@ -198,6 +198,13 @@
if (not default_voice) then default_voice = 'callie'; end if (not default_voice) then default_voice = 'callie'; end
end end
--set hold music
if (session:getVariable("hold_music") == nil) then
hold_music = '';
else
hold_music = ",hold_music="..session:getVariable("hold_music");
end
--prepare the api object --prepare the api object
api = freeswitch.API(); api = freeswitch.API();
@ -817,7 +824,7 @@
record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "',record_path='".. record_path .."',record_name="..record_name; record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "',record_path='".. record_path .."',record_name="..record_name;
session:setVariable("record_path", record_path); session:setVariable("record_path", record_path);
else else
record_session = "" record_session = '';
end end
row.record_session = record_session row.record_session = record_session
@ -827,20 +834,13 @@
cmd = "user_data ".. destination_number .."@"..domain_name.." var extension_uuid"; cmd = "user_data ".. destination_number .."@"..domain_name.." var extension_uuid";
extension_uuid = trim(api:executeString(cmd)); extension_uuid = trim(api:executeString(cmd));
--set hold music
if (session:getVariable("hold_music") == nil) then
hold_music = '';
else
hold_music = ",hold_music="..session:getVariable("hold_music");
end
--send to user --send to user
local dial_string_user = "[sip_invite_domain="..domain_name..",call_direction="..call_direction..","; local dial_string_user = "[sip_invite_domain="..domain_name..",call_direction="..call_direction..",";
dial_string_user = dial_string_user .. group_confirm..","..timeout_name.."="..destination_timeout..","; dial_string_user = dial_string_user .. group_confirm..","..timeout_name.."="..destination_timeout..",";
dial_string_user = dial_string_user .. delay_name.."="..destination_delay..","; dial_string_user = dial_string_user .. delay_name.."="..destination_delay..",";
dial_string_user = dial_string_user .. "dialed_extension=" .. row.destination_number .. ","; dial_string_user = dial_string_user .. "dialed_extension=" .. row.destination_number .. ",";
dial_string_user = dial_string_user .. "presence_id=" .. row.destination_number .. "@"..domain_name..","; dial_string_user = dial_string_user .. "presence_id=" .. row.destination_number .. "@"..domain_name..",";
dial_string_user = dial_string_user .. "extension_uuid="..extension_uuid..record_session.."]"; dial_string_user = dial_string_user .. "extension_uuid="..extension_uuid..hold_music..record_session.."]";
user_contact = api:executeString("sofia_contact */".. row.destination_number .."@" ..domain_name); user_contact = api:executeString("sofia_contact */".. row.destination_number .."@" ..domain_name);
if (user_contact ~= "error/user_not_registered") then if (user_contact ~= "error/user_not_registered") then
dial_string = dial_string_user .. user_contact; dial_string = dial_string_user .. user_contact;
@ -925,7 +925,7 @@
--release dbh before bridge --release dbh before bridge
dbh:release(); dbh:release();
--session execute --session execute
if (session:ready()) then if (session:ready()) then
--set the variables --set the variables