Remove email_voter calls; don't do anything

[selectricity-live] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e071a1437bf25b6c24074331c4f9d0a9efe09cc0..80f19b46ee25983f4511ac36c4142d8daf895857 100644 (file)
--- 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"