gpx import now fully works

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 589546e2d6c97c05e11a366ec0621e2aa50fcf68..780e0caafb8f9ca6dbae2f7c4779eae6114a3d6d 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,43 +1,59 @@
-require 'digest/md5'
-
 class User < ActiveRecord::Base
+  require 'xml/libxml'
+  require 'digest/md5'
+
   has_many :traces
 
   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_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
 
   def set_defaults
     self.creation_time = Time.now
     self.timeout = Time.now
-    self.token = make_token()
+    self.token = User.make_token()
   end
   
   def pass_crypt=(str) 
     write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
-  end 
+  end
 
   def pass_crypt_confirmation=(str) 
     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
   end 
 
-  def self.authenticate(email, passwd) 
-    find_first([ "email = ? AND pass_crypt =?", email, Digest::MD5.hexdigest(passwd) ])
+  def self.authenticate_token(token) 
+    find(:first, :conditions => [ "token = ? ", token])
   end 
   
-  private
-  def make_token
+  def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''
 
-    30.times do
+    length.times do
       confirmstring += chars[(rand * chars.length).to_i].chr
     end
 
     return confirmstring
   end
 
+  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
+    return el1
+  end
 end