blanked readme file and created a list of contributors inside

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index c897f369f33018bd9c3b5ffec552e20bdc0585ce..5e29a10caa2e2d529761666f8e2c0864bbf6f59c 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -105,7 +105,7 @@ class QuickvoteController < ApplicationController
       
     else
       # record the ip address for posterity
       
     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
       @voter.save
       
       # toggle the confirmation bit


@@ -158,10 +158,12 @@ class QuickvoteController < ApplicationController
  
     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result
  
     @plurality_result = PluralityVote.new(plurality_tally).result
     @approval_result = ApprovalVote.new(approval_tally).result

-    @condorcet_result = CloneproofSSDVote.new(preference_tally).result
-    @ssd_result = PureCondorcetVote.new(preference_tally).result
+    @condorcet_result = PureCondorcetVote.new(preference_tally).result
+    @ssd_result = CloneproofSSDVote.new(preference_tally).result

     @borda_result = BordaVote.new(preference_tally).result
     @borda_result = BordaVote.new(preference_tally).result

-    @runoff_result = InstantRunoffVote.new(preference_tally).result
+    #@runoff_result = InstantRunoffVote.new(preference_tally).result
+    #@runoff_results = PluralityVote.new(preference_tally).result
+

 
     @candidates = {} 
     @election.candidates.each {|c| @candidates[c.id] = c}
 
     @candidates = {} 
     @election.candidates.each {|c| @candidates[c.id] = c}