diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 9 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index b8b9fb56a..eb164a872 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.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: admin_request_controller.rb,v 1.39 2009-09-07 16:35:05 francis Exp $ +# $Id: admin_request_controller.rb,v 1.40 2009-09-08 04:12:08 francis Exp $ class AdminRequestController < AdminController def index @@ -247,7 +247,12 @@ class AdminRequestController < AdminController # 2. Match the email address in the message without matching the hash @info_requests = [] - for address in (@raw_email.incoming_message.mail.to || []) + (@raw_email.incoming_message.mail.cc || []) + addresses = + (@raw_email.incoming_message.mail.to || []) + + (@raw_email.incoming_message.mail.cc || []) + + (@raw_email.incoming_message.mail.envelope_to || []) + addresses.uniq! + for address in addresses @info_requests += InfoRequest.guess_by_incoming_email(address) end end diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 30b73d7dd..f4a7b6448 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.83 2009-09-02 09:39:34 francis Exp $ +# $Id: request_mailer.rb,v 1.84 2009-09-08 04:12:09 francis Exp $ class RequestMailer < ApplicationMailer @@ -239,7 +239,9 @@ class RequestMailer < ApplicationMailer # Member function, called on the new class made in self.receive above def receive(email, raw_email) # Find which info requests the email is for - reply_info_requests = [] + # We deliberately don't use Envelope-to here, so ones that are BCC + # drop into the holding pen for checking. + reply_info_requests = [] # XXX should be set? for address in (email.to || []) + (email.cc || []) reply_info_request = InfoRequest.find_by_incoming_email(address) reply_info_requests.push(reply_info_request) if reply_info_request |