Cope with results from the OSM Namefinder that have no name.

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 3f6e4e3b7e269dc0c573254f65cea3cd3acce867..0042be316d1cc8e2428d656b348e3dfedf27061a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,9 +1,11 @@
 class UserController < ApplicationController
   layout 'site'
 
 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 :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]

-  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :api_details]
+  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'
 
   def save
     @title = 'create account'


@@ -156,21 +158,8 @@ class UserController < ApplicationController
     end
   end
 
     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 :nothing => true, :status => :method_not_allowed
-    end
-  end
-

   def api_details
   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
   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
     @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
   end
 
   def view