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

Merge pull request #1053 from moteus/require_config

Browse Source 
Change. Use `require "resources.functions.config"` to load config file.
This commit is contained in:
FusionPBX
2015-08-10 11:31:35 -06:00
parent f1e8e1c366 d8b2ec5271
commit 559aa61fbd
69 changed files with 294 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/app/conference_center/index.lua
+8 -8
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