Adds token finder methods.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11374 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-14 21:47:07 +00:00
parent adb4a575dc
commit 812da860b3
3 changed files with 75 additions and 6 deletions
@@ -51,7 +51,7 @@ class AccountController < ApplicationController
  def lost_password
    (redirect_to(home_url); return) unless Setting.lost_password?
    if params[:token]
-      @token = Token.find_by_action_and_value("recovery", params[:token].to_s)
+      @token = Token.find_token("recovery", params[:token].to_s)
      if @token.nil? || @token.expired?
        redirect_to home_url
        return
@@ -140,7 +140,7 @@ class AccountController < ApplicationController
  # Token based account activation
  def activate
    (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?
-    token = Token.find_by_action_and_value('register', params[:token].to_s)
+    token = Token.find_token('register', params[:token].to_s)
    (redirect_to(home_url); return) unless token and !token.expired?
    user = token.user
    (redirect_to(home_url); return) unless user.registered?