1.1 --- a/app/main/index/_action/send_login.lua	Sat Apr 20 20:54:42 2013 +0200
     1.2 +++ b/app/main/index/_action/send_login.lua	Wed Apr 24 18:52:15 2013 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 ---trace.disable()
     1.5 +trace.disable()
     1.6  
     1.7  local email = param.get("email")
     1.8  
     1.9 @@ -8,35 +8,35 @@
    1.10    :add_where("login_recovery_expiry ISNULL OR login_recovery_expiry < now()")
    1.11    :exec()
    1.12  
    1.13 -if #members < 1 then
    1.14 -  return
    1.15 +if #members > 0 then
    1.16 +  
    1.17 +  local logins = {}
    1.18 +
    1.19 +  for i, member in ipairs(members) do
    1.20 +    local expiry = db:query("SELECT now() + '7 days'::interval as expiry", "object").expiry
    1.21 +    member.login_recovery_expiry = expiry
    1.22 +    member:save()
    1.23 +    logins[#logins+1] = member.login
    1.24 +  end
    1.25 +
    1.26 +  local content = slot.use_temporary(function()
    1.27 +    slot.put(_"Hello,\n\n")
    1.28 +    slot.put(_"the following login is connected to this email address:\n\n")
    1.29 +    for i, login in ipairs(logins) do
    1.30 +      slot.put(_"Login-Name: " .. login .. "\n")
    1.31 +    end
    1.32 +  end)
    1.33 +
    1.34 +  local success = net.send_mail{
    1.35 +    envelope_from = config.mail_envelope_from,
    1.36 +    from          = config.mail_from,
    1.37 +    reply_to      = config.mail_reply_to,
    1.38 +    to            = email,
    1.39 +    subject       = config.mail_subject_prefix .. _"Login name request",
    1.40 +    content_type  = "text/plain; charset=UTF-8",
    1.41 +    content       = content
    1.42 +  }
    1.43 +
    1.44  end
    1.45    
    1.46 -local logins = {}
    1.47 -
    1.48 -for i, member in ipairs(members) do
    1.49 -  local expiry = db:query("SELECT now() + '7 days'::interval as expiry", "object").expiry
    1.50 -  member.login_recovery_expiry = expiry
    1.51 -  member:save()
    1.52 -  logins[#logins+1] = member.login
    1.53 -end
    1.54 -
    1.55 -local content = slot.use_temporary(function()
    1.56 -  slot.put(_"Hello,\n\n")
    1.57 -  slot.put(_"the following login is connected to this email address:\n\n")
    1.58 -  for i, login in ipairs(logins) do
    1.59 -    slot.put(_"Login-Name: " .. login .. "\n")
    1.60 -  end
    1.61 -end)
    1.62 -
    1.63 -local success = net.send_mail{
    1.64 -  envelope_from = config.mail_envelope_from,
    1.65 -  from          = config.mail_from,
    1.66 -  reply_to      = config.mail_reply_to,
    1.67 -  to            = email,
    1.68 -  subject       = config.mail_subject_prefix .. _"Login name request",
    1.69 -  content_type  = "text/plain; charset=UTF-8",
    1.70 -  content       = content
    1.71 -}
    1.72 -
    1.73  slot.put_into("notice", _"Your request has been processed.")