X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/277d9e323c1c9c525c1cea4590dc71bc56aeed06..b9f3bbdefb7bb1abd63193e2162aae1e78e1a1cb:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index f6b36a7..e86624e 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,14 +1,15 @@
 class SiteController < ApplicationController
-  layout 'hc'
+  layout 'main'
   model :user, :election, :account
 
   def index
-    @quickvotes = QuickVote.find(:all, ["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
+    @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]
     # if the person claims they are logged in
-    if session[:user]
-
+   
+    if logged_in?
       # check to see that we actually have record of them
-      if User.find(:all, ["id = ?", session[:user].id]).length == 1
+      if User.exists?(session[:user])
+        username = User.find(session[:user]).login
         # if we have record of them, grab the list of their elections
         session[:user] = User.find(session[:user])
         @current_elections = session[:user].elections.sort do |a,b|
@@ -16,8 +17,9 @@ class SiteController < ApplicationController
         end
       else
         # if we have no record of them, set the session id back to
-	# nothing and start again
+	      # nothing and start again
         session[:user] = nil
+        
       end
     end
   end