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

Update ring group rollover so that it works like standard roll over. If busy it moves to the next line. If not busy and timeout it moves to the timeout action.

Browse Source
This commit is contained in:
markjcrane
2015-08-14 15:27:48 -06:00
parent 1e6d8bfa26
commit 772474faae
1 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/app/ring_groups/index.lua
+23 -33
View File
@@ -499,6 +499,7 @@
--if the user is busy rollover to the next destination --if the user is busy rollover to the next destination
if (ring_group_strategy == "rollover") then if (ring_group_strategy == "rollover") then
x = 0;
for key, row in pairs(destinations) do for key, row in pairs(destinations) do
--set the values from the database as variables --set the values from the database as variables
user_exists = row.user_exists; user_exists = row.user_exists;
@@ -514,41 +515,30 @@
--set the timeout --set the timeout
session:execute("set", "call_timeout="..row.destination_timeout); session:execute("set", "call_timeout="..row.destination_timeout);
--check if the user is busy --if the timeout was reached go to the timeout action
extension_status = "show channels like "..destination_number.."@"..domain_name; if (x > 0) then
reply = trim(api:executeString(extension_status)); if (session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT"
if (reply == "0 total.") then or session:getVariable("originate_disposition") == "NO_ANSWER"
--not found: user is available or session:getVariable("originate_disposition") == "NO_USER_RESPONSE") then
if (user_exists == "true") then break;
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. destination_number .. "@" .. domain_name;
session:execute("bridge", dial_string);
elseif (tonumber(destination_number) == nil) then
--sip uri
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]" .. destination_number;
session:execute("bridge", dial_string);
else
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]loopback/" .. destination_number;
session:execute("bridge", dial_string);
end
else
--look inside the reply to check for the correct domain_name
if string.find(reply, domain_name) then
--found: extension number is busy
else
--not found: user is available
if (user_exists == "true") then
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]user/" .. destination_number .. "@" .. domain_name;
session:execute("bridge", dial_string);
elseif (tonumber(destination_number) == nil) then
--sip uri
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]" .. destination_number;
session:execute("bridge", dial_string);
else
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]loopback/" .. destination_number;
session:execute("bridge", dial_string);
end
end end
end end
--send the call to the destination
if (user_exists == "true") then
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]user/" .. destination_number .. "@" .. domain_name;
session:execute("bridge", dial_string);
elseif (tonumber(destination_number) == nil) then
--sip uri
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]" .. destination_number;
session:execute("bridge", dial_string);
else
dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]loopback/" .. destination_number;
session:execute("bridge", dial_string);
end
--increment the value of x
x = x + 1;
end end
end end