Display less confusing text than ..@.. for masked emails.

Preprocess the funny double angle bracket quoted URLs.

2 files changed, 7 insertions, 15 deletions

diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index dfc7c1a54..b4af65d77 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -18,7 +18,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: incoming_message.rb,v 1.40 2008-02-14 15:31:22 francis Exp $
+# $Id: incoming_message.rb,v 1.41 2008-02-16 02:36:17 francis Exp $
 
 
 # TODO
@@ -121,7 +121,7 @@ class IncomingMessage < ActiveRecord::Base
         # either the requestor's email address or the request's response email
         # address out onto the internet
         rx = Regexp.new(MySociety::Validate.email_match_regexp)
-        text.gsub!(rx, "...@...")
+        text.gsub!(rx, "[email address]")
 
         return text
     end
@@ -244,6 +244,7 @@ class IncomingMessage < ActiveRecord::Base
         if collapse_quoted_sections
             text = folded_quoted_text
         end
+        text = MySociety::Format.simplify_angle_bracketed_urls(text)
         text = CGI.escapeHTML(text)
         text = MySociety::Format.make_clickable(text, :contract => 1)
         if collapse_quoted_sections
diff --git a/todo.txt b/todo.txt
index 586ee49e6..764b0f5fd 100644
--- a/todo.txt
+++ b/todo.txt
@@ -16,17 +16,9 @@ Status of messages stuff
 
 Status inputting:
     cope with "other" case when something is both (e.g. received some AND clarify)
-    search for 'classify' and tidy text
 
-Show proper due date on, e.g.
-    http://foi.mysociety.org/request/4
-    http://foi.mysociety.org/request/17
-Sort by due date, show categorisation everywhere
 Alert somewhere if working days table not up to date
 
-Make sure this page is OK
-http://foi.mysociety.org/request/14
-
 Adam's woes:
 http://foi.mysociety.org/request/18/response/31
 - Renders badly
@@ -35,13 +27,12 @@ http://foi.mysociety.org/request/18/response/31
 
 And Tom's woes:
     http://foi.mysociety.org/request/8
+Add - response was made in private state
+    or maybe 'response refusing to publish for spurious reasons
 Also: Consider removing login links from notifications of new responses
 
 Do something at least a bit aggressive when response is late
 
-Add - response was made in private state
-or maybe 'response refusing to publish for spurious reasons
-
 Go through all requests and check status is shiny
 
 
@@ -53,7 +44,6 @@ if that is in the future.
 
 Consider on staging sites making follow ups go to dummy address also
 
-Change ..@.. to something prettier / less confusing
 Put the admin "Public page" link on request page somewhere clearer
 
 Lucene for search - use http://acts-as-solr.rubyforge.org/
@@ -62,7 +52,7 @@ 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)
-
+Sort by due date
 
 Later
 =====
@@ -176,6 +166,7 @@ Sources of public bodies
 Send to MoD seems to require a form
 Also DfT :( http://www.dft.gov.uk/foi/whatyouneedtoknow/foionlinefrm
 Also Met :( http://www.met.police.uk/information/metric/index.htm
+- perhaps just do them manually?
 
 Schools list: www.edubase.gov.uk