lost_password option checking in account controller

git-svn-id: http://redmine.rubyforge.org/svn/trunk@236 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-02-04 15:55:29 +00:00
parent 2b7c31feb5
commit d185e2f9e0
1 changed files with 2 additions and 1 deletions

View File

@ -22,7 +22,7 @@ class AccountController < ApplicationController
# prevents login action to be filtered by check_if_login_required application scope filter # prevents login action to be filtered by check_if_login_required application scope filter
skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register] skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
before_filter :require_login, :except => [:show, :login, :lost_password, :register] before_filter :require_login, :only => :logout
# Show user's account # Show user's account
def show def show
@ -57,6 +57,7 @@ class AccountController < ApplicationController
# Enable user to choose a new password # Enable user to choose a new password
def lost_password def lost_password
redirect_to :controller => 'welcome' and return unless Setting.lost_password?
if params[:token] if params[:token]
@token = Token.find_by_action_and_value("recovery", params[:token]) @token = Token.find_by_action_and_value("recovery", params[:token])
redirect_to :controller => 'welcome' and return unless @token and !@token.expired? redirect_to :controller => 'welcome' and return unless @token and !@token.expired?