# HG changeset patch # User bsw # Date 1366822335 -7200 # Node ID 130eed8f7a79d07422b4cc61a1a427bcabe87847 # Parent e7e6856aa31a93d9055e93e7d993740d5cb84ed5 send_login action reviewed, debug code removed diff -r e7e6856aa31a -r 130eed8f7a79 app/main/index/_action/send_login.lua --- a/app/main/index/_action/send_login.lua Sat Apr 20 20:54:42 2013 +0200 +++ b/app/main/index/_action/send_login.lua Wed Apr 24 18:52:15 2013 +0200 @@ -1,4 +1,4 @@ ---trace.disable() +trace.disable() local email = param.get("email") @@ -8,35 +8,35 @@ :add_where("login_recovery_expiry ISNULL OR login_recovery_expiry < now()") :exec() -if #members < 1 then - return +if #members > 0 then + + local logins = {} + + for i, member in ipairs(members) do + local expiry = db:query("SELECT now() + '7 days'::interval as expiry", "object").expiry + member.login_recovery_expiry = expiry + member:save() + logins[#logins+1] = member.login + end + + local content = slot.use_temporary(function() + slot.put(_"Hello,\n\n") + slot.put(_"the following login is connected to this email address:\n\n") + for i, login in ipairs(logins) do + slot.put(_"Login-Name: " .. login .. "\n") + end + end) + + local success = net.send_mail{ + envelope_from = config.mail_envelope_from, + from = config.mail_from, + reply_to = config.mail_reply_to, + to = email, + subject = config.mail_subject_prefix .. _"Login name request", + content_type = "text/plain; charset=UTF-8", + content = content + } + end -local logins = {} - -for i, member in ipairs(members) do - local expiry = db:query("SELECT now() + '7 days'::interval as expiry", "object").expiry - member.login_recovery_expiry = expiry - member:save() - logins[#logins+1] = member.login -end - -local content = slot.use_temporary(function() - slot.put(_"Hello,\n\n") - slot.put(_"the following login is connected to this email address:\n\n") - for i, login in ipairs(logins) do - slot.put(_"Login-Name: " .. login .. "\n") - end -end) - -local success = net.send_mail{ - envelope_from = config.mail_envelope_from, - from = config.mail_from, - reply_to = config.mail_reply_to, - to = email, - subject = config.mail_subject_prefix .. _"Login name request", - content_type = "text/plain; charset=UTF-8", - content = content -} - slot.put_into("notice", _"Your request has been processed.")