aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/application.rb')
-rw-r--r--app/controllers/application.rb23
1 files changed, 14 insertions, 9 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 4365de88d..ddd6e86b4 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,21 +6,16 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: application.rb,v 1.3 2007-08-01 17:06:04 francis Exp $
+# $Id: application.rb,v 1.4 2007-08-04 11:10:25 francis Exp $
class ApplicationController < ActionController::Base
+ # Standard hearders, footers and navigation for whole site
+ layout "default"
+
# Pick a unique cookie name to distinguish our session data from others'
session :session_key => '_foi_session_id'
- def check_authentication
- unless session[:user]
- session[:intended_action] = action_name
- session[:intended_controller] = controller_name
- redirect_to :action => "signin"
- end
- end
-
def signin
if request.post?
user = User.authenticate(params[:email], params[:password])
@@ -39,4 +34,14 @@ class ApplicationController < ActionController::Base
redirect_to frontpage
end
+ private
+
+ def check_authentication
+ unless session[:user]
+ session[:intended_action] = action_name
+ session[:intended_controller] = controller_name
+ redirect_to :action => "signin"
+ end
+ end
+
end