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

Update intercept.lua

Browse Source
This commit is contained in:
FusionPBX
2017-05-19 01:07:05 -06:00
committed by GitHub
parent 9fdb3bf649
commit dd37b89353
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/intercept.lua
+16 -15
View File
@@ -49,9 +49,9 @@
--include json library --include json library
local json local json
if (debug["sql"]) then -- if (debug["sql"]) then
json = require "resources.functions.lunajson" json = require "resources.functions.lunajson"
end -- end
--get the hostname --get the hostname
local hostname = trim(api:execute("switchname", "")); local hostname = trim(api:execute("switchname", ""));
@@ -260,7 +260,7 @@
--check the database to get the uuid of a ringing call --check the database to get the uuid of a ringing call
call_hostname = ""; call_hostname = "";
sql = "SELECT uuid, call_uuid, hostname FROM channels "; sql = "SELECT uuid, call_uuid, hostname FROM channels ";
sql = sql .. "WHERE callstate in ('RINGING', 'EARLY') "; sql = sql .. "WHERE callstate IN ('RINGING', 'EARLY') ";
-- next check should prevent pickup call from extension -- next check should prevent pickup call from extension
-- e.g. if extension 100 dial some cell phone and some one else dial *8 -- e.g. if extension 100 dial some cell phone and some one else dial *8
-- he can pickup this call. -- he can pickup this call.
@@ -275,33 +275,34 @@
if direction:find('outbound') then if direction:find('outbound') then
sql = sql .. "OR direction = 'inbound' "; sql = sql .. "OR direction = 'inbound' ";
end end
sql = sql .. ")" sql = sql .. ") "
end end
sql = sql .. "AND (1<>1"; sql = sql .. "AND (1<>1 ";
local params = {}; local params = {};
for key,extension in pairs(extensions) do for key,extension in pairs(extensions) do
local param_name = "presence_id_" .. tostring(key); local param_name = "presence_id_" .. tostring(key);
sql = sql .. " OR presence_id = :" .. param_name; sql = sql .. "OR presence_id = :" .. param_name;
params[param_name] = extension.."@"..domain_name; params[param_name] = extension.."@"..domain_name;
end end
sql = sql .. ") "; sql = sql .. ") ";
sql = sql .. "and call_uuid is not null "; sql = sql .. "AND call_uuid IS NOT NULL ";
sql = sql .. "limit 1 "; sql = sql .. "LIMIT 1 ";
if (debug["sql"]) then --if (debug["sql"]) then
log.noticef("SQL: %s; params: %s", sql, json.encode(params)); log.noticef("SQL: %s; params: %s", sql, json.encode(params));
end --end
local is_child local is_child
dbh:query(sql, params, function(row) dbh:query(sql, params, function(row)
-- for key, val in pairs(row) do --for key, val in pairs(row) do
-- log.notice("row "..key.." "..val); -- log.notice("row "..key.." "..val);
-- end --end
-- log.notice("-----------------------"); --log.notice("-----------------------");
is_child = (row.uuid == row.call_uuid) is_child = (row.uuid == row.call_uuid)
uuid = row.call_uuid; uuid = row.call_uuid;
call_hostname = row.hostname; call_hostname = row.hostname;
end); end);
--log.notice("uuid: "..uuid);
--log.notice("call_hostname: "..call_hostname);
if is_child then if is_child then
-- we need intercept `parent` call e.g. call in FIFO/CallCenter Queue -- we need intercept `parent` call e.g. call in FIFO/CallCenter Queue
if (call_hostname == hostname) then if (call_hostname == hostname) then