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

Merge branch 'master' into Fix-DND-Feature-Sync-Loop

Browse Source
This commit is contained in:
demonspork
2021-03-19 11:12:44 -05:00
committed by GitHub
parent cf1dfe9070 970478ba70
commit 3ef6cf05db
13 changed files with 187 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/scripts/resources/scripts/app/feature_event/index.lua
View File

@@ -72,7 +72,7 @@
end
--get the events
--if (user == nil) then
--if (user == nil) then
--serialize the data for the console
--freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
--freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n");
@@ -115,13 +115,13 @@
--get sip profile
if (user ~= nil and host ~= nil) then
sip_profile = notify.get_profile(user, host);
sip_profiles = notify.get_profiles(user, host);
end
--DND
if (sip_profiles ~= nil) then
--DND enabled
if (feature_action == "SetDoNotDisturb" and feature_enabled == "true" and sip_profile ~= nil) then
if (feature_action == "SetDoNotDisturb" and feature_enabled == "true") then
--set a variable
dial_string = "error/user_busy";
do_not_disturb = "true";
@@ -155,11 +155,11 @@
end
--send notify to the phone
notify.dnd(user, host, sip_profile, do_not_disturb);
notify.dnd(user, host, sip_profiles, do_not_disturb);
end
--DND disabled
if (feature_action == "SetDoNotDisturb" and feature_enabled == "false" and sip_profile ~= nil ) then
if (feature_action == "SetDoNotDisturb" and feature_enabled == "false") then
--set a variable
do_not_disturb = "false";
@@ -177,14 +177,14 @@
dbh:query(sql, params);
--send notify to the phone
notify.dnd(user, host, sip_profile, do_not_disturb);
notify.dnd(user, host, sip_profiles, do_not_disturb);
end
--Call Forward
--Call Formward All enabled
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_immediate" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_immediate") then
--set a variable
forward_all_destination = action_value;
forward_all_enabled = "true";
@@ -247,11 +247,11 @@
end
--send notify to the phone
notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);
notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
end
--Call Formward All disable
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_immediate" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_immediate") then
--set a variable
forward_all_destination = action_value;
forward_all_enabled = "false";
@@ -277,14 +277,14 @@
dbh:query(sql, params);
--send notify to the phone
if (forward_immediate_destination == nil) then
if (forward_immediate_destination == nil) then
forward_immediate_destination = " ";
end
notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);
notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
end
--Call Formward BUSY enable
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_busy" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_busy") then
--set a variable
forward_busy_destination = action_value;
forward_busy_enabled = "true";
@@ -303,11 +303,11 @@
dbh:query(sql, params);
--send notify to the phone
notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);
notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
end
--Call Formward BUSY disable
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_busy" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_busy") then
--set a variable
forward_busy_destination = action_value;
forward_busy_enabled = "false";
@@ -330,11 +330,11 @@
dbh:query(sql, params);
--send notify to the phone
notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);
notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
end
--Call Formward NO ANSWER enable
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_no_answer" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_no_answer") then
--set a variable
forward_no_answer_destination = action_value;
forward_no_answer_enabled = "true";
@@ -355,11 +355,11 @@
dbh:query(sql, params);
--send notify to the phone
notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
end
--Call Formward NO ANSWER disable
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_no_answer" and sip_profile ~= nil) then
if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_no_answer") then
--set a variable
forward_no_answer_destination = action_value;
forward_no_answer_enabled = "false";
@@ -382,28 +382,28 @@
dbh:query(sql, params);
--send notify to the phone
notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
end
--No feature event (phone boots): Send all values
if (feature_enabled == nil) then
--Do Not Disturb
--notify.dnd(user, host, sip_profile, do_not_disturb);
--notify.dnd(user, host, sip_profiles, do_not_disturb);
--Forward all
forward_immediate_enabled = forward_all_enabled;
forward_immediate_destination = forward_all_destination;
--notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);
--notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
--Forward busy
--notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);
--notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
--Forward No Answer
ring_count = math.ceil (call_timeout / 6);
--notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
--notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
notify.init(user,
host,
sip_profile,
sip_profiles,
forward_immediate_enabled,
forward_immediate_destination,
forward_busy_enabled,
@@ -414,8 +414,8 @@
do_not_disturb);
end
-- feature_event_notify.init(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
-- feature_event_notify.init(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
end
--clear the cache
if (feature_enabled ~= nil) then
cache.del("directory:"..user.."@"..host)

57
app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
View File

@@ -56,22 +56,36 @@ function feature_event_notify.get_db_values(user, domain_name)
return do_not_disturb, forward_all_enabled, forward_all_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, call_timeout
end
function feature_event_notify.get_profile(user, host)
---@return table, nil
function feature_event_notify.get_profiles(user, domain)
--includes
require "resources.functions.explode"
require "resources.functions.trim"
local account = user.."@"..host
local account = user.."@"..domain
--create the api object
api = freeswitch.API();
local sofia_contact = trim(api:executeString("sofia_contact */"..account));
local array = explode("/", sofia_contact);
local sip_profile = array[2];
return sip_profile
--get all profiles for the user account
local profile_iterator = string.gmatch(sofia_contact, "sofia/([^,]+)/[^,]+");
--remove any duplicates and check if we have any profiles
local unique_profiles = {}
local has_profile = false
for profile in profile_iterator do
has_profile = true
unique_profiles[profile] = 1
end
-- return nil if we have no profiles
if not has_profile then return nil end
return unique_profiles
end
function feature_event_notify.dnd(user, host, sip_profile, do_not_disturb)
--set the event and send it
function feature_event_notify.dnd(user, host, sip_profiles, do_not_disturb)
--set the event and send it to each profile
for sip_profile, _ in pairs(sip_profiles) do
local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
event:addHeader("profile", sip_profile)
event:addHeader("user", user)
@@ -83,10 +97,12 @@ function feature_event_notify.dnd(user, host, sip_profile, do_not_disturb)
local socket = require 'socket'
socket.sleep(0.2)
event:fire()
end
end
function feature_event_notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination)
--set the event and send it
function feature_event_notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination)
--set the event and send it to each profile
for sip_profile, _ in pairs(sip_profiles) do
local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
event:addHeader("profile", sip_profile)
event:addHeader("user", user)
@@ -99,10 +115,12 @@ function feature_event_notify.forward_immediate(user, host, sip_profile, forward
local socket = require 'socket'
socket.sleep(0.2)
event:fire()
end
end
function feature_event_notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination)
--set the event and send it
function feature_event_notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination)
--set the event and send it to each profile
for sip_profile, _ in pairs(sip_profiles) do
local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
event:addHeader("profile", sip_profile)
event:addHeader("user", user)
@@ -114,10 +132,12 @@ function feature_event_notify.forward_busy(user, host, sip_profile, forward_busy
local socket = require 'socket'
socket.sleep(0.2)
event:fire()
end
end
function feature_event_notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count)
--set the event and send it
function feature_event_notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count)
--set the event and send it to each profile
for sip_profile, _ in pairs(sip_profiles) do
local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
event:addHeader("profile", sip_profile)
event:addHeader("user", user)
@@ -130,10 +150,12 @@ function feature_event_notify.forward_no_answer(user, host, sip_profile, forward
local socket = require 'socket'
socket.sleep(0.2)
event:fire()
end
end
function feature_event_notify.init(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
--set the event and send it
function feature_event_notify.init(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
--set the event and send it to each profile
for sip_profile, _ in pairs(sip_profiles) do
local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
event:addHeader("profile", sip_profile)
event:addHeader("user", user)
@@ -153,6 +175,7 @@ function feature_event_notify.init(user, host, sip_profile, forward_immediate_en
local socket = require 'socket'
socket.sleep(0.2)
event:fire()
end
end
return feature_event_notify

12
app/scripts/resources/scripts/call_forward.lua
View File

@@ -262,14 +262,14 @@
-- Get the sip_profile
if (extension ~= nil and domain_name ~= nil) then
sip_profile = notify.get_profile(extension, domain_name);
sip_profiles = notify.get_profiles(extension, domain_name);
end
if (sip_profile ~= nil) then
if (sip_profiles ~= nil) then
freeswitch.consoleLog("NOTICE", "[feature_event] SIP NOTIFY: CFWD set to "..forward_all_enabled.."\n");
--Do Not Disturb
notify.dnd(extension, domain_name, sip_profile, do_not_disturb);
notify.dnd(extension, domain_name, sip_profiles, do_not_disturb);
--Forward all
forward_immediate_enabled = forward_all_enabled;
@@ -281,7 +281,7 @@
end
freeswitch.consoleLog("NOTICE", "[feature_event] forward_immediate_destination "..forward_immediate_destination.."\n");
notify.forward_immediate(extension, domain_name, sip_profile, forward_immediate_enabled, forward_immediate_destination);
notify.forward_immediate(extension, domain_name, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
--Forward busy
--workaround for freeswitch not sending NOTIFY when destination values are nil. Send 0.
@@ -290,7 +290,7 @@
end
freeswitch.consoleLog("NOTICE", "[feature_event] forward_busy_destination "..forward_busy_destination.."\n");
notify.forward_busy(extension, domain_name, sip_profile, forward_busy_enabled, forward_busy_destination);
notify.forward_busy(extension, domain_name, sip_profiles, forward_busy_enabled, forward_busy_destination);
--Forward No Answer
ring_count = math.ceil (call_timeout / 6);
@@ -300,7 +300,7 @@
end
freeswitch.consoleLog("NOTICE", "[feature_event] forward_no_answer_destination "..forward_no_answer_destination.."\n");
notify.forward_no_answer(extension, domain_name, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
notify.forward_no_answer(extension, domain_name, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
end
end

12
app/scripts/resources/scripts/do_not_disturb.lua
View File

@@ -227,15 +227,15 @@
-- Get the sip_profile
if (extension ~= nil and domain_name ~= nil) then
sip_profile = notify.get_profile(extension, domain_name);
sip_profiles = notify.get_profiles(extension, domain_name);
end
-- check if not nil
if (sip_profile ~= nil) then
if (sip_profiles ~= nil) then
freeswitch.consoleLog("NOTICE", "[feature_event] SIP NOTIFY: CFWD set to "..forward_all_enabled.."\n");
--Do Not Disturb
notify.dnd(extension, domain_name, sip_profile, do_not_disturb);
notify.dnd(extension, domain_name, sip_profiles, do_not_disturb);
--Forward all
forward_immediate_enabled = forward_all_enabled;
@@ -246,7 +246,7 @@
forward_immediate_destination = '0';
end
notify.forward_immediate(extension, domain_name, sip_profile, forward_immediate_enabled, forward_immediate_destination);
notify.forward_immediate(extension, domain_name, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
--Forward busy
--workaround for freeswitch not sending NOTIFY when destination values are nil. Send 0.
@@ -254,7 +254,7 @@
forward_busy_destination = '0';
end
notify.forward_busy(extension, domain_name, sip_profile, forward_busy_enabled, forward_busy_destination);
notify.forward_busy(extension, domain_name, sip_profiles, forward_busy_enabled, forward_busy_destination);
--Forward No Answer
ring_count = math.ceil (call_timeout / 6);
@@ -263,7 +263,7 @@
forward_no_answer_destination = '0';
end
notify.forward_no_answer(extension, domain_name, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
notify.forward_no_answer(extension, domain_name, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
end
end