updates from hacking day

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

diff --git a/app/models/user.rb b/app/models/user.rb
index f72fd5bfadd59a1aa025ba0e368b97dc0044e5f9..c64fcf21b93b66a2b1f915c1f2c77bad607482a4 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -28,8 +28,8 @@ class User < ActiveRecord::Base
     write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end
 
     write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end
 

-  def self.authenticate(email, passwd) \r
-    find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)])\r
+  def self.authenticate(email, passwd)
+    find(:first, :conditions => [ "email = ? AND pass_crypt = ? AND active = true", email, Digest::MD5.hexdigest(passwd)])

   end 
 
   def self.authenticate_token(token) 
   end 
 
   def self.authenticate_token(token)