X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/97978ceeb9047ec6894b822ca947a466c2462988..1cf9e2ed19b5190e8c4bd2b0c07be4b56097a935:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index d61455bf1..3837d0976 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,11 +1,16 @@
 class UserController < ApplicationController
+  layout 'site'
 
+  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
 
     if @user.save
-      flash[:notice] = 'Users was successfully created.'
+      flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)'
       Notifier::deliver_signup_confirm(@user)
       redirect_to :action => 'login'
     else
@@ -13,8 +18,55 @@ class UserController < ApplicationController
     end
   end
 
+  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 edited 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'])
+      if user
+        user.token = User.make_token
+        user.save
+        Notifier::deliver_lost_password(user)
+        flash[:notice] = "Sorry you lost it :-( but an email is on it's way so you can reset it soon."
+      else
+        flash[:notice] = "Couldn't find that email address, sorry."
+      end
+    end
+  end
+
+  def reset_password
+    if params['token']
+      user = User.find_by_token(params['token'])
+      if user
+        pass = User.make_token(8)
+        user.pass_crypt = pass
+        user.save
+        Notifier::deliver_reset_password(user, pass)
+        flash[:notice] = "You're password has been changed and is on the way to your mailbox :-)"
+      else
+        flash[:notice] = "Didn't find that token, check the URL maybe?"
+      end
+    end
+    redirect_to :action => 'login'
+  end
+
   def new
-    render :layout => 'site'
   end
 
   def login
@@ -29,10 +81,10 @@ class UserController < ApplicationController
         session[:token] = u.token
         redirect_to :controller => 'site', :action => 'index'
         return
+      else
+        flash[:notice] = "Couldn't log in with those details"
       end
     end
-
-    render :layout => 'site'
   end
 
   def logout
@@ -53,7 +105,7 @@ class UserController < ApplicationController
     if @user && @user.active == 0
       @user.active = true
       @user.save
-      flash[:notice] = 'Confirmed your account'
+      flash[:notice] = 'Confirmed your account, thanks for signing up!'
 
       #FIXME: login the person magically
 
@@ -63,4 +115,38 @@ 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
+
+  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
+