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

Revert "Revert "Change. Use require "resources.functions.config" to load co…"

Browse Source
This commit is contained in:
Alexey Melnichuk
2015-08-11 05:06:33 +03:00
parent 1615de1358
commit 3e16e69adb
69 changed files with 294 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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];