X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/57a193789d1f48a856816c357483cfd7c621cd9d..99e1580f0d7707b8e2f8c08f8aae70c3d4906637:/app/controllers/voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index a912824..408bdab 100644
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -12,6 +12,9 @@ class VoterController < ApplicationController
   require_dependency "vote"
   require_dependency "election"
 
+  before_filter :authenticate, :except => [:index, :login, :reminder,
+                                           :kiosk_ready, :sort_candidates]
+
   def index
     if params[:election_id]
       @election = Election.find(params[:election_id])
@@ -20,9 +23,7 @@ class VoterController < ApplicationController
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
      
-        unless @voter and not @voter.election.kiosk
-          @voter = OpenVoter.new
-        end
+        @voter = OpenVoter.new unless @voter
 
         @voter.election = @election
         @voter.session_id = session.session_id
@@ -53,18 +54,24 @@ class VoterController < ApplicationController
       else
         @sidebar_content = render_to_string(:partial => 'vote_sidebar')
         if @election.embeddable? and params[:embed] == "true"
-          #look for custom theme, and assign to instance variabels for widget use
+          # look for custom theme, and assign to instance variabels
+          # for widget use
           if @election.embed_custom_string
             @top_bar = SkinPicture.find(:first,
-            :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])
+              :conditions => ["filename = ?",
+                @election.embed_custom_string + "top_bar.png"])
             @default_image = SkinPicture.find(:first,
-            :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"])
+              :conditions => ["filename = ?",
+                @election.embed_custom_string + "default_image.png"])
             @bg1 = SkinPicture.find(:first,
-            :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"])
+              :conditions => ["filename = ?",
+                @election.embed_custom_string + "bg1.png"])
             @bg2 = SkinPicture.find(:first,
-            :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"])
+              :conditions => ["filename = ?",
+                @election.embed_custom_string + "bg2.png"])
             @bottom_bar = SkinPicture.find(:first,
-            :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"])
+              :conditions => ["filename = ?",
+                @election.embed_custom_string + "bottom_bar.png"])
           end
           render :template => 'embed/full_vote', :layout => 'embed'
         else
@@ -76,66 +83,37 @@ class VoterController < ApplicationController
 
   def login
     if params[:vote] and params[:vote][:password]
-      redirect_to votepassword_url( :action => 'index', :urlpassword => params[:vote][:password])
+      redirect_to votepassword_url(:action => 'index',
+        :urlpassword => params[:vote][:password])
     else
       redirect_to :action => 'index'
     end
   end
   
-  def pref_tables
-    if authenticate
-      @election = @voter.election
-      @results = @election.results
-      @candidates = {}
-      @election.candidates.each {|c| @candidates[c.id] = c}
-      @names = @election.names_by_id
-      render :template => 'common/pref_tables', :layout => 'basic'
-    else
-      redirect_to :action => 'index'
-    end
-  end
-
-  def details
-    if authenticate
-      @election = @voter.election
-      @votes = @election.votes.select {|v| v.confirmed? }.shuffle
-      @voters = @votes.collect {|v| v.voter}.shuffle
-      render :action => 'details'
-    else
-      redirect_to :action => 'index'
-    end
-  end
-
   def review
-    if authenticate
-      @voter.vote.time = Time.now
-      @voter.vote.save
-      @voter.reload
-    else
-      redirect_to :action => 'index'
-    end
+    @voter.vote.time = Time.now
+    @voter.vote.save
+    @voter.reload
   end
 
   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'
-      elsif @voter.election.kiosk and params[:kiosk] = "true"
-        redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
-      else
-        render :action => 'thanks'
-      end
+    @voter.vote.confirm!
+
+    if @voter.election.embeddable? and params[:embed] == "true" \
+      and @voter.election.early_results?
+      redirect_to :action => :results, :id => @password, :embed => 'true'
+    elsif not(@voter.election.verifiable) \
+      and @voter.election.kiosk and params[:kiosk] == "true"
+      redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
     else
-      redirect_to :action => 'index'
+      render :action => 'thanks'
     end
   end
   
   def reminder
     if params[:email]
-      voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
+      voter_array= FullVoter.find(:all,
+        :conditions => ["email = ?", params[:email]])
       voter_array.delete_if {|voter| voter.election.active == 0}
       unless voter_array.empty?
         VoterNotify.deliver_reminder(voter_array)
@@ -150,40 +128,53 @@ class VoterController < ApplicationController
        or @voter.election.enddate < Time.now)
       
       @election = @voter.election
-      # compute and display results
-
-      @results = @election.results
-      @candidates = {}
-      @election.candidates.each {|c| @candidates[c.id] = c}
-      @names = @election.names_by_id
-        
-      @sidebar_content = render_to_string(:partial => 'results_sidebar')
-      #look for custom theme, and assign to instance variabels for widget use
+      @sidebar_content = \
+        render_to_string(:partial => 'full_results_sidebar')
+
+      # look for custom theme, and assign to instance variabels for
+      # widget use
       if @election.embed_custom_string
         @top_bar = SkinPicture.find(:first,
-        :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])
+          :conditions => ["filename = ?",
+            @election.embed_custom_string + "top_bar.png"])
         @default_image = SkinPicture.find(:first,
-        :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"])
+          :conditions => ["filename = ?",
+            @election.embed_custom_string + "default_image.png"])
         @bg1 = SkinPicture.find(:first,
-        :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"])
+          :conditions => ["filename = ?",
+            @election.embed_custom_string + "bg1.png"])
         @bg2 = SkinPicture.find(:first,
-        :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"])
+          :conditions => ["filename = ?",
+            @election.embed_custom_string + "bg2.png"])
         @bottom_bar = SkinPicture.find(:first,
-        :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"])
+          :conditions => ["filename = ?",
+            @election.embed_custom_string + "bottom_bar.png"])
       end
       if @election.embeddable? and params[:embed] == "true"
         render :template => 'embed/results', :layout => 'embed'
       else
-        render :action => 'results'
+        render :template => 'common/results'
       end
     else
       redirect_to :action => 'index'
     end
   end
  
+  def pref_tables
+    @election = @voter.election
+    render :template => 'common/pref_tables_wrapper', :layout => 'basic'
+  end
+
+  def details
+    @election = @voter.election
+    render :template => 'common/details'
+  end
+
   def kiosk_ready
+    reset_session
+
     if not authenticate
-      redirect_to :action => 'index', :kiosk => true
+      redirect_to :action => 'index'
     end
   end
 
@@ -192,18 +183,41 @@ class VoterController < ApplicationController
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
-      unless election.authenticated?
+
+      # if it's not actually open, lets redirect
+      if election.authenticated
+        redirect_to :action => 'index'
+      
+      # otherwise, lets see if they've before
+      else
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
+
+        # when (a) there is no voter or (b) when there is a voter but
+        # it's kiosk mode on the right page, rewrite with a blank voter
+        if ((not @voter) and  (election.enddate < Time.now)) \
+          or (params[:action] == 'kiosk_ready' and election.kiosk)
+          @voter = OpenVoter.new unless @voter
+        end
+
+        # now that we have a voter (one way or another), set things
+        # right
+        @voter.election = election
+        @voter.session_id = session.session_id
         @password = "open." + election.id.to_s
       end
+
     else
       @voter = FullVoter.find(:all,
         :conditions => [ "password = ?", password ] )[0]
-      @password = @voter.password
+
+      if @voter
+        @password = @voter.password
+      else
+        redirect_to :Action => 'index'
+      end
     end
-    @voter
   end
 end