diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-08-18 13:03:35 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-08-18 13:03:35 +0100 |
| commit | 4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7 (patch) | |
| tree | b70a070f34bd849d2e53290b5c9c4354758ed84c /plugins/mod_register.lua | |
| parent | b5d5ab2446bacedb0ba7e4509f6ea45426b8bc5a (diff) | |
| parent | dae72952d261b285282add61ba0ea9be9cdaa22a (diff) | |
| download | prosody-4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7.tar.gz prosody-4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7.zip | |
Merge waqas with Tobias. Eww.
Diffstat (limited to 'plugins/mod_register.lua')
| -rw-r--r-- | plugins/mod_register.lua | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index 383ab811..0cb8d771 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -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; @@ -90,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]; |