fixed up a series of things in prepration for the stress test on friday

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

diff --git a/app/models/token.rb b/app/models/token.rb
index 4ed9598f15cddc4888a4c32612269ad3f0f124d2..2a436300afda78b35a664606fbace4f25091eeb1 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -1,11 +1,19 @@
-class Token < ActiveRecord::Base
-  belongs_to :vote 
+# 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
+  
   def initialize
     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