X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d2877982a261bc621b57031ad78f4ed10230be3c..37bd2971b49da9364fe5dd25415e97e38b34abd7:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 6bedfbeb3..1a1279042 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,17 +3,43 @@ require 'digest/md5'
 class User < ActiveRecord::Base
   has_many :traces
 
-  def passwd=(str) 
+  validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
+  validates_uniqueness_of :display_name
+  validates_uniqueness_of :email
+  validates_length_of :pass_crypt, :minimum => 8
+  validates_length_of :display_name, :minimum => 3
+  validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+
+  def set_defaults
+    self.creation_time = Time.now
+    self.timeout = Time.now
+    self.token = make_token()
+  end
+  
+  def pass_crypt=(str) 
     write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
   end 
 
-  def passwd
-    return self.pass_crypt
+  def pass_crypt_confirmation=(str) 
+    write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end 
 
-  def self.authenticate(username, passwd) 
-    find_first([ "display_name = ? AND pass_crypt =?", 
-               username, 
+  def self.authenticate(email, passwd) 
+    find_first([ "email = ? AND pass_crypt =?", 
+               email, 
                Digest::MD5.hexdigest(passwd) ]) 
   end 
+  
+  private
+  def make_token
+    chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
+    confirmstring = ''
+
+    30.times do
+      confirmstring += chars[(rand * chars.length).to_i].chr
+    end
+
+    return confirmstring
+  end
+
 end