]> projects.mako.cc - selectricity-live/blobdiff - app/controllers/quickvote_controller.rb
fixed and re-enabled support for memcache in the production site
[selectricity-live] / app / controllers / quickvote_controller.rb
index c32d585dd53cc441d8e36d7a72fe74be9edaec90..b57abaa40dfba69ab01d3912023e183bda8af771 100644 (file)
@@ -161,7 +161,7 @@ class QuickvoteController < ApplicationController
     else
       
       # record the ip address for posterity
-      @voter.ipaddress = request.env["REMOTE_ADDR"]
+      @voter.ipaddress = request.env["HTTP_X_FORWARDED_FOR"]
       @voter.save
       
       # toggle the confirmation bit      
@@ -186,9 +186,10 @@ class QuickvoteController < ApplicationController
     @election=QuickVote.ident_to_quickvote(params[:id])
     @election.voters.each do |voter|
       next unless voter.ipaddress
+
       location=nil
-      if defined? Cache and location=Cache.get("GEO:#{voter.ipaddress}")
-      elsif defined? Cache
+      if Cache and location=Cache.get("GEO:#{voter.ipaddress}")
+      elsif Cache
         location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
         Cache.set "GEO:#{voter.ipaddress}", location
       else

Benjamin Mako Hill || Want to submit a patch?