diff options
| author | francis <francis> | 2007-09-03 13:52:01 +0000 |
|---|---|---|
| committer | francis <francis> | 2007-09-03 13:52:01 +0000 |
| commit | 4f73b2affce8b4c64ac0877d5683a3db33a45d36 (patch) | |
| tree | bf3f814a8d5ced1fe78c67dc57d5c496ed300936 /app/controllers/application.rb | |
| parent | ffdbf0562b5e93dfa4d60ca9e4817b1acf1806b0 (diff) | |
Log last editor and allow a comment for public body editing.
Diffstat (limited to 'app/controllers/application.rb')
| -rw-r--r-- | app/controllers/application.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index ddd6e86b4..f00479bee 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.4 2007-08-04 11:10:25 francis Exp $ +# $Id: application.rb,v 1.5 2007-09-03 13:52:01 francis Exp $ class ApplicationController < ActionController::Base @@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base # Pick a unique cookie name to distinguish our session data from others' session :session_key => '_foi_session_id' + # Login form def signin if request.post? user = User.authenticate(params[:email], params[:password]) @@ -29,6 +30,7 @@ class ApplicationController < ActionController::Base end end + # Logout form def signout sessions[:user] = nil redirect_to frontpage @@ -36,6 +38,7 @@ class ApplicationController < ActionController::Base private + # Check the user is logged in def check_authentication unless session[:user] session[:intended_action] = action_name @@ -44,4 +47,13 @@ class ApplicationController < ActionController::Base end end + # For administration interface, return display name of authenticated user + def admin_http_auth_user + if not request.env["REMOTE_USER"] + return "*unknown*"; + else + return request.env["REMOTE_USER"] + end + end + end |