nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Browse Source
This commit is contained in:
markjcrane
2021-05-06 21:52:21 -06:00
parent 375deea90c 9c3692ccfc
commit 13b6be49c8
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/conferences/conference_edit.php
View File

@@ -193,6 +193,9 @@
$dialplan_xml = "<extension name=\"".$conference_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n"; $dialplan_xml = "<extension name=\"".$conference_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n";
$dialplan_xml .= " <condition field=\"destination_number\" expression=\"^".$conference_extension."$\">\n"; $dialplan_xml .= " <condition field=\"destination_number\" expression=\"^".$conference_extension."$\">\n";
$dialplan_xml .= " <action application=\"answer\" data=\"\"/>\n"; $dialplan_xml .= " <action application=\"answer\" data=\"\"/>\n";
$dialplan_xml .= " <action application=\"set\" data=\"conference_uuid=".$conference_uuid."\" inline=\"true\"/>\n";
//$dialplan_xml .= " <action application=\"set\" data=\"conference_name=".$conference_name."\" inline=\"true\"/>\n";
$dialplan_xml .= " <action application=\"set\" data=\"conference_extension=".$conference_extension."\" inline=\"true\"/>\n";
$dialplan_xml .= " <action application=\"conference\" data=\"".$conference_extension."@".$_SESSION['domain_name']."@".$conference_profile.$pin_number."+flags{'".$conference_flags."'}\"/>\n"; $dialplan_xml .= " <action application=\"conference\" data=\"".$conference_extension."@".$_SESSION['domain_name']."@".$conference_profile.$pin_number."+flags{'".$conference_flags."'}\"/>\n";
$dialplan_xml .= " </condition>\n"; $dialplan_xml .= " </condition>\n";
$dialplan_xml .= "</extension>\n"; $dialplan_xml .= "</extension>\n";

4
app/destinations/destination_edit.php
View File

@@ -339,7 +339,7 @@
$dialplan["dialplan_xml"] .= " <action application=\"record_session\" data=\"\${record_path}/\${record_name}\" inline=\"false\"/>\n"; $dialplan["dialplan_xml"] .= " <action application=\"record_session\" data=\"\${record_path}/\${record_name}\" inline=\"false\"/>\n";
} }
if (strlen($destination_hold_music) > 0) { if (strlen($destination_hold_music) > 0) {
$dialplan["dialplan_xml"] .= " <action application=\"set\" data=\"hold_music=".$destination_hold_music."\" inline=\"true\"/>\n"; $dialplan["dialplan_xml"] .= " <action application=\"export\" data=\"hold_music=".$destination_hold_music."\" inline=\"true\"/>\n";
} }
if (strlen($destination_accountcode) > 0) { if (strlen($destination_accountcode) > 0) {
$dialplan["dialplan_xml"] .= " <action application=\"export\" data=\"accountcode=".$destination_accountcode."\" inline=\"true\"/>\n"; $dialplan["dialplan_xml"] .= " <action application=\"export\" data=\"accountcode=".$destination_accountcode."\" inline=\"true\"/>\n";
@@ -477,7 +477,7 @@
if (strlen($destination_hold_music) > 0) { if (strlen($destination_hold_music) > 0) {
$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid; $dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action"; $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_data"] = "hold_music=".$destination_hold_music;
$dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = "true"; $dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = "true";
$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order; $dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;

11
app/scripts/resources/scripts/app/ring_groups/index.lua
View File

@@ -161,6 +161,7 @@
call_direction = session:getVariable("call_direction"); call_direction = session:getVariable("call_direction");
accountcode = session:getVariable("accountcode"); accountcode = session:getVariable("accountcode");
local_ip_v4 = session:getVariable("local_ip_v4") local_ip_v4 = session:getVariable("local_ip_v4")
hold_music = session:getVariable("hold_music");
end end
--set caller id --set caller id
@@ -809,8 +810,16 @@
--get the extension_uuid --get the extension_uuid
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 (hold_music == nil) then
hold_music = '';
else
hold_music = ",hold_music="..hold_music;
end
--send to user --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; dial_string = dial_string_to_user;
elseif (tonumber(destination_number) == nil) then elseif (tonumber(destination_number) == nil) then
--sip uri --sip uri