Make field names consistent with the account editing page.

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 7befa479ac547387f6da99f4457b702749fd0ede..d6cff0f25856e0cc8f65ab12677ac6c75f347ed9 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,6 +4,8 @@ class User < ActiveRecord::Base
 
   has_many :traces
   has_many :diary_entries
 
   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_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true


@@ -11,29 +13,28 @@ class User < ActiveRecord::Base
   validates_length_of :pass_crypt, :minimum => 8
   validates_length_of :display_name, :minimum => 3, :allow_nil => true
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
   validates_length_of :pass_crypt, :minimum => 8
   validates_length_of :display_name, :minimum => 3, :allow_nil => true
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i

+  validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+
+  before_save :encrypt_password

 
   def set_defaults
     self.creation_time = Time.now
     self.timeout = Time.now
     self.token = User.make_token()
   end
 
   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
   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 
   end 
 
   def self.authenticate_token(token) 
     find(:first, :conditions => [ "token = ? ", token])
   end 

-  
+

   def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''
   def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''


@@ -57,4 +58,43 @@ class User < ActiveRecord::Base
     el1['account_created'] = self.creation_time.xmlschema
     return el1
   end
     el1['account_created'] = self.creation_time.xmlschema
     return el1
   end

+
+  def nearby(lat_range=1, lon_range=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
+
+  def self.has_messages?
+    if Message.fdhjklsafind_by_to_user_id(self.id) 
+      return true
+    else
+      return false
+    end
+  end
+
+  def get_new_messages
+    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 => "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
 end