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

diff --git a/config/environment.rb b/config/environment.rb
index e071a14..80f19b4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,10 +63,12 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
-require 'rubyvote'
 require 'gruff'
 require 'sparklines'
 
+require 'rubyvote'
+ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+
 class String
   # alternate capitalization method that does not lowercase the rest of
   # the string -- which is almost never what I want
@@ -85,6 +87,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"