merged in changes from live version

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 01722e6b3507c63c56d6818cdc6d243c3a8fc687..1387b29b10dd1e53e8b7252ef258164ec9e2ebf4 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,21 +1,38 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+
 # Filters added to this controller will be run for all controllers in
 # the application.  Likewise, all the methods added will be available
 # for all controllers.
 
 class ApplicationController < ActionController::Base
-  # add authentication methods and hooks
   include AuthenticatedSystem
   helper :user
   require_dependency "user"
 
-  # add sitealizer statistics and tracking information
   include Sitealizer
-  
-  before_filter :use_sitealizer, :add_stylesheets
+  before_filter :add_stylesheets
+  #before_filter :use_sitealizer
    
   def initialize
     @stylesheets = []
-    
+
+        
     # this is defined is a sketchy way in the sitealizer mixin
     # initalize. since i'm overloading that, i'm calling it here
     $visits = [] unless $visits
@@ -30,8 +47,9 @@ class ApplicationController < ActionController::Base
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates
+    
     @vote = Vote.find(params[:id])
-
+    
     @vote.rankings.each do |ranking|
       ranking.rank = params['rankings-list'].index(ranking.candidate.id.to_s) + 1
       ranking.save