diff options
| author | francis <francis> | 2008-01-18 22:47:36 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-01-18 22:47:36 +0000 |
| commit | 775f0941f8b1c78270bf21b64675932f6a2e37e8 (patch) | |
| tree | ce26411a1da6e4b267aa83c893c5625e56cb0486 | |
| parent | 8591cefe4c561825806cd15366b7222835c2d81a (diff) | |
Hide disclaimers - hope this isn't too liberal :)
| -rw-r--r-- | app/models/incoming_message.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 4f66bcc25..12cc22554 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -20,7 +20,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.29 2008-01-18 03:54:04 francis Exp $ +# $Id: incoming_message.rb,v 1.30 2008-01-18 22:47:36 francis Exp $ module TMail class Mail @@ -127,14 +127,19 @@ class IncomingMessage < ActiveRecord::Base def self.mark_quoted_sections(text) text = text.dup + # Single line sections text.gsub!(/^(>.*\n)/, "BEGIN_QUOTED\\1END_QUOTED") text.gsub!(/^(On .+ (wrote|said):\n)/, "BEGIN_QUOTED\\1END_QUOTED") + # Multiple line sections + text.gsub!(/(\s+[-_]{20,}\n.*?disclaimer.*?[-_]{20,}\n)/im, "\n\nBEGIN_QUOTED\\1END_QUOTED") +# -------------------------------------------------------- + + # To end of message sections original_message = '(' + '''------ This is a copy of the message, including all the headers. ------''' + '|' + '''-----Original Message-----''' + ')' - text.gsub!(/^(#{original_message}\n.*)$/m, "BEGIN_QUOTED\\1END_QUOTED") return text |