Validate passwords properly when creating an account. Fixes #419.

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

diff --git a/app/models/user.rb b/app/models/user.rb
index ce12755dfcd77162bcd47d4844226d8038673aba..7b57b87108eae1f5ad752504e2fc3cbb39d7befe 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,7 +5,8 @@ class User < ActiveRecord::Base
   has_many :traces
   has_many :diary_entries
   has_many :messages, :foreign_key => :to_user_id
- 
+  has_many :friends
+
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
@@ -13,28 +14,26 @@ class User < ActiveRecord::Base
   validates_length_of :display_name, :minimum => 3, :allow_nil => true
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
+  before_save :encrypt_password
+
   def set_defaults
     self.creation_time = Time.now
     self.timeout = Time.now
     self.token = User.make_token()
   end
-  
-  def pass_crypt=(str) 
-    write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
-  end
 
-  def pass_crypt_confirmation=(str) 
-    write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
+  def encrypt_password
+    self.pass_crypt = Digest::MD5.hexdigest(pass_crypt) if pass_crypt_confirmation
   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) 
     find(:first, :conditions => [ "token = ? ", token])
   end 
-  
+
   def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''
@@ -58,10 +57,13 @@ class User < ActiveRecord::Base
     el1['account_created'] = self.creation_time.xmlschema
     return el1
   end
-  
+
   def nearby(lat_range=1, lon_range=1)
-     
-      nearby = User.find(:all,  :conditions => "#{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and  #{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and data_public = 1") 
+      if self.home_lon and self.home_lat 
+          nearby = User.find(:all,  :conditions => "#{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and  #{self.home_lat} > home_lat - #{lat_range} and #{self.home_lat} < home_lat + #{lat_range} and data_public = 1 and id != #{self.id}") 
+      else
+          nearby = []
+      end
       return nearby
   end
 
@@ -74,14 +76,24 @@ class User < ActiveRecord::Base
   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
-    messages = Message.find(:all, :conditions => "message_read = 0")
+    messages = Message.find(:all, :conditions => "to_user_id = #{self.id}")
     return messages
   end
 
-  
+  def is_friends_with?(new_friend)
+    res = false
+    @new_friend = new_friend
+    self.friends.each do |friend|
+      if friend.user_id == @new_friend.user_id
+        return true
+      end
+    end
+    return false
+  end
+
 end