X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/5d7239d388387fdae166801c7d26c4103d0d5b0c..cfe645440c51b66c088f19e84de650f026cf77f5:/app/controllers/account_controller.rb?ds=sidebyside diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 524d743..51bd805 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,3 +1,10 @@ +# 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. Please see the COPYING file for +# details. + class AccountController < ApplicationController layout 'main' @@ -14,6 +21,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 +29,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 +43,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,11 +54,11 @@ 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 #====================================================================== - #The following methods are for slectricity specific uses + #The following methods are for selectricity specific uses def summary @user = User.find(params[:id]) end