more rails front end bits

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 589546e2d6c97c05e11a366ec0621e2aa50fcf68..350ea2c3a83e74a49833c897fa6f51aa23e201ac 100644 (file)
--- 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) 
@@ -27,9 +27,12 @@ class User < ActiveRecord::Base
   def self.authenticate(email, passwd) 
     find_first([ "email = ? AND pass_crypt =?", email, Digest::MD5.hexdigest(passwd) ])
   end 
+
+  def self.authenticate_token(token) 
+    find_first([ "token = ? ", token])
+  end 
   
-  private
-  def make_token
+  def self.make_token
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''