Update the postcode code to do a npemap lookup, rather than a FTP one

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 599521265cc9cb8c4ed3121718c93fa57179d9e4..3837d097609512816176798d7d7339d72d011c8a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,9 +1,9 @@
 class UserController < ApplicationController
   layout 'site'
 
 class UserController < ApplicationController
   layout 'site'
 

-  before_filter :authorize, :only => :preferences
-  before_filter :authorize_web, :only => [:rename, :account]
-  before_filter :require_user, :only => [:account, :display_name_edit]
+  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])
  
   def save
     @user = User.new(params[:user])


@@ -18,16 +18,24 @@ class UserController < ApplicationController
     end
   end
 
     end
   end
 

-  def rename
-    if params[:user] and params[:user][:display_name]
+  def edit
+    if params[:user] and params[:user][:display_name] and params[:user][:description]

       @user.display_name = params[:user][:display_name]
       @user.display_name = params[:user][:display_name]

+      @user.description = params[:user][:description]

       if @user.save
       if @user.save

-        flash[:notice] = "User display name updated OK."
+        flash[:notice] = "User edited OK."

         redirect_to :controller => 'user', :action => 'account'
       end
     end
   end
 
         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'])
   def lost_password
     if params['user']['email']
       user = User.find_by_email(params['user']['email'])


@@ -118,5 +126,27 @@ class UserController < ApplicationController
       render :status => 400, :nothing => true
     end
   end
       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
 
 end