Fri, 02 Oct 2009 17:07:18 +0500
mod_register: Added helpful text to registration error responses.
plugins/mod_register.lua | file | annotate | diff | comparison | revisions |
--- a/plugins/mod_register.lua Fri Oct 02 16:52:50 2009 +0500 +++ b/plugins/mod_register.lua Fri Oct 02 17:07:18 2009 +0500 @@ -119,13 +119,12 @@ if username and password then -- Check that the user is not blacklisted or registering too often if blacklisted_ips[session.ip] or (whitelist_only and not whitelisted_ips[session.ip]) then - session.send(st.error_reply(stanza, "cancel", "not-acceptable")); - return; + session.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not allowed to register an account.")); + return; elseif min_seconds_between_registrations and not whitelisted_ips[session.ip] then if not recent_ips[session.ip] then recent_ips[session.ip] = { time = os_time(), count = 1 }; else - local ip = recent_ips[session.ip]; ip.count = ip.count + 1; @@ -142,9 +141,9 @@ password = table.concat(password); local host = module.host; if not username then - session.send(st.error_reply(stanza, "modify", "not-acceptable")); + session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid.")); elseif usermanager_user_exists(username, host) then - session.send(st.error_reply(stanza, "cancel", "conflict")); + session.send(st.error_reply(stanza, "cancel", "conflict", "The requested username already exists.")); else if usermanager_create_user(username, password, host) then session.send(st.reply(stanza)); -- user created! @@ -154,7 +153,7 @@ 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")); + session.send(st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk.")); end end else