nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-22 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change. Use require "resources.functions.config" to load config file."

Browse Source
This commit is contained in:
FusionPBX
2015-08-10 11:50:29 -06:00
parent 1a29486bcc
commit 2a2dd209df
69 changed files with 507 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/install/scripts/cidlookup.lua
View File

@@ -30,10 +30,20 @@
debug["sql"] = true;
--define the trim function
require "resources.functions.trim"
function trim (s)
return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
end
--define the explode function
require "resources.functions.explode"
function explode ( seperator, str )
local pos, arr = 0, {}
for st, sp in function() return string.find( str, seperator, pos, true ) end do -- for each divider found
table.insert( arr, string.sub( str, pos, st-1 ) ) -- attach chars left of current divider
pos = sp + 1 -- jump past current divider
end
table.insert( arr, string.sub( str, pos ) ) -- attach chars right of last divider
return arr
end
--create the api object
api = freeswitch.API();
@@ -69,20 +79,22 @@
end;
--include config.lua
require "resources.functions.config";
scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
dofile(scripts_dir.."/resources/functions/config.lua");
dofile(config());
--check if the session is ready
--connect to the database
require "resources.functions.database_handle";
dofile(scripts_dir.."/resources/functions/database_handle.lua");
dbh = database_handle('system');
if (database["type"] == "mysql") then
sql = "SELECT CONCAT(v_contacts.contact_name_given, ' ', v_contacts.contact_name_family,' (',v_contact_phones.phone_type,')') AS name FROM v_contacts ";
else
sql = "SELECT v_contacts.contact_name_given || ' ' || v_contacts.contact_name_family || ' (' || v_contact_phones.phone_type || ')' AS name FROM v_contacts ";
end
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 .. "WHERE v_contact_phones.phone_number = '"..caller.."' AND v_destinations.destination_number='"..callee.."'";