X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/9cb3f02c2333ed806c8614a3f4509bd1cf346ddb..4446a6555bd54ca10a925340bb65c706678ac98e:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index b9c790f..cd16743 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -1,4 +1,23 @@ +# Selectricity: Voting Machinery for the Masses +# Copyright (C) 2007, 2008 Benjamin Mako Hill +# 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 +# . + class QuickvoteController < ApplicationController + helper :sparklines layout 'main' require_dependency "quick_voter" require_dependency "quick_vote" @@ -76,7 +95,7 @@ class QuickvoteController < ApplicationController end end flash.keep(:candidate_names) - render_partial 'candidate_list' + render :partial => 'candidate_list' end ############################################################# @@ -115,11 +134,12 @@ class QuickvoteController < ApplicationController @voter.reload end else - redirect_to :controller => 'site' + redirect_to :controller => 'front' end end def confirm + # we need the election to verify that we have the right voter election = QuickVote.ident_to_quickvote(params[:ident]) @@ -127,7 +147,7 @@ class QuickvoteController < ApplicationController @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] - + if not @voter # we have not seen this voter before. something is wrong, try # again @@ -139,18 +159,18 @@ class QuickvoteController < ApplicationController redirect_to quickvote_url( :ident => params[:ident] ) else + # record the ip address for posterity - @voter.ipaddress = request.env["REMOTE_ADDR"] + @voter.ipaddress = request.env["HTTP_X_FORWARDED_FOR"] @voter.save - # save the time the vote was made for statistical use - @voter.vote.time = Time.now - # toggle the confirmation bit - @voter.vote.confirm! - - @voter.reload - render :action => 'thanks' + if @voter.vote.confirm! + @voter.reload + render :action => 'thanks' + else + redirect_to :action => 'index' + end end end @@ -168,6 +188,7 @@ class QuickvoteController < ApplicationController @election=QuickVote.ident_to_quickvote(params[:id]) @election.voters.each do |voter| next unless voter.ipaddress + location=nil if Cache and location=Cache.get("GEO:#{voter.ipaddress}") elsif Cache @@ -185,8 +206,7 @@ class QuickvoteController < ApplicationController marker = GMarker.new([location.lat,location.lng], :title => "Voter", - :info_window => (voter.ipaddress or "unknown") \ - + " " + voter.vote.votestring) + :info_window => (voter.ipaddress or "unknown")) @map.overlay_init(marker) end end @@ -199,7 +219,7 @@ class QuickvoteController < ApplicationController def results unless @election = QuickVote.ident_to_quickvote(params[:ident]) flash[:notice] = "Cannot find quickvote #{params[:ident]}." - redirect_to :controller => 'site' + redirect_to :controller => 'front' return end if @election.viewable == 0 && @election.active == 1