X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8c8d55736f31d91454385990b690d26afafbf6f5..d77e5f9d4d18f2eac88d0db69a1f460323618119:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 998a636c1..0042be316 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,10 +1,12 @@
 class UserController < ApplicationController
   layout 'site'
 
-  before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
+  before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
 
+  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
+
   def save
     @title = 'create account'
     @user = User.new(params[:user])
@@ -156,21 +158,8 @@ class UserController < ApplicationController
     end
   end
 
-  def preferences
-    @title = 'preferences'
-    if request.get?
-      render_text @user.preferences
-    elsif request.post? or request.put?
-      @user.preferences = request.raw_post
-      @user.save!
-      render :nothing => true
-    else
-      render :status => 400, :nothing => true
-    end
-  end
-
   def api_details
-    render :text => @user.to_xml.to_s
+    render :text => @user.to_xml.to_s, :content_type => "text/xml"
   end
 
   def api_gpx_files
@@ -178,7 +167,7 @@ class UserController < ApplicationController
     @user.traces.each do |trace|
       doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
     end
-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 
   def view
@@ -186,11 +175,6 @@ class UserController < ApplicationController
     @title = @this_user.display_name
   end
 
-  def diary
-    @this_user = User.find_by_display_name(params[:display_name])
-    @title = @this_user.display_name + "'s diary"
-  end
-
   def make_friend
 
     if params[:display_name]