X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/f7e185abe92cf8a4590f32996c86d15b8309db86..19a1975ef6170d77997da210512b370cc883af64:/app/controllers/voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index d7f589d..78f9a0c 100644
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -31,6 +31,7 @@ class VoterController < ApplicationController
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
       
+
         @voter = OpenVoter.new unless @voter
 
         @voter.election = @election
@@ -127,16 +128,18 @@ class VoterController < ApplicationController
 
   def confirm
     if authenticate
-      @voter.vote.confirm!
-
-      if @voter.election.embeddable? and params[:embed] == "true" \
-        and @voter.election.early_results?
-        redirect_to :action => :results, :id => @password, :embed => 'true'
+      if @voter.vote.confirm!
+        if @voter.election.embeddable? and params[:embed] == "true" \
+          and @voter.election.early_results?
+          redirect_to :action => :results, :id => @password, :embed => 'true'
+        else
+          render :action => 'thanks'
+        end
       else
-        render :action => 'thanks'
+        redirect_to :action => 'index'
       end
     else
-      redirect_to :action => 'index'
+        redirect_to :action => 'index'
     end
   end
   
@@ -193,12 +196,22 @@ class VoterController < ApplicationController
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
+
+      # double check to make sure the election is not authenticated
       unless election.authenticated?
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
+
+        # if the election is over, proceed
+        if (not @voter) and (election.enddate < Time.now)
+          @voter = OpenVoter.new
+          @voter.election = election
+        end
+
         @password = "open." + election.id.to_s
       end
+
     else
       @voter = FullVoter.find(:all,
         :conditions => [ "password = ?", password ] )[0]