nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-21 18:36:31 +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

10
resources/install/scripts/intercept_group.lua
View File

@@ -31,15 +31,13 @@
debug["sql"] = false;
--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";
--add the function
dofile(scripts_dir.."/resources/functions/explode.lua");
require "resources.functions.explode";
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--check if the session is ready
@@ -154,7 +152,7 @@
--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
dbh = freeswitch.Dbh("sqlite://"..database_dir.."/core.db");
else
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('switch');
end