X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7058d836f75c845b7790c7ab6eb2f75844ce0c1c..e3d4948daaed75c1019ad5f6f719387bf95c3a82:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 80faf68e9..85d971316 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,8 @@
 class User < ActiveRecord::Base
   require 'xml/libxml'
 
+  belongs_to :language, :foreign_key => 'locale'
+  
   has_many :traces
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
@@ -9,6 +11,7 @@ class User < ActiveRecord::Base
   has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
+  has_many :changesets
 
   validates_presence_of :email, :display_name
   validates_confirmation_of :email, :message => 'Email addresses must match'
@@ -29,7 +32,7 @@ class User < ActiveRecord::Base
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize
-    self.creation_time = Time.now if self.creation_time.nil?
+    self.creation_time = Time.now.getutc if self.creation_time.nil?
   end
 
   def encrypt_password
@@ -105,4 +108,21 @@ class User < ActiveRecord::Base
     return false
   end
 
+  def trace_public_default
+    return self.preferences.find(:first, :conditions => {:k => "gps.trace.public", :v => "default"})
+  end
+
+  def delete
+    self.active = false
+    self.display_name = "user_#{self.id}"
+    self.description = ""
+    self.home_lat = nil
+    self.home_lon = nil
+    self.image = nil
+    self.email_valid = false
+    self.new_email = nil
+    self.visible = false
+    self.save
+  end
+
 end