X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c3cd161cbcf0f2e496fdc7888a156907188b8932..206dea3e99fd260c31bc86b36b309071696f2b3a:/app/controllers/account_controller.rb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 524d743..57cf343 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,3 +1,21 @@ +# Selectricity: Voting Machinery for the Masses +# Copyright (C) 2007, 2008 Benjamin Mako Hill +# 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 +# . + class AccountController < ApplicationController layout 'main' @@ -14,6 +32,7 @@ class AccountController < ApplicationController #these methods provide basic functionality for the user login system #=================================================================== def login + return unless request.post? self.current_user = User.authenticate(params[:login], params[:password]) if logged_in? @@ -21,7 +40,7 @@ class AccountController < ApplicationController self.current_user.remember_me cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at } end - redirect_back_or_default(:controller => '/site', :action => 'index') + redirect_back_or_default :controller => 'front' flash[:notice] = "Logged in successfully" end end @@ -35,7 +54,7 @@ class AccountController < ApplicationController return unless request.post? @user.save! self.current_user = @user - redirect_back_or_default(:controller => '/site', :action => 'index') + redirect_back_or_default :controller => 'front' flash[:notice] = "Thanks for signing up!" rescue ActiveRecord::RecordInvalid render :action => 'signup' @@ -46,7 +65,7 @@ class AccountController < ApplicationController cookies.delete :auth_token reset_session flash[:notice] = "You have been logged out." - redirect_back_or_default(:controller => '/site', :action => 'index') + redirect_back_or_default :controller => 'front' end #======================================================================