Fixed error handling in the name search and tidied things up a bit.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 998a636c1b11f6d1853d9b62771d901fe7ed78e8..80402f6776e7b873901da2583b29e47b990c829c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -5,6 +5,8 @@ class UserController < ApplicationController
   before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :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]
 

+  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
+

   def save
     @title = 'create account'
     @user = User.new(params[:user])
   def save
     @title = 'create account'
     @user = User.new(params[:user])


@@ -165,12 +167,12 @@ class UserController < ApplicationController
       @user.save!
       render :nothing => true
     else
       @user.save!
       render :nothing => true
     else

-      render :status => 400, :nothing => true
+      render :nothing => true, :status => :method_not_allowed

     end
   end
 
   def api_details
     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
   end
 
   def api_gpx_files


@@ -178,7 +180,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


@@ -186,11 +188,6 @@ class UserController < ApplicationController
     @title = @this_user.display_name
   end
 
     @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]     
   def make_friend
 
     if params[:display_name]