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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 4a4d4d855..64e1e157d 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, :make_friend]
+  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend]
 
-  
   def save
     @user = User.new(params[:user])
     @user.set_defaults
@@ -17,24 +17,43 @@ 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]
+      home_lat =  params[:user][:home_lat]
+      home_lon =  params[:user][:home_lon]
+
+      @user.display_name = params[:user][:display_name]
+      @user.description = params[:user][:description]
+      @user.home_lat = home_lat.to_f
+      @user.home_lon = home_lon.to_f
       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
+    end
+  end
+
+  def set_home
+    if params[:user][:home_lat] and params[:user][:home_lon]
+      @user.home_lat = params[:user][:home_lat].to_f
+      @user.home_lon = params[:user][:home_lon].to_f
+      if @user.save
+        flash[:notice] = "User home saved."
+        redirect_to :controller => 'user', :action => 'account'
       end
-    else
-      flash[:notice] = 'not logged in'
     end
-    redirect_to :back
+  end
+
+  def go_public
+    @user.data_public = true
+    @user.save
+    flash[:notice] = 'All your edits are now public'
+    redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
-    if params['user']['email']
+    if params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
@@ -123,5 +142,46 @@ 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
+
+  def make_friend
+
+    if params[:display_name]     
+      name = params[:display_name]
+      friend = Friend.new
+      friend.user_id = @user.id
+      friend.friend_user_id = User.find_by_display_name(name).id 
+      unless @user.is_friends_with?(friend)
+        if friend.save
+          flash[:notice] = "#{name} is now your friend"
+        else
+          friend.add_error("adding a friend failed")
+        end
+      else
+        flash[:notice] = "Your are already friends"  
+      end
+        redirect_to :controller => 'user', :action => 'view'
+    end
+  end
+
 end