X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f864203056d2988b46b202f2cc00783378ee140a..60a294c40e341af16fa2eac6de5df2b0917a74be:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index c0468f8b0..cd0623bc1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,13 +1,15 @@ -require 'digest/md5' - class User < ActiveRecord::Base - has_many :traces + require 'xml/libxml' + require 'digest/md5' + has_many :traces + has_many :diary_entries + 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 @@ -18,18 +20,18 @@ class User < ActiveRecord::Base 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) - find_first([ "email = ? AND pass_crypt =?", email, Digest::MD5.hexdigest(passwd) ]) + end + + def self.authenticate(email, passwd) + find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)]) end def self.authenticate_token(token) - find_first([ "token = ? ", token]) + find(:first, :conditions => [ "token = ? ", token]) end def self.make_token(length=30) @@ -43,4 +45,22 @@ class User < ActiveRecord::Base 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 + + def get_nearby_users + end + + + end