aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/censor_rule.rb4
-rw-r--r--app/models/comment.rb4
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/exim_log.rb4
-rw-r--r--app/models/exim_log_done.rb4
-rw-r--r--app/models/incoming_message.rb4
-rw-r--r--app/models/info_request.rb4
-rw-r--r--app/models/info_request_event.rb4
-rw-r--r--app/models/outgoing_message.rb4
-rw-r--r--app/models/post_redirect.rb4
-rw-r--r--app/models/public_body.rb4
-rw-r--r--app/models/public_body_tag.rb4
-rw-r--r--app/models/raw_email.rb4
-rw-r--r--app/models/track_thing.rb4
-rw-r--r--app/models/track_things_sent_email.rb4
-rw-r--r--app/models/user.rb21
-rw-r--r--app/models/user_info_request_sent_alert.rb4
17 files changed, 51 insertions, 34 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index 4a21821de..1b00ea77f 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: censor_rules
#
@@ -21,7 +21,7 @@
# 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.7 2009-03-04 11:26:35 tony Exp $
+# $Id: censor_rule.rb,v 1.8 2009-03-09 01:17:06 francis Exp $
class CensorRule < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 7a7e2ad60..fcafaad24 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: comments
#
@@ -19,7 +19,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: comment.rb,v 1.12 2009-03-04 11:26:35 tony Exp $
+# $Id: comment.rb,v 1.13 2009-03-09 01:17:06 francis Exp $
class Comment < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index 92251c246..487d0a107 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: contact_validators
#
@@ -15,7 +15,7 @@
# 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.27 2009-03-04 11:26:35 tony Exp $
+# $Id: contact_validator.rb,v 1.28 2009-03-09 01:17:06 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
strip_attributes!
diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb
index b93eaa710..98982954d 100644
--- a/app/models/exim_log.rb
+++ b/app/models/exim_log.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: exim_logs
#
@@ -18,7 +18,7 @@
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: exim_log.rb,v 1.6 2009-03-04 11:26:35 tony Exp $
+# $Id: exim_log.rb,v 1.7 2009-03-09 01:17:06 francis Exp $
class EximLog < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/exim_log_done.rb b/app/models/exim_log_done.rb
index 40e103978..379df2a66 100644
--- a/app/models/exim_log_done.rb
+++ b/app/models/exim_log_done.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: exim_log_dones
#
@@ -16,7 +16,7 @@
# 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.3 2009-03-04 11:26:35 tony Exp $
+# $Id: exim_log_done.rb,v 1.4 2009-03-09 01:17:06 francis Exp $
class EximLogDone < ActiveRecord::Base
has_many :exim_logs
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 3b039e3b0..20c7a89e1 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: incoming_messages
#
@@ -19,7 +19,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.190 2009-03-04 11:26:35 tony Exp $
+# $Id: incoming_message.rb,v 1.191 2009-03-09 01:17:06 francis Exp $
# TODO
# Move some of the (e.g. quoting) functions here into rblib, as they feel
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index e553c9700..86920391a 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: info_requests
#
@@ -23,7 +23,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.172 2009-03-07 01:16:18 francis Exp $
+# $Id: info_request.rb,v 1.173 2009-03-09 01:17:06 francis Exp $
require 'digest/sha1'
require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian')
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index bd6a565dc..7b86f13c1 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: info_request_events
#
@@ -21,7 +21,7 @@
# 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.75 2009-03-07 01:16:18 francis Exp $
+# $Id: info_request_event.rb,v 1.76 2009-03-09 01:17:06 francis Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 4c2a2db59..1a6f3d688 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: outgoing_messages
#
@@ -22,7 +22,7 @@
# 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.80 2009-03-07 01:16:18 francis Exp $
+# $Id: outgoing_message.rb,v 1.81 2009-03-09 01:17:06 francis Exp $
class OutgoingMessage < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 1bb4be83a..30ac31ce8 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: post_redirects
#
@@ -26,7 +26,7 @@
# 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.45 2009-03-04 11:26:35 tony Exp $
+# $Id: post_redirect.rb,v 1.46 2009-03-09 01:17:06 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 76175a945..40d4d491a 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: public_bodies
#
@@ -25,7 +25,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body.rb,v 1.131 2009-03-04 11:26:35 tony Exp $
+# $Id: public_body.rb,v 1.132 2009-03-09 01:17:06 francis Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index b25396087..658a5f594 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: public_body_tags
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body_tag.rb,v 1.24 2009-03-04 11:26:35 tony Exp $
+# $Id: public_body_tag.rb,v 1.25 2009-03-09 01:17:06 francis Exp $
class PublicBodyTag < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index 28085a6ef..489f7f3fb 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: raw_emails
#
@@ -13,7 +13,7 @@
# 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.7 2009-03-04 11:26:35 tony Exp $
+# $Id: raw_email.rb,v 1.8 2009-03-09 01:17:06 francis Exp $
class RawEmail < ActiveRecord::Base
# deliberately don't strip_attributes, so keeps raw email properly
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index b0b4c8d47..614a5cfe6 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: track_things
#
@@ -21,7 +21,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.48 2009-03-04 11:26:35 tony Exp $
+# $Id: track_thing.rb,v 1.49 2009-03-09 01:17:06 francis Exp $
class TrackThing < ActiveRecord::Base
belongs_to :tracking_user, :class_name => 'User'
diff --git a/app/models/track_things_sent_email.rb b/app/models/track_things_sent_email.rb
index d8be03307..c26331df7 100644
--- a/app/models/track_things_sent_email.rb
+++ b/app/models/track_things_sent_email.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: track_things_sent_emails
#
@@ -18,7 +18,7 @@
# 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.17 2009-03-04 11:26:35 tony Exp $
+# $Id: track_things_sent_email.rb,v 1.18 2009-03-09 01:17:06 francis Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user.rb b/app/models/user.rb
index d77509a48..fed9de990 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: users
#
@@ -14,6 +14,7 @@
# url_name :text not null
# last_daily_track_email :datetime default(Sat Jan 01 00:00:00 UTC 2000)
# admin_level :string(255) default("none"), not null
+# ban_text :text default(""), not null
#
# models/user.rb:
@@ -22,7 +23,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user.rb,v 1.81 2009-03-04 11:26:35 tony Exp $
+# $Id: user.rb,v 1.82 2009-03-09 01:17:06 francis Exp $
require 'digest/sha1'
@@ -218,6 +219,22 @@ class User < ActiveRecord::Base
def admin_page_links?
self.admin_level == 'super'
end
+ # Various ways the user can be banned, and text to describe it if failed
+ def can_file_requests?
+ self.ban_text.empty?
+ end
+ def can_make_comments?
+ self.ban_text.empty?
+ end
+ def can_contact_other_users?
+ self.ban_text.empty?
+ end
+ def can_fail_html
+ text = self.ban_text.strip
+ text = CGI.escapeHTML(text)
+ text = MySociety::Format.make_clickable(text, :contract => 1)
+ return text
+ end
# Returns domain part of user's email address
def email_domain
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb
index b472b7fa2..3c579a62d 100644
--- a/app/models/user_info_request_sent_alert.rb
+++ b/app/models/user_info_request_sent_alert.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 72
+# Schema version: 73
#
# Table name: user_info_request_sent_alerts
#
@@ -17,7 +17,7 @@
# 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.28 2009-03-04 11:26:35 tony Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.29 2009-03-09 01:17:06 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-26 14:55:32 +0000