X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/fc0a6a8d7ea15bcdb27ebdd58721401c7045c6e0..4ae380231b08416a3ac3b6966d9dbc00a73fc3ca:/app/controllers/site_controller.rb?ds=inline

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
old mode 100755
new mode 100644
index d5eab86..80fdfc4
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,23 +1,27 @@
 class SiteController < ApplicationController
-  layout 'hc'
-  model :user, :election
+  layout 'main'
+  require_dependency "user"
+  require_dependency "election"
+  require_dependency "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].id)
+        session[:user] = User.find(session[:user])
         @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
+        # if we have no record of them, set the user back to
+	      # nothing and start again
         session[:user] = nil
+        
       end
     end
   end