Set reply to header whenever we set special envelope from.

3 files changed, 37 insertions, 39 deletions

diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 138cb4ea4..7dfbfc315 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,12 +4,19 @@
 # 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.20 2008-02-06 12:20:37 francis Exp $
+# $Id: request_mailer.rb,v 1.21 2008-02-13 08:59:37 francis Exp $
 
 class RequestMailer < ApplicationMailer
+    
+    # We always set Reply-To when we set Sender to be different from From,
+    # since some email clients seem to erroneously use the envelope from when
+    # they shouldn't, and this might help. (Have had mysterious cases of a
+    # reply coming in duplicate from a public body to both From and envelope
+    # from)
     def initial_request(info_request, outgoing_message)
         @from = info_request.incoming_name_and_email
-        headers 'Sender' => info_request.envelope_name_and_email
+        headers 'Sender' => info_request.envelope_name_and_email, 
+                'Reply-To' => @from
         @recipients = info_request.recipient_name_and_email
         @subject    = 'Freedom of Information Request - ' + info_request.title
         @body       = {:info_request => info_request, :outgoing_message => outgoing_message,
@@ -18,7 +25,8 @@ class RequestMailer < ApplicationMailer
 
     def followup(info_request, outgoing_message, incoming_message_followup)
         @from = info_request.incoming_name_and_email
-        headers 'Sender' => info_request.envelope_name_and_email
+        headers 'Sender' => info_request.envelope_name_and_email,
+                'Reply-To' => @from
         @recipients = incoming_message_followup.mail.from_addrs.to_s
         @subject    = 'Re: Freedom of Information Request - ' + info_request.title
         @body       = {:info_request => info_request, :outgoing_message => outgoing_message,
diff --git a/config/environment.rb b/config/environment.rb
index 53d1fa2ed..5de47aabe 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -120,7 +120,7 @@ module ActionMailer
     end
 end
 
-# Monkeypatch! Remove individual error messages from an ActiveRecord.
+# Monkeypatch! Method to remove individual error messages from an ActiveRecord.
 module ActiveRecord
     class Errors
         def delete(key)
diff --git a/todo.txt b/todo.txt
index db31dad6a..a6df2d134 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,12 +1,6 @@
 FOI requests to use to test it
 ==============================
 
-The Better Regulation Executive has issued step–by–step guidance for officials
-wishing to use the order–making powers to deliver regulatory reform. For this
-and contact details for the guidance, please visit the Better Regulation Unit
-Intranet site [NB:This site is only available for Government departments].
-http://bre.berr.gov.uk/regulation/reform/bill/index.asp
-
 Please send me all documentation relating to the decision to use results from
 the Oxford Economic Forecasting's report "The Economic Contribution of the
 Aviation Industry in the UK" in the "Air Transport White Paper Progress Report
@@ -37,9 +31,6 @@ Show due date on, e.g.
 Sort by due date, show categorisation everywhere
 Alert somewhere if working days table not up to date
 
-Sort the requests by when something last happened to them (this needs thought as to what
-sort orders we need)
-
 Make sure this page is OK
 http://foi.mysociety.org/request/14
 
@@ -48,40 +39,49 @@ http://foi.mysociety.org/request/18/response/31
 - Renders badly
 - No doubt leaks email address via download.bin :(
 - We don't have "this is an evil techy weird bounce" as option for state of message
-And Tom's
+
+And Tom's woes:
     http://foi.mysociety.org/request/8
-And me
+Also: Consider removing login links from notifications of new responses
+
+And my woes:
     http://foi.mysociety.org/request/17
     - why duplicate?
-    - add reply-to header to emails
-Consider removing login links from notifications of new responses
 
 Things waiting clarification need link to help you do it.
 
-Tidying
-=======
+Do something at least a bit aggressive when response is late
 
-Mark some requests as test requests 
+Next
+====
 
-Later
-=====
 
-Check act to see if can use pseudonym for FOI request?
+Lucene for search - use http://acts-as-solr.rubyforge.org/
+Have a look at http://swish-e.org/
+Or polish up an acts_as_xapian
+
+Sort the requests by when something last happened to them (this needs thought as to what
+sort orders we need)
 
-Make it so if the pipe fails, exim tries again rather than sending an error to the public body.
-    Or so errors go to an admin somehow, at the very least.
+
+Later
+=====
 
 Synthesise these tips into our handful of snappy snappy bullet points
     http://community.foe.co.uk/tools/right_to_know/tips.html
     http://www.justice.gov.uk/requestinginformation.htm
 
-See if occasional fastcgi errors go away now with Rails 2
+Fix the fastcgi errors
 [Mon Jan 21 10:38:45 2008] [error] [client 81.107.40.81] FastCGI: incomplete headers (0 bytes) rec
 eived from server "/data/vhost/foi.mysociety.org/docs/dispatch.fcgi"
 
 Show public body email address on their public page, with a link to say "this isn't right!"
 
 Email me updates on this request
+Generic alerting/tracking system including
+    - email alerts and RSS
+    - new requests, new good responses etc.
+
 Requests with related content
 Blog posts / Wikipedia articles about this request
 
@@ -102,13 +102,6 @@ http://www.ico.gov.uk/Home/tools_and_resources/decision_notices.aspx
 (10:32:52) Matthew: their function is called autogrow_textarea() by the way, if you just want to look at it...
  thanks :) I won't do it now as there are more important things, I was just accidentally impressed
 
-Lucene for search - use http://acts-as-solr.rubyforge.org/
-Have a look at http://swish-e.org/
-
-Generic alerting/tracking system including
-    - email alerts and RSS
-    - new requests, new good responses etc.
-    
 
 Read wiki page lots
 http://www.mysociety.org/moin.cgi/FreedomOfInformation
@@ -129,14 +122,10 @@ Add spelling checker as in WTT
 For grey hints in input fields
 http://pauldowman.com/projects/fieldhints/
 
-Somehow validate all pages with HTML validate
-
 Consider having link to publications scheme type pages for each body:
 http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/index.html
 http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/coiindex.html
 
-Maybe prepend letter for them with "this is FOI request blah" boilerplate?
-
 Forgotten password link
 
 Way of contacting other users
@@ -165,8 +154,6 @@ the last > converted to &gt; too badly
     http://localhost:3000/request/5?
 (and be sure if you use a hack with a secret, it really is secret to stop people making evil links)
 
-Check log rotation is working well
-
 Ask what they learnt from request, and other things?
     and reward by putting their request on front page
 
@@ -174,11 +161,14 @@ Link to:
     Disclosure logs
     Publication schemes (http://www.ico.gov.uk/what_we_cover/freedom_of_information/publication_schemes.aspx)
 
+Mark some requests as test requests 
+
 
 Sources of public bodies
 ========================
 
 Send to MoD seems to require a form
+Also DfT :( http://www.dft.gov.uk/foi/whatyouneedtoknow/foionlinefrm
 
 Schools list: www.edubase.gov.uk