nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-18 22:48:28 +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 f5d62c678f
commit 69717e31d5
69 changed files with 294 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
resources/install/scripts/directory.lua
View File

@@ -34,21 +34,14 @@
search_count = 0;
--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());
--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";
--connect to the database
dofile(scripts_dir.."/resources/functions/database_handle.lua");
require "resources.functions.database_handle";
dbh = database_handle('system');
--settings
dofile(scripts_dir.."/resources/functions/settings.lua");
require "resources.functions.settings";
settings = settings(domain_uuid);
storage_type = "";
storage_path = "";
@@ -158,16 +151,8 @@
end
end
--define explode
function explode ( seperator, str )
local pos, arr = 0, {}
for st, sp in function() return string.find( str, seperator, pos, true ) end do -- for each divider found
table.insert( arr, string.sub( str, pos, st-1 ) ) -- attach chars left of current divider
pos = sp + 1 -- jump past current divider
end
table.insert( arr, string.sub( str, pos ) ) -- attach chars right of last divider
return arr
end
--define the explode function
require "resources.functions.explode"
--define a function to convert dialpad letters to numbers
function dialpad_to_digit(letter)
@@ -200,16 +185,11 @@
return count
end
--define trim
function trim (s)
return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
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"
--define select_entry function
function select_entry()
@@ -268,7 +248,7 @@
end
status = dbh:query(sql, function(field)
--add functions
dofile(scripts_dir.."/resources/functions/base64.lua");
require "resources.functions.base64";
--set the voicemail message path
file_location = voicemail_dir.."/"..row.extension.."/recorded_name.wav";