X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/607f3a343ea400e558cc47a7c6dc508f9bafcfd2..fc0a6a8d7ea15bcdb27ebdd58721401c7045c6e0:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
old mode 100644
new mode 100755
index daa74f8..d5eab86
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -3,10 +3,21 @@ class SiteController < ApplicationController
   model :user, :election
 
   def index
+    @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
+    # if the person claims they are logged in
     if session[:user]
-      session[:user] = User.find(session[:user].id)
-      @current_elections = session[:user].elections.sort do |a,b|
-        b.enddate <=> a.enddate
+
+      # check to see that we actually have record of them
+      if User.find_all(["id = ?", session[:user].id]).length == 1
+        # if we have record of them, grab the list of their elections
+        session[:user] = User.find(session[:user].id)
+        @current_elections = session[:user].elections.sort do |a,b|
+          b.enddate <=> a.enddate
+        end
+      else
+        # if we have no record of them, set the session id back to
+	# nothing and start again
+        session[:user] = nil
       end
     end
   end