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/voicemail/index.lua
+31 -31
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
resources/install/scripts/app/voicemail/resources/functions/check_password.lua
-1
View File
@@ -82,4 +82,3 @@
end
end
end
--dofile(scripts_dir.."/app/voicemail/resources/functions/check_password.lua");
resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua
+1 -1
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;
resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua
+1 -1
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;
resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua
+1 -1
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;
resources/install/scripts/app/voicemail/resources/functions/record_menu.lua
+1 -1
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");
resources/install/scripts/app/voicemail/resources/functions/record_name.lua
+1 -1
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";
resources/install/scripts/app/voicemail/resources/functions/send_email.lua
+2 -2
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;
resources/install/scripts/app/voicemail/resources/scripts/mwi.lua
+5 -12
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();