Merge pull request #1053 from moteus/require_config

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

resources/install/scripts/resources/functions/base64.lua

@@ -6,7 +6,7 @@ function base64.encode(s)
 		local mime = require("mime");
 		return (mime.b64(s));
 	else
-		dofile(scripts_dir.."/resources/functions/base64_alex.lua");
+		require "resources.functions.base64_alex";
 		return base64.enc(s);
 	end
 end
@@ -17,7 +17,7 @@ function base64.decode(s)
 		local mime = require("mime");
 		return (mime.unb64(s));
 	else
-		dofile(scripts_dir.."/resources/functions/base64_alex.lua");
+		require "resources.functions.base64_alex";
 		return base64.dec(s);
 	end
 end

resources/install/scripts/resources/functions/config.lua

@@ -1,12 +1,26 @@
 
+-- add file_exists function
+	require "resources.functions.file_exists";
+
 --find and return path to the config.lua
 	function config()
-		dofile(scripts_dir.."/resources/functions/file_exists.lua");
 		if (file_exists("/etc/fusionpbx/config.lua")) then
 			return "/etc/fusionpbx/config.lua";
 		elseif (file_exists("/usr/local/etc/fusionpbx/config.lua")) then
 			return "/usr/local/etc/fusionpbx/config.lua";
 		else
-			return scripts_dir.."/resources/config.lua";
+			return "resources.config";
 		end
-	end
+	end
+
+-- load config
+	function load_config()
+		local cfg = config()
+		if cfg:sub(1,1) == '//' then
+			dofile(cfg)
+		else
+			require(cfg)
+		end
+	end
+
+	load_config()

resources/install/scripts/resources/functions/count.lua

@@ -0,0 +1,9 @@
+
+--array count
+	function count(t)
+		local c = 0;
+		for k in pairs(t) do
+			c = c + 1;
+		end
+		return c;
+	end

resources/install/scripts/resources/functions/settings.lua

@@ -2,10 +2,8 @@
 --debug
 	debug["sql"] = false;
 
---define trim
-	function trim (s)
-		return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
-	end
+--define the trim function
+	require "resources.functions.trim";
 
 --get the domain_uuid
 	if (domain_uuid == nil) then