Changeset

--- a/core/discomanager.lua	Thu Jul 09 23:01:13 2009 +0100
+++ b/core/discomanager.lua	Thu Jul 09 23:06:11 2009 +0100
@@ -7,60 +7,60 @@
 --
 
 
-
-local helper = require "util.discohelper".new();
-local hosts = hosts;
-local jid_split = require "util.jid".split;
-local jid_bare = require "util.jid".bare;
-local usermanager_user_exists = require "core.usermanager".user_exists;
-local rostermanager_is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
-local print = print;
-
-do
-	helper:addDiscoInfoHandler("*host", function(reply, to, from, node)
-		if hosts[to] then
-			reply:tag("identity", {category="server", type="im", name="Prosody"}):up();
-			return true;
-		end
-	end);
-	helper:addDiscoInfoHandler("*node", function(reply, to, from, node)
-		local node, host = jid_split(to);
-		if hosts[host] and rostermanager_is_contact_subscribed(node, host, jid_bare(from)) then
-			reply:tag("identity", {category="account", type="registered"}):up();
-			return true;
-		end
-	end);
+
+local helper = require "util.discohelper".new();
+local hosts = hosts;
+local jid_split = require "util.jid".split;
+local jid_bare = require "util.jid".bare;
+local usermanager_user_exists = require "core.usermanager".user_exists;
+local rostermanager_is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
+local print = print;
+
+do
+	helper:addDiscoInfoHandler("*host", function(reply, to, from, node)
+		if hosts[to] then
+			reply:tag("identity", {category="server", type="im", name="Prosody"}):up();
+			return true;
+		end
+	end);
+	helper:addDiscoInfoHandler("*node", function(reply, to, from, node)
+		local node, host = jid_split(to);
+		if hosts[host] and rostermanager_is_contact_subscribed(node, host, jid_bare(from)) then
+			reply:tag("identity", {category="account", type="registered"}):up();
+			return true;
+		end
+	end);
 	helper:addDiscoItemsHandler("*host", function(reply, to, from, node)
 		if hosts[to] and hosts[to].type == "local" then
 			return true;
 		end
 	end);
-end
-
-module "discomanager"
-
-function handle(stanza)
-	return helper:handle(stanza);
-end
-
-function addDiscoItemsHandler(jid, func)
-	return helper:addDiscoItemsHandler(jid, func);
-end
-
-function addDiscoInfoHandler(jid, func)
-	return helper:addDiscoInfoHandler(jid, func);
-end
-
-function set(plugin, var, origin)
-	-- TODO handle origin and host based on plugin.
-	local handler = function(reply, to, from, node) -- service discovery
-		if #node == 0 then
-			reply:tag("feature", {var = var}):up();
-			return true;
-		end
-	end
-	addDiscoInfoHandler("*node", handler);
-	addDiscoInfoHandler("*host", handler);
-end
-
-return _M;
+end
+
+module "discomanager"
+
+function handle(stanza)
+	return helper:handle(stanza);
+end
+
+function addDiscoItemsHandler(jid, func)
+	return helper:addDiscoItemsHandler(jid, func);
+end
+
+function addDiscoInfoHandler(jid, func)
+	return helper:addDiscoInfoHandler(jid, func);
+end
+
+function set(plugin, var, origin)
+	-- TODO handle origin and host based on plugin.
+	local handler = function(reply, to, from, node) -- service discovery
+		if #node == 0 then
+			reply:tag("feature", {var = var}):up();
+			return true;
+		end
+	end
+	addDiscoInfoHandler("*node", handler);
+	addDiscoInfoHandler("*host", handler);
+end
+
+return _M;