Updated potlatch preset tags for bridleway and byway

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 1261e5a181ec46886f568344d815b2ff9a1d0b24..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) 


@@ -78,12 +78,12 @@ class User < ActiveRecord::Base
   end
 
   def get_new_messages
   end
 
   def get_new_messages

-    messages = Message.find(:all, :conditions => "message_read = 0")
+    messages = Message.find(:all, :conditions => "message_read = 0 and to_user_id = #{self.id}")

     return messages
   end
 
   def get_all_messages
     return messages
   end
 
   def get_all_messages

-    messages = Message.find(:all, :conditions => "message_read = 0")
+    messages = Message.find(:all, :conditions => "to_user_id = #{self.id}")

     return messages
   end
 
     return messages
   end