diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/request_mailer.rb | 14 | ||||
| -rw-r--r-- | app/models/user_mailer.rb | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 758034994..4b691150d 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_mailer.rb,v 1.5 2007-10-30 14:23:21 francis Exp $ +# $Id: request_mailer.rb,v 1.6 2007-11-13 12:02:14 francis Exp $ class RequestMailer < ActionMailer::Base @@ -19,6 +19,13 @@ class RequestMailer < ActionMailer::Base @body = {:info_request => info_request, :outgoing_message => outgoing_message} end + def bounced_message(email) + @from = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') + @recipients = @from + @subject = "Incoming email to unknown FOI request" + email.setup_forward(self) + end + # Copy of function from action_mailer/base.rb, which passes the # raw_email to the member function, as we want to record it. # script/mailin calls this function. @@ -38,6 +45,11 @@ class RequestMailer < ActionMailer::Base info_requests.push(info_request) if info_request end + # Nothing found + if info_requests.size == 0 + RequestMailer.deliver_bounced_message(email) + end + # Send the message to each request for info_request in info_requests info_request.receive(email, raw_email) diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb index a7e59f36a..d3638c38b 100644 --- a/app/models/user_mailer.rb +++ b/app/models/user_mailer.rb @@ -4,12 +4,12 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user_mailer.rb,v 1.1 2007-11-05 16:46:10 francis Exp $ +# $Id: user_mailer.rb,v 1.2 2007-11-13 12:02:14 francis Exp $ class UserMailer < ActionMailer::Base def confirm_login(user, reasons, url) - @from = MySociety::Config.get("CONTACT_EMAIL") + @from = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') @recipients = user.email @subject = reasons[:email_subject] @body[:reasons] = reasons |