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

diff --git a/app/models/user.rb b/app/models/user.rb
index 589546e2d..4c7a26473 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -13,7 +13,7 @@ class User < ActiveRecord::Base
   def set_defaults
     self.creation_time = Time.now
     self.timeout = Time.now
-    self.token = make_token()
+    self.token = User.make_token()
   end
   
   def pass_crypt=(str) 
@@ -24,16 +24,19 @@ class User < ActiveRecord::Base
     write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end 
 
-  def self.authenticate(email, passwd) 
-    find_first([ "email = ? AND pass_crypt =?", email, Digest::MD5.hexdigest(passwd) ])
+  def self.authenticate(email, passwd) 
+    find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)])
+  end 
+
+  def self.authenticate_token(token) 
+    find(:first, :conditions => [ "token = ? ", token])
   end 
   
-  private
-  def make_token
+  def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''
 
-    30.times do
+    length.times do
       confirmstring += chars[(rand * chars.length).to_i].chr
     end