diff options
| author | francis <francis> | 2007-11-19 12:36:57 +0000 |
|---|---|---|
| committer | francis <francis> | 2007-11-19 12:36:57 +0000 |
| commit | 90027d6b8778f532133438155bbad17499a7db0d (patch) | |
| tree | 900a418ccf9160b973f62ca19cd2b244403a48c4 /app/controllers/user_controller.rb | |
| parent | 6574585f67cd11fedc238f0590af3ae60babf0d5 (diff) | |
Ability to force authentication as a particular user.
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 72693be1e..cf412c473 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user_controller.rb,v 1.18 2007-11-09 01:48:36 francis Exp $ +# $Id: user_controller.rb,v 1.19 2007-11-19 12:36:57 francis Exp $ class UserController < ApplicationController # XXX See controllers/application.rb simplify_url_part for reverse of expression in SQL below @@ -33,7 +33,7 @@ class UserController < ApplicationController else # Successful login if @user.email_confirmed - session[:user] = @user.id + session[:user_id] = @user.id do_post_redirect @post_redirect.uri, @post_redirect.post_params else send_confirmation_mail @@ -79,14 +79,14 @@ class UserController < ApplicationController @user.email_confirmed = true @user.save - session[:user] = @user.id + session[:user_id] = @user.id do_post_redirect post_redirect.uri, post_redirect.post_params end # Logout form def signout - session[:user] = nil + session[:user_id] = nil if params[:r] redirect_to params[:r] else @@ -107,7 +107,7 @@ class UserController < ApplicationController if params[:r] @post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {}, :reason_params => { - :web => "Please sign in or make a new account.", + :web => "", :email => "Then your can sign in to GovernmentSpy.", :email_subject => "Confirm your account on GovernmentSpy" }) |