X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b240b982b0c0c1f786054f0c472353cb2e85d10..e6af088dda8e85f53b11ffbaddb11edf08e4a046:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0c10980ef..998a636c1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,15 +2,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, :make_friend]
-  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend]
+  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
+  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
 
   def save
+    @title = 'create account'
     @user = User.new(params[:user])
     @user.set_defaults
 
     if @user.save
-      flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)'
+      flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."
       Notifier::deliver_signup_confirm(@user)
       redirect_to :action => 'login'
     else
@@ -18,18 +19,24 @@ class UserController < ApplicationController
     end
   end
 
-  def edit
+  def account
+    @title = 'edit account'
     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]
+      if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
+        @user.pass_crypt = params[:user][:pass_crypt]
+        @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+      end
       @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 information updated successfully."
-        redirect_to :controller => 'user', :action => 'account'
+      else
+        flash.delete(:notice)
       end
     end
   end
@@ -53,6 +60,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
+    @title = 'lost password'
     if params[:user] and params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
@@ -69,11 +77,14 @@ class UserController < ApplicationController
   end
 
   def reset_password
+    @title = 'reset password'
     if params['token']
       user = User.find_by_token(params['token'])
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass
+        user.pass_crypt_confirmation = pass
+        user.active = true
         user.save
         Notifier::deliver_reset_password(user, pass)
         flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
@@ -85,9 +96,11 @@ class UserController < ApplicationController
   end
 
   def new
+    @title = 'create account'
   end
 
   def login
+    @title = 'login'
     if params[:user]
       email = params[:user][:email]
       pass = params[:user][:password]
@@ -97,12 +110,14 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
-        if params[:next_controller] and params[:next_action]
-          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        if params[:referer]
+          redirect_to params[:referer]
         else
           redirect_to :controller => 'site', :action => 'index'
         end
         return
+      elsif User.authenticate(email, pass, false)
+        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       else
         flash[:notice] = "Sorry, couldn't log in with those details."
       end
@@ -119,8 +134,8 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
-    if params[:next_controller] and params[:next_action]
-      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    if params[:referer]
+      redirect_to params[:referer]
     else
       redirect_to :controller => 'site', :action => 'index'
     end
@@ -130,18 +145,19 @@ class UserController < ApplicationController
     @user = User.find_by_token(params[:confirm_string])
     if @user && @user.active == 0
       @user.active = true
+      @user.token = User.make_token
+      @user.timeout = 1.day.from_now
       @user.save
       flash[:notice] = 'Confirmed your account, thanks for signing up!'
-
-      #FIXME: login the person magically
-
-      redirect_to :action => 'login'
+      session[:token] = @user.token
+      redirect_to :action => 'account', :display_name => @user.display_name
     else
       flash[:notice] = 'Something went wrong confirming that user.'
     end
   end
 
   def preferences
+    @title = 'preferences'
     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?
@@ -167,10 +183,12 @@ class UserController < ApplicationController
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])
+    @title = @this_user.display_name
   end
 
   def diary
     @this_user = User.find_by_display_name(params[:display_name])
+    @title = @this_user.display_name + "'s diary"
   end
 
   def make_friend
@@ -189,7 +207,7 @@ class UserController < ApplicationController
       else
         flash[:notice] = "You are already friends with #{name}."  
       end
-        redirect_to :controller => 'user', :action => 'view'
+      redirect_to :controller => 'user', :action => 'view'
     end
   end