X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/dc635b6d39be19a09a428282b6d639d029908df6..8a444bfe3f442135ba66e5d9b8cdddfa9e3b50f2:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
old mode 100755
new mode 100644
index 64fd71c..728ca16
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,14 +4,14 @@ class User < ActiveRecord::Base
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password
-
-  validates_presence_of     :login, :email
+  attr_accessor :current_user
+  
+  validates_presence_of     :email
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?
   validates_length_of       :password, :within => 4..40, :if => :password_required?
   validates_confirmation_of :password,                   :if => :password_required?
   validates_length_of       :login,    :within => 3..40
-  validates_length_of       :email,    :within => 3..100
   validates_uniqueness_of   :login, :email, :case_sensitive => false
   before_save :encrypt_password
 
@@ -67,4 +67,12 @@ class User < ActiveRecord::Base
     def password_required?
       crypted_password.blank? || !password.blank?
     end
+    def validate
+      # E-mail regex, moderate complexity
+      # Stolen from http://www.regular-expressions.info/email.html
+      errors.add(:email, "is not valid") unless email  =~
+                  /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
+      errors.add(:login, "should not begin or end with spaces") if login and login.strip!
+      errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
+    end
 end