Added more non-ascii chars to validation (matching list of chars in other models)

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 9c99c36a6d7a4bb52391bd1c26772dfe58907d3e..37351c6b26c79f08fa2a6fe7e7a99d736b5297d4 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,6 +75,11 @@ class User < ActiveRecord::Base
 
   has_many :roles, :class_name => "UserRole"
 
+  has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id
+  has_many :issue_comments
+
+  has_many :reports
+
   scope :visible, -> { where(:status => %w[pending active confirmed]) }
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
@@ -83,16 +88,22 @@ class User < ActiveRecord::Base
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }
 
+  INVALID_ASCII_CHARS = "/;.,?%#".freeze
+  INVALID_NON_ASCII_CHARS = "\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff".freeze
+
   validates :display_name, :presence => true, :allow_nil => true, :length => 3..255,
                            :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :uniqueness => { :case_sensitive => false }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff/;.,?%#]*\z} }
+                           :format => { :with => /\A[^#{INVALID_NON_ASCII_CHARS}]*\z/ }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => /\A[^#{INVALID_ASCII_CHARS}]*\z/,
+                                        :message => I18n.t("users.account.invalid chars", :invalid_chars => INVALID_ASCII_CHARS) }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\A\S/, :message => "has leading whitespace" }
+                           :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\S\z/, :message => "has trailing whitespace" }
+                           :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") }
   validates :email, :presence => true, :confirmation => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }
@@ -112,6 +123,11 @@ class User < ActiveRecord::Base
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
+  after_save :reset_preferred_languages
+
+  def to_param
+    display_name
+  end
 
   def self.authenticate(options)
     if options[:username] && options[:password]
@@ -185,7 +201,11 @@ class User < ActiveRecord::Base
   end
 
   def preferred_languages
-    @locales ||= Locale.list(languages)
+    @preferred_languages ||= Locale.list(languages)
+  end
+
+  def reset_preferred_languages
+    @preferred_languages = nil
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
@@ -197,7 +217,7 @@ class User < ActiveRecord::Base
                    .where("id != ?", id)
                    .where(sql_for_area)
                    .where("#{sql_for_distance} <= ?", radius)
-                   .order(sql_for_distance)
+                   .order(Arel.sql(sql_for_distance))
                    .limit(num)
     else
       nearby = []