Put name (as well as email) in all addresses when sending emails.

3 files changed, 23 insertions, 18 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 198c6a30f..847a30cc0 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -17,7 +17,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: info_request.rb,v 1.26 2008-01-10 01:13:28 francis Exp $
+# $Id: info_request.rb,v 1.27 2008-01-14 12:22:36 francis Exp $
 
 require 'digest/sha1'
 
@@ -41,12 +41,18 @@ public
     def incoming_email
         return self.magic_email("request-")
     end
+    def incoming_name_and_email
+        return "GovernmentSpy <" + self.incoming_email + ">"
+    end
 
     # Modified version of incoming_email to use in the envelope from, for
     # bounce messages.
     def envelope_email
         return self.magic_email("request-bounce-")
     end
+    def envelope_name_and_email
+        return "GovernmentSpy <" + self.envelope_email + ">"
+    end
 
     # Return info request corresponding to an incoming email address, or nil if
     # none found. Checks the hash to ensure the email came from the public body -
@@ -189,6 +195,9 @@ public
             return self.public_body.request_email
         end
     end
+    def recipient_name_and_email
+        return "FOI requests at " + self.public_body.short_name + " <" + self.recipient_email + ">"
+    end
 
     # History of some things that have happened
     def log_event(type, params)
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index fc4197004..ea4d635f1 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,23 +4,21 @@
 # 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.17 2008-01-11 01:02:45 francis Exp $
-
-class RequestMailer < ActionMailer::Base
-    helper :application
+# $Id: request_mailer.rb,v 1.18 2008-01-14 12:22:36 francis Exp $
 
+class RequestMailer < ApplicationMailer
     def initial_request(info_request, outgoing_message)
-        @from = info_request.incoming_email
-        headers 'Sender' => info_request.envelope_email
-        @recipients = info_request.recipient_email
+        @from = info_request.incoming_name_and_email
+        headers 'Sender' => info_request.envelope_name_and_email
+        @recipients = info_request.recipient_name_and_email
         @subject    = 'Freedom of Information Request - ' + info_request.title
         @body       = {:info_request => info_request, :outgoing_message => outgoing_message,
             :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') }
     end
 
     def followup(info_request, outgoing_message, incoming_message_followup)
-        @from = info_request.incoming_email
-        headers 'Sender' => info_request.envelope_email
+        @from = info_request.incoming_name_and_email
+        headers 'Sender' => info_request.envelope_name_and_email
         @recipients = incoming_message_followup.mail.from
         @subject    = 'Re: Freedom of Information Request - ' + info_request.title
         @body       = {:info_request => info_request, :outgoing_message => outgoing_message,
@@ -30,7 +28,7 @@ class RequestMailer < ActionMailer::Base
     end
 
     def bounced_message(email)
-        @from = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
+        @from = contact_from_name_and_email
         @recipients = @from
         @subject = "Incoming email to unknown FOI request"
         email.setup_forward(self)
@@ -43,8 +41,8 @@ class RequestMailer < ActionMailer::Base
         post_redirect.save!
         url = confirm_url(:email_token => post_redirect.email_token)
 
-        @from = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
-        @recipients = info_request.user.email
+        @from = contact_from_name_and_email
+        @recipients = info_request.user.name_and_email
         @subject = "New response to your FOI request - " + info_request.title
         @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url }
     end
diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb
index 46baa19c4..74309a91d 100644
--- a/app/models/user_mailer.rb
+++ b/app/models/user_mailer.rb
@@ -4,13 +4,11 @@
 # 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.4 2008-01-14 10:43:30 francis Exp $
-
-class UserMailer < ActionMailer::Base
-    helper :application
+# $Id: user_mailer.rb,v 1.5 2008-01-14 12:22:36 francis Exp $
 
+class UserMailer < ApplicationMailer
     def confirm_login(user, reasons, url)
-        @from = "GovernmentSpy <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">"
+        @from = contact_from_name_and_email
         @recipients = user.name_and_email
         @subject    = reasons[:email_subject]
         @body[:reasons] = reasons