nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1087 from moteus/revert-1086-revert-1053-require_config

Browse Source 
Change. Use `require` function to load Lua libraries
This commit is contained in:
FusionPBX
2015-08-11 20:05:48 -06:00
parent 978bec7cbd 4639001ca3
commit 9f4287a9b4
69 changed files with 297 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/install/scripts/app/agent_status/index.lua
View File

@@ -6,7 +6,7 @@
debug["sql"] = true;
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--set the api

6
resources/install/scripts/app/call_block/index.lua
View File

@@ -57,7 +57,7 @@ This method causes the script to get its manadatory arguments directly from the
local sql = nil
--define the functions
dofile(scripts_dir.."/resources/functions/trim.lua");
require "resources.functions.trim";
--define the logger function
local function logger(level, log, data)
@@ -88,7 +88,7 @@ This method causes the script to get its manadatory arguments directly from the
--if not cached then get the information from the database
if (cache == "-ERR NOT FOUND") then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--log if not connect
@@ -123,7 +123,7 @@ This method causes the script to get its manadatory arguments directly from the
else
--get from memcache
--add the function
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.explode";
--parse the cache
array = explode("&", cache);

16
resources/install/scripts/app/conference_center/index.lua
View File

@@ -37,19 +37,19 @@
debug["sql"] = false;
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--prepare the api object
api = freeswitch.API();
--general functions
dofile(scripts_dir.."/resources/functions/base64.lua");
dofile(scripts_dir.."/resources/functions/trim.lua");
dofile(scripts_dir.."/resources/functions/file_exists.lua");
dofile(scripts_dir.."/resources/functions/explode.lua");
dofile(scripts_dir.."/resources/functions/format_seconds.lua");
dofile(scripts_dir.."/resources/functions/mkdir.lua");
require "resources.functions.base64";
require "resources.functions.trim";
require "resources.functions.file_exists";
require "resources.functions.explode";
require "resources.functions.format_seconds";
require "resources.functions.mkdir";
--get the session variables
uuid = session:getVariable("uuid");
@@ -153,7 +153,7 @@
end_epoch = os.time();
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--get the conference sessions

10
resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua
View File

@@ -1,12 +1,10 @@
--get the scripts directory and include the config.lua
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());
require "resources.functions.config";
--additional includes
dofile(scripts_dir.."/resources/functions/file_exists.lua");
dofile(scripts_dir.."/resources/functions/trim.lua");
dofile(scripts_dir.."/resources/functions/mkdir.lua");
require "resources.functions.file_exists";
require "resources.functions.trim";
require "resources.functions.mkdir";
--get the argv values
script_name = argv[0];

4
resources/install/scripts/app/dialplan/index.lua
View File

@@ -19,8 +19,8 @@
-- the Initial Developer. All Rights Reserved.
--add functions
dofile(scripts_dir.."/resources/functions/file_exists.lua");
dofile(scripts_dir.."/resources/functions/trim.lua");
require "resources.functions.file_exists";
require "resources.functions.trim";
--set the api object
api = freeswitch.API();

4
resources/install/scripts/app/dialplan/resources/inbound/010_get_domain.lua.noload
View File

@@ -32,7 +32,7 @@
end
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--get the cache
@@ -64,7 +64,7 @@
else
--add the function
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.explode";
--parse the cache
array = explode("&", cache);

12
resources/install/scripts/app/event_notify/index.lua
View File

@@ -23,16 +23,8 @@
-- Mark J Crane <markjcrane@fusionpbx.com>
-- Errol Samuels <voiptology@gmail.com>
--define 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
--define the explode function
require "resources.functions.explode";
--usage
--luarun app.lua event_notify internal reboot 1003@domain.fusionpbx.com yealink

6
resources/install/scripts/app/failure_handler/index.lua
View File

@@ -28,9 +28,9 @@
debug["sql"] = false;
--include config.lua
dofile(scripts_dir .. "/resources/functions/config.lua");
dofile(scripts_dir .. "/resources/functions/explode.lua");
dofile(scripts_dir .. "/resources/functions/trim.lua");
require "resources.functions.config";
require "resources.functions.explode";
require "resources.functions.trim";
--check the missed calls
function missed()

28
resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua
View File

@@ -26,33 +26,17 @@
api = freeswitch.API();
--include config.lua
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());
require "resources.functions.config";
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--define the explode function
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
require "resources.functions.explode";
--array count
function count(t)
c = 0;
for k,v in pairs(t) do
c = c+1;
end
return c;
end
require "resources.functions.count";
-- set channel variables to lua variables
domain_uuid = env:getHeader("domain_uuid");
@@ -68,7 +52,7 @@
end
--settings
dofile(scripts_dir.."/resources/functions/settings.lua");
require "resources.functions.settings";
settings = settings(domain_uuid);
storage_type = "";
storage_path = "";
@@ -313,7 +297,7 @@
if (fax_success =="1") then
if (storage_type == "base64") then
--include the base64 function
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--base64 encode the file
local f = io.open(fax_file, "rb");

8
resources/install/scripts/app/hangup/index.lua
View File

@@ -25,10 +25,10 @@
debug["sql"] = false;
--general functions
dofile(scripts_dir .. "/resources/functions/config.lua");
dofile(scripts_dir .. "/resources/functions/explode.lua");
dofile(scripts_dir.."/resources/functions/trim.lua");
--dofile(scripts_dir.."/resources/functions/file_exists.lua");
require "resources.functions.config";
require "resources.functions.explode";
require "resources.functions.trim";
-- require "resources.functions.file_exists";
--create the api object
api = freeswitch.API();

12
resources/install/scripts/app/is_local/index.lua
View File

@@ -29,18 +29,14 @@
outbound_caller_id_number = session:getVariable("outbound_caller_id_number");
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--prepare the api object
api = freeswitch.API();
--add the trim function
function trim(s)
if (s) then
return s:gsub("^%s+", ""):gsub("%s+$", "")
end
end
--define the trim function
require "resources.functions.trim";
--get the cache
cache = trim(api:execute("memcache", "get app:dialplan:outbound:is_local:" .. destination_number .. "@" .. domain_name));
@@ -84,7 +80,7 @@
end));
else
--add the function
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.explode";
--define the array/table and variables
local var = {}

19
resources/install/scripts/app/provision/index.lua
View File

@@ -26,16 +26,8 @@
--set the debug options
debug["sql"] = false;
--define 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
--define the explode function
require "resources.functions.explode";
--set the defaults
max_tries = 3;
@@ -44,13 +36,8 @@
tries = 0;
profile = "internal";
--include config.lua
--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());
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--answer

12
resources/install/scripts/app/ring_groups/index.lua
View File

@@ -28,12 +28,12 @@
-- Luis Daniel Lucio Qurioz <dlucio@okay.com.mx>
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--include functions
dofile(scripts_dir.."/resources/functions/trim.lua");
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.trim";
require "resources.functions.explode";
--get the variables
domain_name = session:getVariable("domain_name");
@@ -329,16 +329,16 @@
or ring_group_strategy == "sequence"
or ring_group_strategy == "rollover") then
session:execute("set", "group_confirm_key=exec");
session:execute("set", "group_confirm_file=lua ".. scripts_dir .."/confirm.lua");
session:execute("set", "group_confirm_file=lua ".. scripts_dir:gsub('\\','/') .."/confirm.lua");
end
--determine confirm prompt
if (destination_prompt == nil) then
group_confirm = "confirm=false,";
elseif (destination_prompt == "1") then
group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir .."/confirm.lua,confirm=true,";
group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir:gsub('\\','/') .."/confirm.lua,confirm=true,";
elseif (destination_prompt == "2") then
group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir .."/confirm.lua,confirm=true,";
group_confirm = "group_confirm_key=exec,group_confirm_file=lua ".. scripts_dir:gsub('\\','/') .."/confirm.lua,confirm=true,";
else
group_confirm = "confirm=false,";
end

20
resources/install/scripts/app/ring_groups/resources/scripts/confirm.lua
View File

@@ -23,27 +23,17 @@
-- Mark J Crane <markjcrane@fusionpbx.com>
--include config.lua
scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
require "resources.functions.config";
--set variables
max_tries = "3";
digit_timeout = "5000";
--add a trim function
function trim (s)
return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
end
--define the trim function
require "resources.functions.trim";
--add the explode function
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
--define the explode function
require "resources.functions.explode";
--get the argv values
script_name = argv[0];

18
resources/install/scripts/app/ring_groups/resources/scripts/monitor.lua
View File

@@ -33,21 +33,11 @@
uuid = argv[1];
timeout = argv[2];
--add a trim function
function trim (s)
return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
end
--define the trim function
require "resources.functions.trim";
--add the explode function
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
--define the explode function
require "resources.functions.explode";
--prepare the api
api = freeswitch.API();

2
resources/install/scripts/app/toll_allow/index.lua
View File

@@ -26,7 +26,7 @@
--debug
debug["toll_type"] = false
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.explode";
--create the api object and get variables
api = freeswitch.API()

62
resources/install/scripts/app/voicemail/index.lua
View File

@@ -50,7 +50,7 @@
password_tries = 0;
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--set the api
@@ -123,7 +123,7 @@
end
--settings
dofile(scripts_dir.."/resources/functions/settings.lua");
require "resources.functions.settings";
settings = settings(domain_uuid);
storage_type = "";
storage_path = "";
@@ -200,36 +200,36 @@
end
--general functions
dofile(scripts_dir.."/resources/functions/base64.lua");
dofile(scripts_dir.."/resources/functions/trim.lua");
dofile(scripts_dir.."/resources/functions/file_exists.lua");
dofile(scripts_dir.."/resources/functions/explode.lua");
dofile(scripts_dir.."/resources/functions/format_seconds.lua");
dofile(scripts_dir.."/resources/functions/mkdir.lua");
dofile(scripts_dir.."/resources/functions/copy.lua");
require "resources.functions.base64";
require "resources.functions.trim";
require "resources.functions.file_exists";
require "resources.functions.explode";
require "resources.functions.format_seconds";
require "resources.functions.mkdir";
require "resources.functions.copy";
--voicemail functions
dofile(scripts_dir.."/app/voicemail/resources/functions/on_dtmf.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/get_voicemail_id.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/check_password.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/change_password.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/macro.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/play_greeting.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/record_message.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/record_menu.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/forward_to_extension.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/main_menu.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/listen_to_recording.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/message_waiting.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/send_email.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/delete_recording.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/message_saved.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/return_call.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/menu_messages.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/advanced.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/record_greeting.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/choose_greeting.lua");
dofile(scripts_dir.."/app/voicemail/resources/functions/record_name.lua");
require "app.voicemail.resources.functions.on_dtmf";
require "app.voicemail.resources.functions.get_voicemail_id";
require "app.voicemail.resources.functions.check_password";
require "app.voicemail.resources.functions.change_password";
require "app.voicemail.resources.functions.macro";
require "app.voicemail.resources.functions.play_greeting";
require "app.voicemail.resources.functions.record_message";
require "app.voicemail.resources.functions.record_menu";
require "app.voicemail.resources.functions.forward_to_extension";
require "app.voicemail.resources.functions.main_menu";
require "app.voicemail.resources.functions.listen_to_recording";
require "app.voicemail.resources.functions.message_waiting";
require "app.voicemail.resources.functions.send_email";
require "app.voicemail.resources.functions.delete_recording";
require "app.voicemail.resources.functions.message_saved";
require "app.voicemail.resources.functions.return_call";
require "app.voicemail.resources.functions.menu_messages";
require "app.voicemail.resources.functions.advanced";
require "app.voicemail.resources.functions.record_greeting";
require "app.voicemail.resources.functions.choose_greeting";
require "app.voicemail.resources.functions.record_name";
--send a message waiting event
if (voicemail_action == "mwi") then
@@ -318,7 +318,7 @@
freeswitch.consoleLog("notice", "[voicemail] ".. storage_type .. "\n");
--include the base64 function
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--base64 encode the file
if (file_exists(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext)) then

1
resources/install/scripts/app/voicemail/resources/functions/check_password.lua
View File

@@ -82,4 +82,3 @@
end
end
end
--dofile(scripts_dir.."/app/voicemail/resources/functions/check_password.lua");

2
resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua
View File

@@ -96,7 +96,7 @@
end
status = dbh:query(sql, function(row)
--add functions
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the voicemail message path
greeting_location = voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav"; --vm_message_ext;

2
resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua
View File

@@ -67,7 +67,7 @@
end
status = dbh:query(sql, function(row)
--add functions
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the voicemail message path
message_location = voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext;

2
resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
View File

@@ -52,7 +52,7 @@
end
status = dbh:query(sql, function(row)
--add functions
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the voicemail message path
greeting_location = voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav"; --vm_message_ext;

2
resources/install/scripts/app/voicemail/resources/functions/record_menu.lua
View File

@@ -83,7 +83,7 @@
--if base64, encode file
if (storage_type == "base64") then
--include the base64 function
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--base64 encode the file
local f = io.open(real_file, "rb");
local file_content = f:read("*all");

2
resources/install/scripts/app/voicemail/resources/functions/record_name.lua
View File

@@ -44,7 +44,7 @@
--record and save the file
if (storage_type == "base64") then
--include the base64 function
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the location
voicemail_name_location = voicemail_dir.."/"..voicemail_id.."/recorded_name.wav";

4
resources/install/scripts/app/voicemail/resources/functions/send_email.lua
View File

@@ -52,7 +52,7 @@
--require the email address to send the email
if (string.len(voicemail_mail_to) > 2) then
--include languages file
dofile(scripts_dir.."/app/voicemail/app_languages.lua");
require "app.voicemail.app_languages";
--get voicemail message details
sql = [[SELECT * FROM v_voicemail_messages
@@ -73,7 +73,7 @@
--get the recordings from the database
if (storage_type == "base64") then
--add functions
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the voicemail message path
message_location = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;

17
resources/install/scripts/app/voicemail/resources/scripts/mwi.lua
View File

@@ -24,9 +24,7 @@
-- POSSIBILITY OF SUCH DAMAGE.
--include the lua script
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());
require "resources.functions.config";
--define general settings
sleep = 300;
@@ -41,23 +39,18 @@
--only run the script a single time
runonce = true
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--used to stop the lua service
local file = assert(io.open(run_file, "w"));
file:write("remove this file to stop the script");
--add the trim function
function trim(s)
return s:gsub("^%s+", ""):gsub("%s+$", "")
end
--define the trim function
require "resources.functions.trim";
--check if a file exists
function file_exists(name)
local f=io.open(name,"r")
if f~=nil then io.close(f) return true else return false end
end
require "resources.functions.file_exists";
--create the api object
api = freeswitch.API();

6
resources/install/scripts/app/xml_handler/index.lua
View File

@@ -39,9 +39,9 @@
debug["cache"] = false;
--general functions
dofile(scripts_dir.."/resources/functions/trim.lua");
dofile(scripts_dir.."/resources/functions/file_exists.lua");
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.trim";
require "resources.functions.file_exists";
require "resources.functions.explode";
--if the params class and methods do not exist then add them to prevent errors
if (not params) then

2
resources/install/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
View File

@@ -36,7 +36,7 @@
if (XML_STRING == "-ERR NOT FOUND") or (XML_STRING == "-ERR CONNECTION FAILURE") then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

2
resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
View File

@@ -36,7 +36,7 @@
if (XML_STRING == "-ERR NOT FOUND") or (XML_STRING == "-ERR CONNECTION FAILURE") then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

2
resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
View File

@@ -35,7 +35,7 @@
if (XML_STRING == "-ERR NOT FOUND") then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

2
resources/install/scripts/app/xml_handler/resources/scripts/directory/action/domains.lua
View File

@@ -25,7 +25,7 @@
-- POSSIBILITY OF SUCH DAMAGE.
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

2
resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua
View File

@@ -34,7 +34,7 @@
--set the cache
if (XML_STRING == "-ERR NOT FOUND") then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

2
resources/install/scripts/app/xml_handler/resources/scripts/directory/action/reverse-auth-lookup.lua
View File

@@ -32,7 +32,7 @@
--user_call - user has been called
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly

6
resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
View File

@@ -109,7 +109,7 @@
--database connection
if (continue) then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly
@@ -154,14 +154,14 @@
--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] local_hostname is " .. local_hostname .. "\n");
--add the file_exists function
dofile(scripts_dir.."/resources/functions/file_exists.lua");
require "resources.functions.file_exists";
--connect to the switch database
if (file_exists(database_dir.."/core.db")) then
--dbh_switch = freeswitch.Dbh("core:core"); -- when using sqlite
dbh_switch = freeswitch.Dbh("sqlite://"..database_dir.."/core.db");
else
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh_switch = database_handle('switch');
end

2
resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
View File

@@ -65,7 +65,7 @@
--database connection
if (continue) then
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--exits the script if we didn't connect properly