X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..da059269f9e5d63b4029abf0e1b8b90d210dc7c5:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 36d3df3b4..0b8b512ee 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
-  has_many :blocks, :class_name => "UserBlock", :conditions => ["user_blocks.end_at > now() or user_blocks.needs_view"]
+  has_many :active_blocks, :class_name => "UserBlock", :conditions => ['user_blocks.ends_at > \'#{Time.now.getutc.xmlschema(5)}\' or user_blocks.needs_view']
   has_many :roles, :class_name => "UserRole"
 
   validates_presence_of :email, :display_name
@@ -24,8 +24,8 @@ class User < ActiveRecord::Base
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
-  validates_length_of :email, :within => 6..255
-  validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  validates_email_format_of :email
+  validates_email_format_of :new_email, :allow_blank => true
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
@@ -135,7 +135,7 @@ class User < ActiveRecord::Base
   end
 
   ##
-  # returns true if the user has the moderator role, false otherwise
+  # returns true if the user has the administrator role, false otherwise
   def administrator?
     has_role? 'administrator'
   end
@@ -143,14 +143,14 @@ class User < ActiveRecord::Base
   ##
   # returns true if the user has the requested role
   def has_role?(role)
-    roles.inject(false) { |x, r| x or r.role == role }
+    roles.any? { |r| r.role == role }
   end
 
   ##
   # returns the first active block which would require users to view 
   # a message, or nil if there are none.
   def blocked_on_view
-    blocks.inject(nil) { |s,x| s || (x.needs_view? ? x : nil) }
+    active_blocks.detect { |b| b.needs_view? }
   end
 
   def delete