Display same in hostname and IP when IP lookup fails

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index d2529f8762416927e7775776ef16ae6f0c6fb6f2..779e83f15aa8bc6eb8862fc0420e34685d241112 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
 class VoterController < ApplicationController

-  layout 'vb'
+  layout 'main'

   model :voter
   model :vote
   model :election
   model :voter
   model :vote
   model :election


@@ -30,26 +30,7 @@ class VoterController < ApplicationController
   end
 
   def confirm
   end
 
   def confirm

-    if params[:votename]
-      if Voter.find_all( ["session_id = ?", session.session_id ])[0]
-        flash[:notice] = "You have already voted!"
-       redirect_to quickvote_url( :votename => params[:votename] )
-      else
-        @voter = QuickVoter.new()
-        @voter.election = Election.find_all( [ "name = ?",
-                                              params[:votename] ] )[0]
-        @voter.session_id = session.session_id
-        @voter.save
-        @voter.reload
-        
-        @voter.vote = Vote.new
-        @voter.vote.votestring = params[:vote][:votestring]
-        @voter.vote.save
-       @voter.vote.confirm!
-        render :action => 'thanks'
-      end
-      
-    elsif authenticate
+    if authenticate

       @voter.vote.confirm!
       render :action => 'thanks'
     else
       @voter.vote.confirm!
       render :action => 'thanks'
     else


@@ -57,11 +38,6 @@ class VoterController < ApplicationController
     end
   end
 
     end
   end
 

-  def quickvote
-    @voter = QuickVoter.new
-    @voter.election = Election.find_all( [ "name = ?", params[:votename] ] )[0]
-  end
-

   private
   def authenticate
     password = params[:id]
   private
   def authenticate
     password = params[:id]