X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/235999b835b1b1aa5c715997bbfbf3f702cf3de1..8c8d55736f31d91454385990b690d26afafbf6f5:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 631da97d0..998a636c1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -6,11 +6,12 @@ class UserController < ApplicationController
   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
@@ -19,6 +20,7 @@ class UserController < ApplicationController
   end
 
   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]
@@ -58,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
@@ -74,6 +77,7 @@ class UserController < ApplicationController
   end
 
   def reset_password
+    @title = 'reset password'
     if params['token']
       user = User.find_by_token(params['token'])
       if user
@@ -92,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]
@@ -110,6 +116,8 @@ class UserController < ApplicationController
           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
@@ -149,6 +157,7 @@ class UserController < ApplicationController
   end
 
   def preferences
+    @title = 'preferences'
     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?
@@ -174,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
@@ -196,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