# HG changeset patch # User Marco Cirillo # Date 1325959899 0 # Node ID 3cc17ef98be088ac0c1867c50539b54438d8d875 # Parent 84e992f70ba3a0460a5268c7c2199bfbbd8f2888 mod_register_redirect: stick to one code "punctuation" style. diff -r 84e992f70ba3 -r 3cc17ef98be0 mod_register_redirect/mod_register_redirect.lua --- a/mod_register_redirect/mod_register_redirect.lua Sat Jan 07 18:11:03 2012 +0000 +++ b/mod_register_redirect/mod_register_redirect.lua Sat Jan 07 18:11:39 2012 +0000 @@ -5,22 +5,22 @@ -- -- Redirects IP addresses not in the whitelist to a web page or another method to complete the registration. -local st = require "util.stanza"; -local cman = require "core.configmanager"; +local st = require "util.stanza" +local cman = require "core.configmanager" function reg_redirect(event) - local stanza, origin = event.stanza, event.origin; - local ip_wl = module:get_option("registration_whitelist") or { "127.0.0.1" }; - local url = module:get_option_string("registration_url", nil); - local inst_text = module:get_option_string("registration_text", nil); - local oob = module:get_option_boolean("registration_oob", true); - local admins_g = cman.get("*", "core", "admins"); - local admins_l = cman.get(module:get_host(), "core", "admins"); - local no_wl = module:get_option_boolean("no_registration_whitelist", false); - local test_ip = false; + local stanza, origin = event.stanza, event.origin + local ip_wl = module:get_option("registration_whitelist") or { "127.0.0.1" } + local url = module:get_option_string("registration_url", nil) + local inst_text = module:get_option_string("registration_text", nil) + local oob = module:get_option_boolean("registration_oob", true) + local admins_g = cman.get("*", "core", "admins") + local admins_l = cman.get(module:get_host(), "core", "admins") + local no_wl = module:get_option_boolean("no_registration_whitelist", false) + local test_ip = false - if type(admins_g) ~= "table" then admins_g = nil; end - if type(admins_l) ~= "table" then admins_l = nil; end + if type(admins_g) ~= "table" then admins_g = nil end + if type(admins_l) ~= "table" then admins_l = nil end -- perform checks to set default responses and sanity checks. if not inst_text then @@ -36,25 +36,25 @@ module:log("error", "This module supports only http/https, mailto or xmpp as URL formats.") module:log("error", "If you want to use personalized instructions without an Out-Of-Band method,") module:log("error", "specify: register_oob = false; -- in your configuration along your banner string (register_text).") - origin.send(st.error_reply(stanza, "wait", "internal-server-error")); return true -- bouncing request. + origin.send(st.error_reply(stanza, "wait", "internal-server-error")) ; return true -- bouncing request. end else module:log("error", "Please check your configuration, the URL you specified is invalid") - origin.send(st.error_reply(stanza, "wait", "internal-server-error")); return true -- bouncing request. + origin.send(st.error_reply(stanza, "wait", "internal-server-error")) ; return true -- bouncing request. end else if admins_l then - local ajid; for _,v in ipairs(admins_l) do ajid = v; break; end + local ajid; for _,v in ipairs(admins_l) do ajid = v ; break end inst_text = "Please contact "..module:get_host().."'s server administrator via xmpp to register an account on this server at: "..ajid else if admins_g then - local ajid; for _,v in ipairs(admins_g) do ajid = v; break; end + local ajid; for _,v in ipairs(admins_g) do ajid = v ; break end inst_text = "Please contact "..module:get_host().."'s server administrator via xmpp to register an account on this server at: "..ajid else module:log("error", "Please be sure to, _at the very least_, configure one server administrator either global or hostwise...") module:log("error", "if you want to use this module, or read it's configuration wiki at: http://code.google.com/p/prosody-modules/wiki/mod_register_redirect") origin.send(st.error_reply(stanza, "wait", "internal-server-error")) -- bouncing request. - return true; + return true end end end @@ -67,13 +67,13 @@ if not no_wl then for i,ip in ipairs(ip_wl) do - if origin.ip == ip then test_ip = true; end - break; + if origin.ip == ip then test_ip = true end + break end end -- Prepare replies. - local reply = st.reply(event.stanza); + local reply = st.reply(event.stanza) if oob then reply:query("jabber:iq:register") :tag("instructions"):text(inst_text):up() @@ -85,12 +85,12 @@ end if stanza.attr.type == "get" then - origin.send(reply); - return true; + origin.send(reply) + return true else origin.send(st.error_reply(stanza, "cancel", "not-authorized")) return true end end -module:hook("stanza/iq/jabber:iq:register:query", reg_redirect, 10); +module:hook("stanza/iq/jabber:iq:register:query", reg_redirect, 10)