X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/791814d74ed95e758f848c38b63d41d3f1b30553..8edf08405db64afcd1207a9f1d33039ea1e23cfb:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 2b695ce7a..f3ec2e243 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,6 +1,10 @@
 class UserController < ApplicationController
   layout 'site'
-  
+
+  before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
+  before_filter :authorize_web, :only => [:rename, :account, :go_public]
+  before_filter :require_user, :only => [:rename, :account, :go_public]
+ 
   def save
     @user = User.new(params[:user])
     @user.set_defaults
@@ -14,6 +18,23 @@ class UserController < ApplicationController
     end
   end
 
+  def rename
+    if params[:user] and params[:user][:display_name]
+      @user.display_name = params[:user][:display_name]
+      if @user.save
+        flash[:notice] = "User display name updated OK."
+        redirect_to :controller => 'user', :action => 'account'
+      end
+    end
+  end
+
+  def go_public
+    @user.data_public = true
+    @user.save
+    flash[:notice] = 'All your edits are now public'
+    redirect_to :controller => 'user', :action => 'account'
+  end
+
   def lost_password
     if params['user']['email']
       user = User.find_by_email(params['user']['email'])
@@ -93,4 +114,28 @@ class UserController < ApplicationController
     end
   end
 
+  def 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
+  end
+
+  def api_gpx_files
+    doc = OSM::API.new.get_xml_doc
+    @user.traces.each do |trace|
+      doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+    end
+    render :text => doc.to_s
+  end
 end
+