Merge 0.10->trunk

4 files changed, 20 insertions, 11 deletions

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 7333fe47..122f550a 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -26,7 +26,7 @@ local prosody = _G.prosody;
 
 module:set_global(); -- we're a global module
 
-local umask = module:get_option("umask") or "027";
+local umask = module:get_option_string("umask", "027");
 pposix.umask(umask);
 
 -- Allow switching away from root, some people like strange ports.
diff --git a/prosody b/prosody
index ade85f80..fb20bc49 100755
--- a/prosody
+++ b/prosody
@@ -125,12 +125,17 @@ function check_dependencies()
 	end
 end
 
+-- luacheck: globals socket server
+
 function load_libraries()
 	-- Load socket framework
 	socket = require "socket";
 	server = require "net.server"
 end	
 
+-- The global log() gets defined by loggingmanager
+-- luacheck: ignore 113/log
+
 function init_logging()
 	-- Initialize logging
 	require "core.loggingmanager"
@@ -156,6 +161,7 @@ end
 function sandbox_require()
 	-- Replace require() with one that doesn't pollute _G, required
 	-- for neat sandboxing of modules
+	-- luacheck: ignore 113/getfenv 111/require
 	local _realG = _G;
 	local _real_require = require;
 	local getfenv = getfenv or function (f)
@@ -172,7 +178,7 @@ function sandbox_require()
 		if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
 			local old_newindex, old_index;
 			old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
-			old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k)
+			old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k) -- luacheck: ignore 212/_G
 				return rawget(curr_env, k);
 			end;
 			local ret = _real_require(...);
@@ -212,14 +218,15 @@ function set_function_metatable()
 end
 
 function init_global_state()
-	-- COMPAT: These globals are deprecated
-	bare_sessions = {};
-	full_sessions = {};
-	hosts = {};
+	prosody.bare_sessions = {};
+	prosody.full_sessions = {};
+	prosody.hosts = {};
 
-	prosody.bare_sessions = bare_sessions;
-	prosody.full_sessions = full_sessions;
-	prosody.hosts = hosts;
+	-- COMPAT: These globals are deprecated
+	-- luacheck: ignore 111/bare_sessions 111/full_sessions 111/hosts
+	bare_sessions = prosody.bare_sessions;
+	full_sessions = prosody.full_sessions;
+	hosts = prosody.hosts;
 	
 	local data_path = config.get("*", "data_path") or CFG_DATADIR or "data";
 	local custom_plugin_paths = config.get("*", "plugin_paths");
@@ -349,6 +356,7 @@ end
 
 function init_global_protection()
 	-- Catch global accesses
+	-- luacheck: ignore 212/t
 	local locked_globals_mt = {
 		__index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end;
 		__newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end;
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 2884b942..585bb83d 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -50,10 +50,10 @@ local _ENV = nil;
 ---- utils -----
 local encode, decode;
 do
-	local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
+	local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber(k, 16)); return t[k]; end });
 
 	decode = function (s)
-		return s and (s:gsub("+", " "):gsub("%%([a-fA-F0-9][a-fA-F0-9])", urlcodes));
+		return s and (s:gsub("%%(%x%x)", urlcodes));
 	end
 
 	encode = function (s)
diff --git a/util/envload.lua b/util/envload.lua
index 53e28348..3c5190df 100644
--- a/util/envload.lua
+++ b/util/envload.lua
@@ -4,6 +4,7 @@
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
+-- luacheck: ignore 113/setfenv
 
 local load, loadstring, loadfile, setfenv = load, loadstring, loadfile, setfenv;
 local envload;