summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-21 01:58:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-21 01:58:11 +0000
commit04fe3babc167a3be73de693e4bcde87ba05967c9 (patch)
tree60dfd90211d7f14ff8d1df82d6143477c114fbfa
parente86f9711b9eb76d1e384f0ed828ac4a173260ef6 (diff)
downloadredmine-04fe3babc167a3be73de693e4bcde87ba05967c9.tar.gz
redmine-04fe3babc167a3be73de693e4bcde87ba05967c9.zip
remove trailing white-spaces from app/models/token.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6508 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/token.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/models/token.rb b/app/models/token.rb
index b59d4f287..c6d6f3b90 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -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
-
+
@@validity_time = 1.day
-
+
def before_create
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