X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2709027882c3f36a1d6a442c2c4b706b54b1edeb..61ae5e7af0dd759ddb1acfcea10adcbede9da58c:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 4a4d4d855..b2ac3072c 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,10 +1,10 @@
 class UserController < ApplicationController
   layout 'site'
 
-  before_filter :authorize, :only => :preferences
-  before_filter :authorize_web, :only => :rename
-
-  
+  before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
+  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary]
+  before_filter :require_user, :only => [:edit, :account, :go_public]
+ 
   def save
     @user = User.new(params[:user])
     @user.set_defaults
@@ -17,20 +17,35 @@ class UserController < ApplicationController
       render :action => 'new'
     end
   end
-  
-  def rename
-    new_name = params['display_name']
-    if @user
-      @user.display_name = new_name
+
+  def edit
+    if params[:user] and params[:user][:display_name] and params[:user][:description]
+      @user.display_name = params[:user][:display_name]
+      @user.description = params[:user][:description]
       if @user.save
-        flash[:notice] = "User display name updated OK."
-      else
-        flash[:notice] = "Rename failed: #{ @user.errors.full_messages.join('; ') }."
+        flash[:notice] = "User edited OK."
+        redirect_to :controller => 'user', :action => 'account'
       end
-    else
-      flash[:notice] = 'not logged in'
     end
-    redirect_to :back
+  end
+
+  def set_home
+    if params[:user][:home_lat] and params[:user][:home_lon]
+    lat = params[:user][:home_lat]
+    lon = params[:user][:home_lon]
+    unless 
+      #check the lat and lon
+    end
+    #make an api request to insert a new node
+    #get the onde id
+    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
@@ -123,5 +138,27 @@ class UserController < ApplicationController
       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
+
+  def view
+    @this_user = User.find_by_display_name(params[:display_name])
+  end
+
+  def diary
+    @this_user = User.find_by_display_name(params[:display_name])
+  end
+
+
 end