diff app/models/token.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/app/models/token.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/models/token.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,16 +1,16 @@
 # Redmine - project management software
-# Copyright (C) 2006-2009  Jean-Philippe Lang
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -18,30 +18,30 @@
 class Token < ActiveRecord::Base
   belongs_to :user
   validates_uniqueness_of :value
-  
-  before_create :delete_previous_tokens
-  
+
+  before_create :delete_previous_tokens, :generate_new_token
+
   @@validity_time = 1.day
-  
-  def before_create
+
+  def generate_new_token
     self.value = Token.generate_token_value
   end
 
-  # Return true if token has expired  
+  # Return true if token has expired
   def expired?
     return Time.now > self.created_on + @@validity_time
   end
-  
+
   # Delete all expired tokens
   def self.destroy_expired
     Token.delete_all ["action <> 'feeds' AND created_on < ?", Time.now - @@validity_time]
   end
-  
+
 private
   def self.generate_token_value
     ActiveSupport::SecureRandom.hex(20)
   end
-  
+
   # Removes obsolete tokens (same user and action)
   def delete_previous_tokens
     if user