added numbering back to embeddables, should count correctly no matter how many candid...

[selectricity-live] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index b9c790f40f872fa99048f10aec38cc76abc348a1..768bdea261ba28000363e25e4da6d3c24b61e7e9 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,3 +1,21 @@
+# 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: 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/>.
+

 class QuickvoteController < ApplicationController
   layout 'main'
   require_dependency "quick_voter"
 class QuickvoteController < ApplicationController
   layout 'main'
   require_dependency "quick_voter"


@@ -115,11 +133,12 @@ class QuickvoteController < ApplicationController
              @voter.reload
       end
     else
              @voter.reload
       end
     else

-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'

     end
   end
 
   def confirm
     end
   end
 
   def confirm

+    

     # we need the election to verify that we have the right voter
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # we need the election to verify that we have the right voter
     election = QuickVote.ident_to_quickvote(params[:ident])
 


@@ -127,7 +146,7 @@ class QuickvoteController < ApplicationController
     @voter = QuickVoter.find(:all,
       :conditions => ["session_id = ? and election_id = ?", 
                       session.session_id, election.id])[0]
     @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
     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again


@@ -139,6 +158,7 @@ class QuickvoteController < ApplicationController
       redirect_to quickvote_url( :ident => params[:ident] )
       
     else
       redirect_to quickvote_url( :ident => params[:ident] )
       
     else

+      

       # record the ip address for posterity
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       # record the ip address for posterity
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save


@@ -169,8 +189,8 @@ class QuickvoteController < ApplicationController
     @election.voters.each do |voter|
       next unless voter.ipaddress
       location=nil
     @election.voters.each do |voter|
       next unless voter.ipaddress
       location=nil

-      if Cache and location=Cache.get("GEO:#{voter.ipaddress}")
-      elsif Cache
+      if defined? Cache and location=Cache.get("GEO:#{voter.ipaddress}")
+      elsif defined? Cache

         location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
         Cache.set "GEO:#{voter.ipaddress}", location
       else
         location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
         Cache.set "GEO:#{voter.ipaddress}", location
       else


@@ -185,8 +205,7 @@ class QuickvoteController < ApplicationController
 
       marker = GMarker.new([location.lat,location.lng],
                            :title => "Voter",
 
       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
       @map.overlay_init(marker)
     end
   end


@@ -199,7 +218,7 @@ class QuickvoteController < ApplicationController
   def results
     unless @election = QuickVote.ident_to_quickvote(params[:ident])
       flash[:notice] = "Cannot find quickvote #{params[:ident]}."
   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
       return
     end
     if @election.viewable == 0 && @election.active == 1