X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/25862916f9c97687bc1b30299fd9d544b0ba62ac..c3cd161cbcf0f2e496fdc7888a156907188b8932:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e071a14..fcabdd8 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,9 +63,14 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
-require 'rubyvote'
-require 'gruff'
+require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
+require 'rubyvote'
+ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
+                  'plurality' => "Plurality/First Past the Post",
+                  'approval' => "Approval (Top Two)",
+                  'condorcet' => "Simple Condorcet",
+                  'borda' => "Borda Count"}
 
 class String
   # alternate capitalization method that does not lowercase the rest of
@@ -85,6 +90,10 @@ class String
   end
 end
 
+#Change the session store key, so that it will not conflict with other webapps
+ActionController::Base.session_options[:session_key] = 'selectricity_session_id'
+CGI::Session.expire_after 1.year
+
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"