X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_watchregistrations.lua;h=b7be5daf8e8a945aa29de64e82b57d762a089a7f;hb=5ebefe6547a3d845f9b12e4847ccec316b81c9da;hp=6a2af8532cc8f20abddb18a6d9a466eba87f9ce0;hpb=1fcbec749479d8e6f4be2c336e3711fe3d191bde;p=prosody.git

diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua
index 6a2af853..b7be5daf 100644
--- a/plugins/mod_watchregistrations.lua
+++ b/plugins/mod_watchregistrations.lua
@@ -1,32 +1,30 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
--- 
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
 local host = module:get_host();
+local jid_prep = require "util.jid".prep;
 
-local registration_watchers = module:get_option("registration_watchers") 
-	or module:get_option("admins") or {};
-
-local registration_alert = module:get_option("registration_notification") or "User $username just registered on $host from $ip";
+local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
+local registration_notification = module:get_option("registration_notification", "User $username just registered on $host from $ip");
 
 local st = require "util.stanza";
 
-module:hook("user-registered",
-	function (user)
-		module:log("debug", "Notifying of new registration");
-		local message = st.message{ type = "chat", from = host }
-					:tag("body")
-					:text(registration_alert:gsub("%$(%w+)", 
-						function (v) return user[v] or user.session and user.session[v] or nil; end));
-		
-		for _, jid in ipairs(registration_watchers) do
-			module:log("debug", "Notifying %s", jid);
-			message.attr.to = jid;
-			core_route_stanza(hosts[host], message);
-		end
-	end);
+module:hook("user-registered", function (user)
+	module:log("debug", "Notifying of new registration");
+	local message = st.message{ type = "chat", from = host }
+		:tag("body")
+			:text(registration_notification:gsub("%$(%w+)", function (v)
+				return user[v] or user.session and user.session[v] or nil;
+			end));
+	for jid in registration_watchers do
+		module:log("debug", "Notifying %s", jid);
+		message.attr.to = jid;
+		module:send(message);
+	end
+end);