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

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

View File

@@ -32,10 +32,12 @@
debug["tries"] = false;
--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());
--connect to the database
require "resources.functions.database_handle";
dofile(scripts_dir.."/resources/functions/database_handle.lua");
dbh = database_handle('system');
--get the variables
@@ -47,7 +49,7 @@
domain_uuid = session:getVariable("domain_uuid");
--settings
require "resources.functions.settings";
dofile(scripts_dir.."/resources/functions/settings.lua");
settings = settings(domain_uuid);
storage_type = "";
storage_path = "";
@@ -84,11 +86,16 @@
--set default variable(s)
tries = 0;
--define the trim function
require "resources.functions.trim"
--add the trim function
function trim(s)
return s:gsub("^%s+", ""):gsub("%s+$", "")
end
--check if a file exists
require "resources.functions.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
--prepare the api object
api = freeswitch.API();
@@ -212,7 +219,7 @@
end
status = dbh:query(sql, function(row)
--add functions
require "resources.functions.base64";
dofile(scripts_dir.."/resources/functions/base64.lua");
--add the path to filename
ivr_menu_greet_long = recordings_dir.."/"..greet_long_file_name;
ivr_menu_greet_long_is_base64 = true;
@@ -236,7 +243,7 @@
end
status = dbh:query(sql, function(row)
--add functions
require "resources.functions.base64";
dofile(scripts_dir.."/resources/functions/base64.lua");
--add the path to filename
ivr_menu_greet_short = recordings_dir.."/"..greet_short_file_name;
ivr_menu_greet_short_is_base64 = true;
@@ -260,7 +267,7 @@
end
status = dbh:query(sql, function(row)
--add functions
require "resources.functions.base64";
dofile(scripts_dir.."/resources/functions/base64.lua");
--add the path to filename
ivr_menu_invalid_sound = recordings_dir.."/"..invalid_sound_file_name;
ivr_menu_invalid_sound_is_base64 = true;
@@ -284,7 +291,7 @@
end
status = dbh:query(sql, function(row)
--add functions
require "resources.functions.base64";
dofile(scripts_dir.."/resources/functions/base64.lua");
--add the path to filename
ivr_menu_exit_sound = recordings_dir.."/"..exit_sound_file_name;
ivr_menu_exit_sound_is_base64 = true;