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

Merge pull request #4165 from AdrianFretwell/master

Browse Source 
Update cidlookup.lua - Bug fix where contact phone number exists in more than one domain
This commit is contained in:
FusionPBX
2019-05-20 08:59:26 -06:00
committed by GitHub
parent 1510b93344 ff8fb4bd15
commit 596d558bd1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/cidlookup.lua
+12 -3
View File
@@ -22,9 +22,10 @@
-- Contributor(s): -- Contributor(s):
-- Luis Daniel Lucio Quiroz <dlucio@okay.com.mx> -- Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
-- Riccardo Granchi <riccardo.granchi@nems.it> -- Riccardo Granchi <riccardo.granchi@nems.it>
-- Adrian Fretwell <adrian.fretwell@topgreen.co.uk>
-- --
-- add this in Inbound Routes before transfer to use it: -- add this in Inbound Routes before transfer to use it:
-- action set caller_id_name=${luarun cidlookup.lua ${uuid}} -- action set caller_id_name=${luarun cidlookup.lua ${uuid} ${domain_uuid}}
--define the trim function --define the trim function
require "resources.functions.trim" require "resources.functions.trim"
@@ -35,6 +36,7 @@
--create the api object --create the api object
api = freeswitch.API(); api = freeswitch.API();
uuid = argv[1]; uuid = argv[1];
domain_uuid = argv[2];
if not uuid or uuid == "" then return end; if not uuid or uuid == "" then return end;
caller = api:executeString("uuid_getvar " .. uuid .. " caller_id_number"); caller = api:executeString("uuid_getvar " .. uuid .. " caller_id_number");
callee = api:executeString("uuid_getvar " .. uuid .. " destination_number"); callee = api:executeString("uuid_getvar " .. uuid .. " destination_number");
@@ -86,8 +88,15 @@
end end
sql = sql .. "INNER JOIN v_contact_phones ON v_contact_phones.contact_uuid = v_contacts.contact_uuid "; sql = sql .. "INNER JOIN v_contact_phones ON v_contact_phones.contact_uuid = v_contacts.contact_uuid ";
sql = sql .. "INNER JOIN v_destinations ON v_destinations.domain_uuid = v_contacts.domain_uuid "; sql = sql .. "INNER JOIN v_destinations ON v_destinations.domain_uuid = v_contacts.domain_uuid ";
sql = sql .. "WHERE v_contact_phones.phone_number = :caller "
local params = {caller = caller} local params;
if ((not domain_uuid) or (domain_uuid == "")) then
sql = sql .. "WHERE v_contact_phones.phone_number = :caller ";
params = {caller = caller};
else
sql = sql .. "WHERE v_contacts.domain_uuid = :domain_uuid and v_contact_phones.phone_number = :caller ";
params = {caller = caller, domain_uuid = domain_uuid};
end
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[cidlookup] SQL: "..sql.."; params:" .. json.encode(params) .. "\n"); freeswitch.consoleLog("notice", "[cidlookup] SQL: "..sql.."; params:" .. json.encode(params) .. "\n");