moved over the git ignore file

[selectricity] / app / models / token.rb

diff --git a/app/models/token.rb b/app/models/token.rb
index aa432d659de0ca723569c22e2a9fab3e7a167310..2a436300afda78b35a664606fbace4f25091eeb1 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 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
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.

 
 class Token < ActiveRecord::Base 
   belongs_to :vote
 
 class Token < ActiveRecord::Base 
   belongs_to :vote


@@ -23,7 +12,8 @@ class Token < ActiveRecord::Base
     super
 
     token_generator = UniqueTokenGenerator.new( 16 )
     super
 
     token_generator = UniqueTokenGenerator.new( 16 )

-    until not token.empty? and Token.find(:all, :conditions => [ "token = ?", token ]).empty?
+    until token and not token.empty? \
+      and Token.find(:all, :conditions => [ "token = ?", token ]).empty? and token[0..3] != "open"

       self.token = token_generator.token
     end
 
       self.token = token_generator.token
     end