Changed properties to remove unecessary exectables.

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index f6b36a774b141fb4cc0c8ddd07084ed65120f6fb..e26a3688997dd1ff67b4b817b44a345ddc8d4cfa 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -3,12 +3,13 @@ class SiteController < ApplicationController
   model :user, :election, :account
 
   def index
   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 the person claims they are logged in

-    if session[:user]
-
+   
+    if logged_in?

       # check to see that we actually have record of them
       # 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|
         # 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
         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
         session[:user] = nil

+        

       end
     end
   end
       end
     end
   end