Make the lua scripts that use config.lua to use the new config function.

includes/install/scripts/app.lua

@@ -25,7 +25,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --get the argv values
 	script_name = argv[0];

includes/install/scripts/app/voicemail/resources/scripts/mwi.lua

@@ -25,7 +25,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --define general settings
 	tmp_file = "/usr/local/freeswitch/log/mwi.tmp";

includes/install/scripts/app/xml_handler/index.lua

@@ -30,9 +30,9 @@
 	expire["sofia.conf"] = "3600";
 
 --set the debug options
-	debug["params"] = true;
+	debug["params"] = false;
 	debug["sql"] = false;
-	debug["xml_request"] = true;
+	debug["xml_request"] = false;
 	debug["xml_string"] = false;
 	debug["cache"] = false;
 

includes/install/scripts/call_flow.lua

@@ -30,7 +30,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

includes/install/scripts/call_flow_monitor.lua

@@ -33,7 +33,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --general functions
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");

includes/install/scripts/destination_caller_id.lua

@@ -26,7 +26,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

includes/install/scripts/dial_string.lua

@@ -34,7 +34,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

includes/install/scripts/directory.lua

@@ -39,7 +39,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

includes/install/scripts/eavesdrop.lua

@@ -29,7 +29,8 @@ extension = argv[1];
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --add the file_exists function
 	dofile(scripts_dir.."/resources/functions/file_exists.lua");

includes/install/scripts/intercept.lua

@@ -32,7 +32,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	if (file_exists(database_dir.."/core.db") then

includes/install/scripts/ivr_menu.lua

@@ -33,7 +33,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");

includes/install/scripts/park.lua

@@ -16,7 +16,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite

includes/install/scripts/park_monitor.lua

@@ -30,7 +30,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite

includes/install/scripts/ring_group.lua

@@ -26,7 +26,8 @@
 
 --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/config.lua");
+	dofile(scripts_dir.."/resources/functions/config.lua");
+	dofile(config());
 
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");