aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/about_me_validator.rb2
-rw-r--r--app/models/application_mailer.rb3
-rw-r--r--app/models/censor_rule.rb2
-rw-r--r--app/models/change_email_validator.rb2
-rw-r--r--app/models/comment.rb2
-rw-r--r--app/models/contact_mailer.rb2
-rw-r--r--app/models/contact_validator.rb2
-rw-r--r--app/models/holiday.rb2
-rw-r--r--app/models/incoming_message.rb12
-rw-r--r--app/models/info_request_event.rb2
-rw-r--r--app/models/mail_server_log_done.rb2
-rw-r--r--app/models/outgoing_mailer.rb2
-rw-r--r--app/models/outgoing_message.rb2
-rw-r--r--app/models/post_redirect.rb2
-rw-r--r--app/models/profile_photo.rb3
-rw-r--r--app/models/raw_email.rb2
-rw-r--r--app/models/request_mailer.rb2
-rw-r--r--app/models/track_mailer.rb2
-rw-r--r--app/models/track_thing.rb3
-rw-r--r--app/models/track_things_sent_email.rb2
-rw-r--r--app/models/user_info_request_sent_alert.rb2
-rw-r--r--app/models/user_mailer.rb2
22 files changed, 7 insertions, 50 deletions
diff --git a/app/models/about_me_validator.rb b/app/models/about_me_validator.rb
index 67b81bc9c..5e04c2761 100644
--- a/app/models/about_me_validator.rb
+++ b/app/models/about_me_validator.rb
@@ -11,8 +11,6 @@
#
# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $
class AboutMeValidator < ActiveRecord::BaseWithoutTable
strip_attributes!
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb
index add05ffdb..cdb279c3c 100644
--- a/app/models/application_mailer.rb
+++ b/app/models/application_mailer.rb
@@ -3,8 +3,7 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: application_mailer.rb,v 1.8 2009-02-09 10:37:12 francis Exp $
+
require 'action_mailer/version'
class ApplicationMailer < ActionMailer::Base
# Include all the functions views get, as emails call similar things.
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index a74fdcb24..f40ab6fbb 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -21,8 +21,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: censor_rule.rb,v 1.14 2009-09-17 21:10:04 francis Exp $
class CensorRule < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb
index 0395ab6d5..9ef25217d 100644
--- a/app/models/change_email_validator.rb
+++ b/app/models/change_email_validator.rb
@@ -14,8 +14,6 @@
#
# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $
class ChangeEmailValidator < ActiveRecord::BaseWithoutTable
strip_attributes!
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 6edfaa24f..5507910e2 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -19,8 +19,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: comment.rb,v 1.18 2009-09-17 21:10:05 francis Exp $
class Comment < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb
index adeac8eac..16aae2f15 100644
--- a/app/models/contact_mailer.rb
+++ b/app/models/contact_mailer.rb
@@ -3,8 +3,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: contact_mailer.rb,v 1.10 2009-02-09 10:37:12 francis Exp $
class ContactMailer < ApplicationMailer
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index a9748a739..d277161f9 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -14,8 +14,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
strip_attributes!
diff --git a/app/models/holiday.rb b/app/models/holiday.rb
index 1072f6a70..d2437f438 100644
--- a/app/models/holiday.rb
+++ b/app/models/holiday.rb
@@ -20,8 +20,6 @@
#
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: holiday.rb,v 1.10 2009-10-26 17:52:39 francis Exp $
class Holiday < ActiveRecord::Base
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index f3844a153..367909f57 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -27,8 +27,6 @@
#
# 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.228 2009-10-21 11:24:14 francis Exp $
# TODO
# Move some of the (e.g. quoting) functions here into rblib, as they feel
@@ -77,8 +75,7 @@ class IncomingMessage < ActiveRecord::Base
# Documentation at http://i.loveruby.net/en/projects/tmail/doc/
def mail(force = nil)
if (!force.nil? || @mail.nil?) && !self.raw_email.nil?
- # Hack round bug in TMail's MIME decoding. Example request which provokes it:
- # http://www.whatdotheyknow.com/request/reviews_of_unduly_lenient_senten#incoming-4830
+ # Hack round bug in TMail's MIME decoding.
# Report of TMail bug:
# http://rubyforge.org/tracker/index.php?func=detail&aid=21810&group_id=4512&atid=17370
copy_of_raw_data = self.raw_email.data.gsub(/; boundary=\s+"/ims,'; boundary="')
@@ -347,8 +344,7 @@ class IncomingMessage < ActiveRecord::Base
name = Regexp.escape(self.info_request.user_name)
# To end of message sections
- # http://www.whatdotheyknow.com/request/university_investment_in_the_arm
- text.gsub!(/^#{name}[^\n]+\nSent by:[^\n]+\n.*/ims, "\n\n" + replacement)
+ text.gsub!(/^\s?#{name}[^\n]+\n([^\n]+\n)?\s?Sent by:[^\n]+\n.*/ims, "\n\n" + replacement)
# Some other sort of forwarding quoting
# http://www.whatdotheyknow.com/request/224/response/326
@@ -582,7 +578,8 @@ class IncomingMessage < ActiveRecord::Base
# Remove existing quoted sections
folded_quoted_text = self.remove_lotus_quoting(text, 'FOLDED_QUOTED_SECTION')
- folded_quoted_text = IncomingMessage.remove_quoted_sections(text, "FOLDED_QUOTED_SECTION")
+ folded_quoted_text = IncomingMessage.remove_quoted_sections(folded_quoted_text, "FOLDED_QUOTED_SECTION")
+
self.cached_main_body_text_unfolded = text
self.cached_main_body_text_folded = folded_quoted_text
self.save!
@@ -646,6 +643,7 @@ class IncomingMessage < ActiveRecord::Base
# Text looks like unlabelled nonsense,
# strip out anything that isn't UTF-8
begin
+ source_charset = 'utf-8' if source_charset.nil?
text = Iconv.conv('utf-8//IGNORE', source_charset, text) +
_("\n\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]",
:site_name => Configuration::site_name)
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 54d2f5ef7..5a8e3416f 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -21,8 +21,6 @@
#
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: info_request_event.rb,v 1.96 2009-10-19 22:06:55 francis Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/mail_server_log_done.rb b/app/models/mail_server_log_done.rb
index e349b2e68..3fb20f0b3 100644
--- a/app/models/mail_server_log_done.rb
+++ b/app/models/mail_server_log_done.rb
@@ -14,8 +14,6 @@
#
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: exim_log_done.rb,v 1.8 2009-09-17 21:10:05 francis Exp $
class MailServerLogDone < ActiveRecord::Base
has_many :mail_server_logs
diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb
index 2e5e9c6ae..a307bb778 100644
--- a/app/models/outgoing_mailer.rb
+++ b/app/models/outgoing_mailer.rb
@@ -3,8 +3,6 @@
#
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: outgoing_mailer.rb,v 1.1 2009-10-04 21:53:54 francis Exp $
# Note: The layout for this wraps messages by lines rather than (blank line
# separated) paragraphs, as is the convention for all the other mailers. This
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index cb2f1efdc..0e547d493 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -21,8 +21,6 @@
#
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: outgoing_message.rb,v 1.95 2009-10-04 21:53:54 francis Exp $
class OutgoingMessage < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index f613fc58d..31f08c21a 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -25,8 +25,6 @@
#
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: post_redirect.rb,v 1.51 2009-09-17 21:10:05 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 72bfe954f..6e605651d 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -14,9 +14,6 @@
#
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: profile_photo.rb,v 1.2 2009-09-17 21:10:05 francis Exp $
-#
class ProfilePhoto < ActiveRecord::Base
WIDTH = 96
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index c7b8eb017..bae144931 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -11,8 +11,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: raw_email.rb,v 1.12 2009-09-17 21:10:05 francis Exp $
class RawEmail < ActiveRecord::Base
# deliberately don't strip_attributes, so keeps raw email properly
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 3fc6b0471..413e93e25 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -3,8 +3,6 @@
#
# 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.89 2009-10-04 21:53:54 francis Exp $
require 'alaveteli_file_types'
diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb
index 6e2dd5109..7dfa87f52 100644
--- a/app/models/track_mailer.rb
+++ b/app/models/track_mailer.rb
@@ -3,8 +3,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: track_mailer.rb,v 1.23 2009-10-03 02:50:11 francis Exp $
class TrackMailer < ApplicationMailer
def event_digest(user, email_about_things)
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 63f356168..d1cef4d4d 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -20,8 +20,7 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: track_thing.rb,v 1.53 2009-09-17 21:10:05 francis Exp $
+
require 'set'
class TrackThing < ActiveRecord::Base
diff --git a/app/models/track_things_sent_email.rb b/app/models/track_things_sent_email.rb
index 24297f57b..a0a4c0f0c 100644
--- a/app/models/track_things_sent_email.rb
+++ b/app/models/track_things_sent_email.rb
@@ -17,8 +17,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: track_things_sent_email.rb,v 1.22 2009-09-17 21:10:05 francis Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb
index a97fd5d44..cf20bcbf5 100644
--- a/app/models/user_info_request_sent_alert.rb
+++ b/app/models/user_info_request_sent_alert.rb
@@ -16,8 +16,6 @@
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: user_info_request_sent_alert.rb,v 1.34 2009-10-03 02:22:18 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb
index 7adf5b63c..1be4f8aa3 100644
--- a/app/models/user_mailer.rb
+++ b/app/models/user_mailer.rb
@@ -3,8 +3,6 @@
#
# 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.8 2009-02-09 10:37:12 francis Exp $
class UserMailer < ApplicationMailer
def confirm_login(user, reasons, url)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 18:52:33 +0000