1.1 --- a/model/newsletter.lua	Sun Apr 17 15:04:07 2016 +0200
     1.2 +++ b/model/newsletter.lua	Sun Apr 17 16:02:26 2016 +0200
     1.3 @@ -6,36 +6,37 @@
     1.4    if not newsletter_to_send then
     1.5      return false
     1.6    end
     1.7 +
     1.8    local newsletter = newsletter_to_send.newsletter
     1.9    
    1.10    local newsletter_to_send = NewsletterToSend:by_newsletter_id(newsletter.id)
    1.11    newsletter_to_send:load("member")
    1.12 -  
    1.13 +
    1.14    newsletter.sent = "now"
    1.15    newsletter:save()
    1.16 -
    1.17 +  
    1.18    io.stderr:write("Sending newsletter " .. newsletter.id .. " to " .. (#newsletter_to_send) .. " members\n")
    1.19    
    1.20    for i, n in ipairs(newsletter_to_send) do
    1.21      
    1.22      local member = newsletter_to_send.member
    1.23      
    1.24 -    if not member.notify_email then
    1.25 -      return
    1.26 +    if member.notify_email then
    1.27 +      io.stderr:write("Sending newsletter " .. newsletter.id .. " to " .. member.notify_email .. "\n")
    1.28 +      
    1.29 +      local success = net.send_mail{
    1.30 +        envelope_from = config.mail_envelope_from,
    1.31 +        from          = config.mail_from,
    1.32 +        reply_to      = config.mail_reply_to,
    1.33 +        to            = member.notify_email,
    1.34 +        subject       = newsletter.subject,
    1.35 +        content_type  = "text/plain; charset=UTF-8",
    1.36 +        content       = newsletter.content
    1.37 +      }
    1.38      end
    1.39  
    1.40 -    io.stderr:write("Sending newsletter " .. newsletter.id .. " to " .. member.notify_email .. "\n")
    1.41 -    
    1.42 -    local success = net.send_mail{
    1.43 -      envelope_from = config.mail_envelope_from,
    1.44 -      from          = config.mail_from,
    1.45 -      reply_to      = config.mail_reply_to,
    1.46 -      to            = member.notify_email,
    1.47 -      subject       = newsletter.subject,
    1.48 -      content_type  = "text/plain; charset=UTF-8",
    1.49 -      content       = newsletter.content
    1.50 -    }
    1.51 -
    1.52    end
    1.53    
    1.54 +  return true
    1.55 +  
    1.56  end
    1.57 \ No newline at end of file