Monster whitespace commit (beware the whitespace monster).

core/certmanager.lua

@@ -69,8 +69,8 @@ function create_context(host, mode, config)
 		else
 			log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
 		end
-        end
-        return ctx, err;
+	end
+	return ctx, err;
 end
 
 function reload_ssl_config()

core/s2smanager.lua

@@ -16,10 +16,8 @@ local socket = require "socket";
 local format = string.format;
 local t_insert, t_sort = table.insert, table.sort;
 local get_traceback = debug.traceback;
-local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber,
-      setmetatable
-    = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber,
-      setmetatable;
+local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable
+    = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable;
 
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 local connlisteners_get = require "net.connlisteners".get;

core/usermanager.lua

@@ -50,11 +50,11 @@ function initialize_host(host)
 			host_session.users = new_null_provider();
 		end
 	end);
-   	host_session.users = new_null_provider(); -- Start with the default usermanager provider
-   	local auth_provider = config.get(host, "core", "authentication") or default_provider;
-   	if auth_provider ~= "null" then
-   		modulemanager.load(host, "auth_"..auth_provider);
-   	end
+	host_session.users = new_null_provider(); -- Start with the default usermanager provider
+	local auth_provider = config.get(host, "core", "authentication") or default_provider;
+	if auth_provider ~= "null" then
+		modulemanager.load(host, "auth_"..auth_provider);
+	end
 end;
 prosody.events.add_handler("host-activated", initialize_host, 100);
 prosody.events.add_handler("component-activated", initialize_host, 100);

net/connlisteners.lua

@@ -14,7 +14,7 @@ local log = require "util.logger".init("connlisteners");
 local tostring = tostring;
 
 local dofile, pcall, error =
-	dofile, pcall, error
+      dofile, pcall, error
 
 module "connlisteners"
 

net/dns.lua

@@ -674,11 +674,11 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
 		retry  = socket.gettime() + self.delays[1]
 	};
 
-  -- remember the query
+	-- remember the query
 	self.active[id] = self.active[id] or {};
 	self.active[id][question] = o;
 
-  -- remember which coroutine wants the answer
+	-- remember which coroutine wants the answer
 	local co = coroutine.running();
 	if co then
 		set(self.wanted, qclass, qtype, qname, co, true);
@@ -887,12 +887,12 @@ end
 function resolver:lookup(qname, qtype, qclass)    -- - - - - - - - - -  lookup
 	self:query (qname, qtype, qclass)
 	while self:pulse() do
-           local recvt = {}
-           for i, s in ipairs(self.socket) do
-              recvt[i] = s
-           end
-           socket.select(recvt, nil, 4)
-        end
+		local recvt = {}
+		for i, s in ipairs(self.socket) do
+			recvt[i] = s
+		end
+		socket.select(recvt, nil, 4)
+	end
 	--print(self.cache);
 	return self:peek(qname, qtype, qclass);
 end

net/http.lua

@@ -19,7 +19,7 @@ local listener = connlisteners_get("httpclient") or error("No httpclient listene
 local t_insert, t_concat = table.insert, table.concat;
 local pairs, ipairs = pairs, ipairs;
 local tonumber, tostring, xpcall, select, debug_traceback, char, format =
-        tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format;
+      tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format;
 
 local log = require "util.logger".init("http");
 
@@ -46,10 +46,10 @@ function formencode(form)
 end
 
 local function expectbody(reqt, code)
-    if reqt.method == "HEAD" then return nil end
-    if code == 204 or code == 304 or code == 301 then return nil end
-    if code >= 100 and code < 200 then return nil end
-    return 1
+	if reqt.method == "HEAD" then return nil end
+	if code == 204 or code == 304 or code == 301 then return nil end
+	if code >= 100 and code < 200 then return nil end
+	return 1
 end
 
 local function request_reader(request, data, startpos)

net/httpserver.lua

@@ -31,7 +31,7 @@ module "httpserver"
 local default_handler;
 
 local function expectbody(reqt)
-    return reqt.method == "POST";
+	return reqt.method == "POST";
 end
 
 local function send_response(request, response)

plugins/mod_offline.lua

@@ -35,20 +35,20 @@ end);
 module:hook("message/offline/broadcast", function(event)
 	local origin = event.origin;
 
-        if origin.priority >= 0 then
-          local node, host = origin.username, origin.host;
+	if origin.priority >= 0 then
+		local node, host = origin.username, origin.host;
 
-          local data = datamanager.list_load(node, host, "offline");
-          if not data then return true; end
-          for _, stanza in ipairs(data) do
-                  stanza = st.deserialize(stanza);
-                  stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = host, stamp = stanza.attr.stamp}):up(); -- XEP-0203
-                  stanza:tag("x", {xmlns = "jabber:x:delay", from = host, stamp = stanza.attr.stamp_legacy}):up(); -- XEP-0091 (deprecated)
-                  stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
-                  origin.send(stanza);
-          end
-          return true;
-        end
+		local data = datamanager.list_load(node, host, "offline");
+		if not data then return true; end
+		for _, stanza in ipairs(data) do
+			stanza = st.deserialize(stanza);
+			stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = host, stamp = stanza.attr.stamp}):up(); -- XEP-0203
+			stanza:tag("x", {xmlns = "jabber:x:delay", from = host, stamp = stanza.attr.stamp_legacy}):up(); -- XEP-0091 (deprecated)
+			stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
+			origin.send(stanza);
+		end
+		return true;
+	end
 end);
 
 module:hook("message/offline/delete", function(event)

plugins/mod_posix.lua

@@ -111,7 +111,7 @@ local function write_pidfile()
 	end
 end
 
-local syslog_opened 
+local syslog_opened;
 function syslog_sink_maker(config)
 	if not syslog_opened then
 		pposix.syslog_open("prosody");
@@ -119,12 +119,12 @@ function syslog_sink_maker(config)
 	end
 	local syslog, format = pposix.syslog_log, string.format;
 	return function (name, level, message, ...)
-			if ... then
-				syslog(level, format(message, ...));
-			else
-				syslog(level, message);
-			end
-		end;
+		if ... then
+			syslog(level, format(message, ...));
+		else
+			syslog(level, message);
+		end
+	end;
 end
 require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
 

plugins/mod_presence.lua

@@ -59,15 +59,15 @@ function handle_normal_presence(origin, stanza)
 			priority[1] = "0";
 		end
 	end
-        local priority = stanza:child_with_name("priority");
-        if priority and #priority > 0 then
-                priority = t_concat(priority);
-                if s_find(priority, "^[+-]?[0-9]+$") then
-                        priority = tonumber(priority);
-                        if priority < -128 then priority = -128 end
-                        if priority > 127 then priority = 127 end
-                else priority = 0; end
-        else priority = 0; end
+	local priority = stanza:child_with_name("priority");
+	if priority and #priority > 0 then
+		priority = t_concat(priority);
+		if s_find(priority, "^[+-]?[0-9]+$") then
+			priority = tonumber(priority);
+			if priority < -128 then priority = -128 end
+			if priority > 127 then priority = 127 end
+		else priority = 0; end
+	else priority = 0; end
 	if full_sessions[origin.full_jid] then -- if user is still connected
 		origin.send(stanza); -- reflect their presence back to them
 	end
@@ -115,15 +115,15 @@ function handle_normal_presence(origin, stanza)
 			end
 		end
 
-                if priority >= 0 then
-                        local offline = offlinemanager.load(node, host);
-                        if offline then
-                                for _, msg in ipairs(offline) do
-                                        origin.send(msg); -- FIXME do we need to modify to/from in any way?
-                                end
-                                offlinemanager.deleteAll(node, host);
-                        end
-                end
+		if priority >= 0 then
+			local offline = offlinemanager.load(node, host);
+			if offline then
+				for _, msg in ipairs(offline) do
+					origin.send(msg); -- FIXME do we need to modify to/from in any way?
+				end
+				offlinemanager.deleteAll(node, host);
+			end
+		end
 	end
 	if stanza.attr.type == "unavailable" then
 		origin.presence = nil;

plugins/muc/muc.lib.lua

@@ -588,8 +588,8 @@ function room_mt:send_form(origin, stanza)
 end
 
 local valid_whois = {
-    moderators = true,
-    anyone = true,
+	moderators = true,
+	anyone = true,
 }
 
 function room_mt:process_form(origin, stanza)

tests/test_sasl.lua

@@ -13,25 +13,25 @@
 -- Please be careful :(  (I recommend Scite)
 ---------------------------------
 
-local	gmatch = string.gmatch;
-local	t_concat, t_insert = table.concat, table.insert;
-local	to_byte, to_char = string.byte, string.char;
+local gmatch = string.gmatch;
+local t_concat, t_insert = table.concat, table.insert;
+local to_byte, to_char = string.byte, string.char;
 
 local function _latin1toutf8(str)
-		if not str then return str; end
-                local p = {};
-                for ch in gmatch(str, ".") do
-                        ch = to_byte(ch);
-                        if (ch < 0x80) then
-                                t_insert(p, to_char(ch));
-                        elseif (ch < 0xC0) then
-                                t_insert(p, to_char(0xC2, ch));
-                        else
-                                t_insert(p, to_char(0xC3, ch - 64));
-                        end
-                end
-                return t_concat(p);
-        end
+	if not str then return str; end
+	local p = {};
+	for ch in gmatch(str, ".") do
+		ch = to_byte(ch);
+		if (ch < 0x80) then
+			t_insert(p, to_char(ch));
+		elseif (ch < 0xC0) then
+			t_insert(p, to_char(0xC2, ch));
+		else
+			t_insert(p, to_char(0xC3, ch - 64));
+		end
+	end
+	return t_concat(p);
+end
 
 function latin1toutf8()
 	local function assert_utf8(latin, utf8)

tools/xep227toprosody.lua

@@ -114,7 +114,7 @@ function store_offline_messages(username, host, offline_messages)
 		--print("message :"..ch:pretty_print());
 		local ret, err = dm.list_append(username, host, "offline", st.preserialize(ch));
 		print("["..(err or "success").."] stored offline message: " ..username.."@"..host.." - "..ch.attr.from);
- 	end
+	end
 end
 
 

util/array.lua

@@ -7,7 +7,7 @@
 --
 
 local t_insert, t_sort, t_remove, t_concat
-	= table.insert, table.sort, table.remove, table.concat;
+    = table.insert, table.sort, table.remove, table.concat;
 
 local array = {};
 local array_base = {};

util/broadcast.lua

@@ -8,7 +8,7 @@
 
 
 local ipairs, pairs, setmetatable, type =
-        ipairs, pairs, setmetatable, type;
+      ipairs, pairs, setmetatable, type;
 
 module "pubsub"
 

util/hmac.lua

@@ -40,7 +40,7 @@ hash
 blocksize
 	the blocksize for the hash function in bytes
 hex
-  return raw hash or hexadecimal string
+	return raw hash or hexadecimal string
 --]]
 function hmac(key, message, hash, blocksize, hex)
 	if #key > blocksize then