util.pposix: Compatibility with Solaris systems (thanks Filip)

[prosody.git] / plugins / mod_register.lua

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 14c00767a30c35ce0ed2a82d6028957bcd605ddc..0cb8d7715c4ac58fbbfa02bc5a539ad0f8752c1e 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -9,7 +9,6 @@
 
 local hosts = _G.hosts;
 local st = require "util.stanza";
-local config = require "core.configmanager";
 local datamanager = require "util.datamanager";
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
@@ -60,6 +59,8 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        end
                                end
                                datamanager.store(username, host, "accounts", nil); -- delete accounts datastore at the end
+                               module:log("info", "User removed their account: %s@%s", username, host);
+                               module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });
                        else
                                local username = query:child_with_name("username");
                                local password = query:child_with_name("password");
@@ -88,16 +89,16 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
 end);
 
 local recent_ips = {};
-local min_seconds_between_registrations = config.get(module.host, "core", "min_seconds_between_registrations");
-local whitelist_only = config.get(module.host, "core", "whitelist_registration_only");
-local whitelisted_ips = config.get(module.host, "core", "registration_whitelist") or { "127.0.0.1" };
-local blacklisted_ips = config.get(module.host, "core", "registration_blacklist") or {};
+local min_seconds_between_registrations = module:get_option("min_seconds_between_registrations");
+local whitelist_only = module:get_option("whitelist_registration_only");
+local whitelisted_ips = module:get_option("registration_whitelist") or { "127.0.0.1" };
+local blacklisted_ips = module:get_option("registration_blacklist") or {};
 
 for _, ip in ipairs(whitelisted_ips) do whitelisted_ips[ip] = true; end
 for _, ip in ipairs(blacklisted_ips) do blacklisted_ips[ip] = true; end
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, stanza)
-       if config.get(module.host, "core", "allow_registration") == false then
+       if module:get_option("allow_registration") == false then
                session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
        elseif stanza.tags[1].name == "query" then
                local query = stanza.tags[1];
@@ -143,6 +144,10 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
                                        else
                                                if usermanager_create_user(username, password, session.host) then
                                                        session.send(st.reply(stanza)); -- user created!
+                                                       module:log("info", "User account created: %s@%s", username, session.host);
+                                                       module:fire_event("user-registered", { 
+                                                               username = username, host = session.host, source = "mod_register",
+                                                               session = session });
                                                else
                                                        -- TODO unable to write file, file may be locked, etc, what's the correct error?
                                                        session.send(st.error_reply(stanza, "wait", "internal-server-error"));