nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-04 18:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the ring group caller id prefix.

Browse Source
This commit is contained in:
Mark Crane
2014-02-08 18:42:35 +00:00
parent d07506fbf6
commit 1fa31bca61
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
resources/install/scripts/app/ring_groups/index.lua
View File

@@ -88,8 +88,16 @@
domain_uuid = row["domain_uuid"];
ring_group_forward_enabled = row["ring_group_forward_enabled"];
ring_group_forward_destination = row["ring_group_forward_destination"];
ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"];
end);
--set the caller id
if (session:ready()) then
if (string.len(ring_group_cid_name_prefix) > 0) then
session:execute("set", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
end
end
--process the ring group
if (ring_group_forward_enabled == "true" and string.len(ring_group_forward_destination) > 0) then
--forward the ring group
@@ -199,14 +207,6 @@
session:setVariable("ringback", ring_group_ringback);
session:setVariable("transfer_ringback", ring_group_ringback);
--add the caller id prefix
if (string.len(ring_group_cid_name_prefix) > 0) then
origination_caller_id_name = ring_group_cid_name_prefix .. "#" .. caller_id_name;
else
origination_caller_id_name = caller_id_name;
end
origination_caller_id_number = caller_id_number;
--setup the delimiter
delimiter = ",";
if (row.ring_group_strategy == "sequence") then
@@ -321,7 +321,7 @@
end
--originate each destination
if (dial_string ~= nil) then
dial_string = "{ignore_early_media=true,origination_caller_id_name="..origination_caller_id_name..",origination_caller_id_number="..origination_caller_id_number.."}"..dial_string;
dial_string = "{ignore_early_media=true,origination_caller_id_number="..origination_caller_id_number.."}"..dial_string;
cmd = "";
if (tonumber(destination_delay) > 0) then
cmd = "sched_api +"..destination_delay.." "..new_uuid.." ";
@@ -330,12 +330,11 @@
--freeswitch.consoleLog("notice", "[ring group] cmd: " .. cmd .. "\n");
result = trim(api:executeString(cmd));
end
else
--use a delimiter between dialstrings
if (dial_string ~= nil) then
if (x == 0) then
app_data = "{ignore_early_media=true,origination_caller_id_name="..origination_caller_id_name..",origination_caller_id_number="..origination_caller_id_number.."}"..dial_string;
app_data = "{ignore_early_media=true}"..dial_string;
else
app_data = app_data .. delimiter .. dial_string;
end