X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/960d13488a875245570ee498ee9a1ed7cac37bbe..6bc03625a1bea320f2dfb609d84bf6bc5bfed72a:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 5d26708fe..fa0adef56 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,47 +2,68 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image]
-  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image]
-  before_filter :check_database_availability, :except => [:api_details, :api_gpx_files]
-  before_filter :check_read_availability, :only => [:api_details, :api_gpx_files]
+  before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
+  before_filter :set_locale, :except => [:api_details, :api_gpx_files]
+  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
+  before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
+  before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
+  before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
   def save
-    @title = 'create account'
-    @user = User.new(params[:user])
+    @title = t 'user.new.title'
 
-    @user.data_public = true
-      
-    if @user.save
-      token = @user.tokens.create
-      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, token)
-      redirect_to :action => 'login'
-    else
+    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
+    else
+      @user = User.new(params[:user])
+
+      @user.visible = true
+      @user.data_public = true
+      @user.description = "" if @user.description.nil?
+      @user.creation_ip = request.remote_ip
+      @user.languages = request.user_preferred_languages
+
+      if @user.save
+        flash[:notice] = t 'user.new.flash create success message'
+        Notifier.deliver_signup_confirm(@user, @user.tokens.create)
+        redirect_to :action => 'login'
+      else
+        render :action => 'new'
+      end
     end
   end
 
   def account
-    @title = 'edit account'
+    @title = t 'user.account.title'
+
     if params[:user] and params[:user][:display_name] and params[:user][:description]
-      home_lat =  params[:user][:home_lat]
-      home_lon =  params[:user][:home_lon]
+      if params[:user][:email] != @user.email
+        @user.new_email = params[:user][:email]
+      end
 
       @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
-      @user.home_lon = home_lon
+      @user.languages = params[:user][:languages].split(",")
+      @user.home_lat = params[:user][:home_lat]
+      @user.home_lon = params[:user][:home_lon]
+
       if @user.save
-        flash[:notice] = "User information updated successfully."
-      else
-        flash.delete(:notice)
+        set_locale
+
+        if params[:user][:email] == @user.new_email
+          flash[:notice] = t 'user.account.flash update success confirm needed'
+          Notifier.deliver_email_confirm(@user, @user.tokens.create)
+        else
+          flash[:notice] = t 'user.account.flash update success'
+        end
       end
     end
   end
@@ -52,7 +73,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] = "Home location saved successfully."
+        flash[:notice] = t 'user.set_home.flash success'
         redirect_to :controller => 'user', :action => 'account'
       end
     end
@@ -61,28 +82,29 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
-    flash[:notice] = 'All your edits are now public.'
+    flash[:notice] = t 'user.go_public.flash success'
     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
-    @title = 'lost password'
+    @title = t 'user.lost_password.title'
+
     if params[:user] and params[:user][:email]
-      user = User.find_by_email(params[:user][:email])
+      user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
+
       if user
         token = user.tokens.create
-        Notifier::deliver_lost_password(user, token)
-        flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+        Notifier.deliver_lost_password(user, token)
+        flash[:notice] = t 'user.lost_password.notice email on way'
       else
-        flash[:notice] = "Couldn't find that email address, sorry."
+        flash[:notice] = t 'user.lost_password.notice email cannot find'
       end
-    else
-      render :action => 'lost_password'
     end
   end
 
   def reset_password
-    @title = 'reset password'
+    @title = t 'user.reset_password.title'
+
     if params['token']
       token = UserToken.find_by_token(params[:token])
       if token
@@ -91,23 +113,40 @@ class UserController < ApplicationController
         user.pass_crypt = pass
         user.pass_crypt_confirmation = pass
         user.active = true
+        user.email_valid = true
         user.save!
         token.destroy
-        Notifier::deliver_reset_password(user, pass)
-        flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
+        Notifier.deliver_reset_password(user, pass)
+        flash[:notice] = t 'user.reset_password.flash changed check mail'
       else
-        flash[:notice] = "Didn't find that token, check the URL maybe?"
+        flash[:notice] = t 'user.reset_password.flash token bad'
       end
     end
+
     redirect_to :action => 'login'
   end
 
   def new
-    @title = 'create account'
+    @title = t 'user.new.title'
+
+    # The user is logged in already, so don't show them the signup page, instead
+    # send them to the home page
+    redirect_to :controller => 'site', :action => 'index' if session[:user]
   end
 
   def login
-    @title = 'login'
+    if session[:user]
+      # The user is logged in already, if the referer param exists, redirect them to that
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'site', :action => 'index'
+      end
+      return
+    end
+
+    @title = t 'user.login.title'
+
     if params[:user]
       email_or_display_name = params[:user][:email]
       pass = params[:user][:password]
@@ -121,9 +160,9 @@ class UserController < ApplicationController
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+        @notice = t 'user.login.account not active'
       else
-        flash[:notice] = "Sorry, couldn't log in with those details."
+        @notice = t 'user.login.auth failure'
       end
     end
   end
@@ -150,13 +189,34 @@ class UserController < ApplicationController
       if token and !token.user.active?
         @user = token.user
         @user.active = true
+        @user.email_valid = true
+        @user.save!
+        token.destroy
+        flash[:notice] = t 'user.confirm.success'
+        session[:user] = @user.id
+        redirect_to :action => 'account', :display_name => @user.display_name
+      else
+        @notice = t 'user.confirm.failure'
+      end
+    end
+  end
+
+  def confirm_email
+    if params[:confirm_action]
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token and token.user.new_email?
+        @user = token.user
+        @user.email = @user.new_email
+        @user.new_email = nil
+        @user.active = true
+        @user.email_valid = true
         @user.save!
         token.destroy
-        flash[:notice] = 'Confirmed your account, thanks for signing up!'
+        flash[:notice] = t 'user.confirm_email.success'
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
-        flash[:notice] = 'Something went wrong confirming that user.'
+        @notice = t 'user.confirm_email.failure'
       end
     end
   end
@@ -167,6 +227,12 @@ class UserController < ApplicationController
     redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
   end
 
+  def delete_image
+    @user.image = nil
+    @user.save!
+    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+  end
+
   def api_details
     render :text => @user.to_xml.to_s, :content_type => "text/xml"
   end
@@ -180,7 +246,7 @@ class UserController < ApplicationController
   end
 
   def view
-    @this_user = User.find_by_display_name(params[:display_name])
+    @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
     if @this_user
       @title = @this_user.display_name
@@ -193,20 +259,21 @@ class UserController < ApplicationController
   def make_friend
     if params[:display_name]     
       name = params[:display_name]
-      new_friend = User.find_by_display_name(name)
+      new_friend = User.find_by_display_name(name, :conditions => {:visible => true})
       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id
       unless @user.is_friends_with?(new_friend)
         if friend.save
-          flash[:notice] = "#{name} is now your friend."
-          Notifier::deliver_friend_notification(friend)
+          flash[:notice] = t 'user.make_friend.success', :name => name
+          Notifier.deliver_friend_notification(friend)
         else
-          friend.add_error("Sorry, failed to add #{name} as a friend.")
+          friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else
-        flash[:notice] = "You are already friends with #{name}."  
+        flash[:notice] = t 'user.make_friend.already_a_friend', :name => name
       end
+
       redirect_to :controller => 'user', :action => 'view'
     end
   end
@@ -214,16 +281,15 @@ class UserController < ApplicationController
   def remove_friend
     if params[:display_name]     
       name = params[:display_name]
-      friend = User.find_by_display_name(name)
+      friend = User.find_by_display_name(name, :conditions => {:visible => true})
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
-        flash[:notice] = "#{friend.display_name} was removed from your friends."
+        flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       else
-        flash[:notice] = "#{friend.display_name} was not already one of your friends."
+        flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
       end
+
       redirect_to :controller => 'user', :action => 'view'
     end
   end
-
 end
-