merged in from code from the other master

diff --combined app/controllers/voter_controller.rb
index 5d729a6752800f7f799666b3c45d3bc38ceca375,afc01039b8e535b7733844f44bf0b5429ed64b2e..408bdab880ec0f411a1d19f8eea0261f3b5d1d02
--- 1/app/controllers/voter_controller.rb
--- 2/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@@ -2,8 -2,19 +2,8 @@@
  # 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 VoterController < ApplicationController
    helper :sparklines
@@@ -12,9 -23,6 +12,9 @@@
    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])
@@@ -22,7 -30,8 +22,7 @@@
          @voter = OpenVoter.find(:all,
            :conditions => ["session_id = ? and election_id = ?",
            session.session_id, @election.id])[0]
 -      
 -
 +     
          @voter = OpenVoter.new unless @voter
  
          @voter.election = @election
@@@ -54,24 -63,18 +54,24 @@@
        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
@@@ -83,37 -86,64 +83,37 @@@
  
    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'
 -      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)
@@@ -123,100 -153,70 +123,101 @@@
    end
    
    def results
-     if @voter.election.early_results? \
-        or @voter.election.enddate < Time.now
 -    debugger
+     if authenticate and
+       (@voter.election.early_results? \
+        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'
 +    end
 +  end
 +
    private
    def authenticate
      password = params[:id]
      if password == "open"
        election = Election.find(params[:format])
  
 -      # double check to make sure the election is not authenticated
 -      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]
  
 -        # if the election is over, proceed
 -        if (not @voter) and (election.enddate < Time.now)
 -          @voter = OpenVoter.new
 -          @voter.election = election
 +        # 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) \
++        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