X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7bcda2794f144dc2f1715a290a03df79c4010db8..a187c759b7d96be951e1667080c6e24e2288f166:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 60b83cc89..f12cb1051 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -28,7 +28,7 @@ class UserController < ApplicationController
       @user.home_lat = home_lat.to_f
       @user.home_lon = home_lon.to_f
       if @user.save
-        flash[:notice] = "User edited OK."
+        flash[:notice] = "User information updated successfully."
         redirect_to :controller => 'user', :action => 'account'
       end
     end
@@ -39,7 +39,7 @@ class UserController < ApplicationController
       @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."
+        flash[:notice] = "Home location saved successfully."
         redirect_to :controller => 'user', :action => 'account'
       end
     end
@@ -48,21 +48,23 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
-    flash[:notice] = 'All your edits are now public'
-    redirect_to :controller => 'user', :action => 'account'
+    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] and 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."
+        flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end
+    else
+      render :action => 'lost_password'
     end
   end
 
@@ -72,9 +74,10 @@ class UserController < ApplicationController
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass
+        user.pass_crypt_confirmation = 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 :-)"
+        flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
       else
         flash[:notice] = "Didn't find that token, check the URL maybe?"
       end
@@ -95,10 +98,14 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
-        redirect_to :controller => 'site', :action => 'index'
+        if params[:next_controller] and params[:next_action]
+          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        else
+          redirect_to :controller => 'site', :action => 'index'
+        end
         return
       else
-        flash[:notice] = "Couldn't log in with those details"
+        flash[:notice] = "Sorry, couldn't log in with those details."
       end
     end
   end
@@ -113,7 +120,11 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
-    redirect_to :controller => 'site', :action => 'index'
+    if params[:next_controller] and params[:next_action]
+      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    else
+      redirect_to :controller => 'site', :action => 'index'
+    end
   end
 
   def confirm
@@ -127,7 +138,7 @@ class UserController < ApplicationController
 
       redirect_to :action => 'login'
     else
-      flash[:notice] = 'Something went wrong confirming that user'
+      flash[:notice] = 'Something went wrong confirming that user.'
     end
   end
 
@@ -172,12 +183,12 @@ class UserController < ApplicationController
       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"
+          flash[:notice] = "#{name} is now your friend."
         else
-          friend.add_error("adding a friend failed")
+          friend.add_error("Sorry, failed to add #{name} as a friend.")
         end
       else
-        flash[:notice] = "Your are already friends"  
+        flash[:notice] = "You are already friends with #{name}."  
       end
         redirect_to :controller => 'user', :action => 'view'
     end