diff options
| -rw-r--r-- | plugins/mod_register.lua | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index ad0ba478..fb001392 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -1,6 +1,5 @@ local st = require "util.stanza"; -local send = require "core.sessionmanager".send_to_session; local usermanager_user_exists = require "core.usermanager".user_exists; local usermanager_create_user = require "core.usermanager".create_user; @@ -13,11 +12,11 @@ add_iq_handler("c2s", "jabber:iq:register", function (session, stanza) :tag("registered"):up() :tag("username"):text(session.username):up() :tag("password"):up(); - send(session, reply); + session.send(reply); elseif stanza.attr.type == "set" then if query.tags[1] and query.tags[1].name == "remove" then -- TODO delete user auth data, send iq response, kick all user resources with a <not-authorized/>, delete all user data - send(session, st.error_reply(stanza, "cancel", "not-allowed")); + session.send(st.error_reply(stanza, "cancel", "not-allowed")); else local username = query:child_with_name("username"); local password = query:child_with_name("password"); @@ -27,21 +26,21 @@ add_iq_handler("c2s", "jabber:iq:register", function (session, stanza) password = table.concat(password); if username == session.username then if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way? - send(session, st.reply(stanza)); + session.send(st.reply(stanza)); else -- TODO unable to write file, file may be locked, etc, what's the correct error? - send(session, st.error_reply(stanza, "wait", "internal-server-error")); + session.send(st.error_reply(stanza, "wait", "internal-server-error")); end else - send(session, st.error_reply(stanza, "modify", "bad-request")); + session.send(st.error_reply(stanza, "modify", "bad-request")); end else - send(session, st.error_reply(stanza, "modify", "bad-request")); + session.send(st.error_reply(stanza, "modify", "bad-request")); end end end else - send(session, st.error_reply(stanza, "cancel", "service-unavailable")); + session.send(st.error_reply(stanza, "cancel", "service-unavailable")); end; end); @@ -54,10 +53,10 @@ add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, stanza) :tag("instructions"):text("Choose a username and password for use with this service."):up() :tag("username"):up() :tag("password"):up(); - send(session, reply); + session.send(reply); elseif stanza.attr.type == "set" then if query.tags[1] and query.tags[1].name == "remove" then - send(session, st.error_reply(stanza, "auth", "registration-required")); + session.send(st.error_reply(stanza, "auth", "registration-required")); else local username = query:child_with_name("username"); local password = query:child_with_name("password"); @@ -66,21 +65,21 @@ add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, stanza) username = table.concat(username); password = table.concat(password); if usermanager_user_exists(username, session.host) then - send(session, st.error_reply(stanza, "cancel", "conflict")); + session.send(st.error_reply(stanza, "cancel", "conflict")); else if usermanager_create_user(username, password, session.host) then - send(session, st.reply(stanza)); -- user created! + session.send(st.reply(stanza)); -- user created! else -- TODO unable to write file, file may be locked, etc, what's the correct error? - send(session, st.error_reply(stanza, "wait", "internal-server-error")); + session.send(st.error_reply(stanza, "wait", "internal-server-error")); end end else - send(session, st.error_reply(stanza, "modify", "not-acceptable")); + session.send(st.error_reply(stanza, "modify", "not-acceptable")); end end end else - send(session, st.error_reply(stanza, "cancel", "service-unavailable")); + session.send(st.error_reply(stanza, "cancel", "service-unavailable")); end; end); |