updated the git ignore file

[selectricity-live] / app / models / token.rb

diff --git a/app/models/token.rb b/app/models/token.rb
index e9f4fd637b94e2e91f533e4a0c1925e803c883d4..2a436300afda78b35a664606fbace4f25091eeb1 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# 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
   


@@ -5,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