attempt fix for anon users

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 1a12790420a899473de6c4c56fc890a0874e0fd5..4eba73a9f9aa12d7b0666a5f51353b5f584798b7 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,45 +1,105 @@
-require 'digest/md5'
-

 class User < ActiveRecord::Base
 class User < ActiveRecord::Base

+  require 'xml/libxml'
+

   has_many :traces
   has_many :traces

+  has_many :diary_entries, :order => 'created_at DESC'
+  has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
+  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0", :order => 'sent_on DESC'
+  has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :order => 'sent_on DESC'
+  has_many :friends
+  has_many :tokens, :class_name => "UserToken"
+  has_many :preferences, :class_name => "UserPreference"

 
 

+  validates_presence_of :email, :display_name
+  validates_confirmation_of :email, :message => 'Email addresses must match'

   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'

-  validates_uniqueness_of :display_name
+  validates_uniqueness_of :display_name, :allow_nil => true

   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :minimum => 8
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :minimum => 8

-  validates_length_of :display_name, :minimum => 3
+  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 :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i

+  validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+  validates_numericality_of :home_lat, :allow_nil => true
+  validates_numericality_of :home_lon, :allow_nil => true
+  validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
+
+  before_save :encrypt_password

 
 

-  def set_defaults
-    self.creation_time = Time.now
-    self.timeout = Time.now
-    self.token = make_token()
+  def after_initialize
+    self.creation_time = Time.now if self.creation_time.nil?

   end
   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)) 
-  end 
+  def encrypt_password
+    if pass_crypt_confirmation
+      self.pass_salt = OSM::make_token(8)
+      self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt)
+    end
+  end
+
+  def self.authenticate(options)
+    if options[:username] and options[:password]
+      user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
+      user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
+    elsif options[:token]
+      token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])
+      user = token.user if token
+    end
+
+    if user
+      user = nil unless user.active? or options[:inactive]
+    end

 
 

-  def self.authenticate(email, passwd) 
-    find_first([ "email = ? AND pass_crypt =?", 
-               email, 
-               Digest::MD5.hexdigest(passwd) ]) 
+    token.update_attribute(:expiry, 1.week.from_now) if token and user
+
+    return user

   end 
   end 

-  
-  private
-  def make_token
-    chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-    confirmstring = ''
-
-    30.times do
-      confirmstring += chars[(rand * chars.length).to_i].chr
+
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+
+  def to_xml_node
+    el1 = XML::Node.new 'user'
+    el1['display_name'] = self.display_name.to_s
+    el1['account_created'] = self.creation_time.xmlschema
+    if self.home_lat and self.home_lon
+      home = XML::Node.new 'home'
+      home['lat'] = self.home_lat.to_s
+      home['lon'] = self.home_lon.to_s
+      home['zoom'] = self.home_zoom.to_s
+      el1 << home

     end
     end

+    return el1
+  end

 
 

-    return confirmstring
+  def nearby(radius = 50, num = 10)
+    if self.home_lon and self.home_lat 
+      gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
+      bounds = gc.bounds(radius)
+      nearby = User.find(:all, :conditions => "home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = 1 and id != #{self.id}")
+      nearby.delete_if { |u| gc.distance(u.home_lat, u.home_lon) > radius }
+      nearby.sort! { |u1,u2| gc.distance(u1.home_lat, u1.home_lon) <=> gc.distance(u2.home_lat, u2.home_lon) }
+    else
+      nearby = []
+    end
+    return nearby.first(num)
+  end
+
+  def distance(nearby_user)
+    return OSM::GreatCircle.new(self.home_lat, self.home_lon).distance(nearby_user.home_lat, nearby_user.home_lon)
+  end
+
+  def is_friends_with?(new_friend)
+    res = false
+    @new_friend = new_friend
+    self.friends.each do |friend|
+      if friend.friend_user_id == @new_friend.id
+        return true
+      end
+    end
+    return false

   end
 
 end
   end
 
 end