X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/75091532075247ae9c47164ea883f4fe803eddf4..b9f3bbdefb7bb1abd63193e2162aae1e78e1a1cb:/app/controllers/voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index d2529f8..779e83f 100644
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
-  layout 'vb'
+  layout 'main'
   model :voter
   model :vote
   model :election
@@ -30,26 +30,7 @@ class VoterController < ApplicationController
   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
@@ -57,11 +38,6 @@ class VoterController < ApplicationController
     end
   end
 
-  def quickvote
-    @voter = QuickVoter.new
-    @voter.election = Election.find_all( [ "name = ?", params[:votename] ] )[0]
-  end
-
   private
   def authenticate
     password = params[:id]