From 4c82210b4ab1d60962b170fdabe8a44515969e94 Mon Sep 17 00:00:00 2001 From: hukl Date: Sun, 6 Sep 2009 17:23:32 +0200 Subject: Marked Controllers private / public and added authorization filters accordingly --- app/controllers/admin_controller.rb | 3 +++ app/controllers/assets_controller.rb | 4 ++++ app/controllers/content_controller.rb | 4 +++- app/controllers/events_controller.rb | 4 ++++ app/controllers/menu_items_controller.rb | 4 ++++ app/controllers/nodes_controller.rb | 3 +++ app/controllers/occurrences_controller.rb | 5 +++++ app/controllers/pages_controller.rb | 6 +++++- app/controllers/revisions_controller.rb | 4 ++++ app/controllers/sessions_controller.rb | 2 ++ app/controllers/tags_controller.rb | 3 +++ app/controllers/users_controller.rb | 4 ++++ 12 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index b9117271..538e7d74 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,4 +1,7 @@ class AdminController < ApplicationController + + # Private + before_filter :login_required def index diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index b1abb0fd..cfaf176a 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -1,5 +1,9 @@ class AssetsController < ApplicationController + # Private + + before_filter :login_required + layout 'admin' def index diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index d1bfa6b9..250e6baf 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -1,5 +1,7 @@ class ContentController < ApplicationController + # Public + before_filter :find_page # This is the method that renders most of the the public content. It recieves @@ -27,7 +29,7 @@ class ContentController < ApplicationController def render_gallery @images = @page.assets.images - render :file => "custom/page_templates/public/gallery"#, :layout => true + render :file => "custom/page_templates/public/gallery" end private diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 00b98f1a..805e941f 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -1,5 +1,9 @@ class EventsController < ApplicationController + # Private + + before_filter :login_required + layout 'admin' # GET /events diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb index dac78d9e..808da151 100644 --- a/app/controllers/menu_items_controller.rb +++ b/app/controllers/menu_items_controller.rb @@ -1,4 +1,8 @@ class MenuItemsController < ApplicationController + + # Private + + before_filter :login_required layout 'admin' diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 07bbbac6..f8b8058a 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb @@ -1,6 +1,9 @@ class NodesController < ApplicationController + # Private + layout 'admin' + before_filter :login_required before_filter :find_node, :only => [ :show, diff --git a/app/controllers/occurrences_controller.rb b/app/controllers/occurrences_controller.rb index e3f1cddd..751be402 100644 --- a/app/controllers/occurrences_controller.rb +++ b/app/controllers/occurrences_controller.rb @@ -1,4 +1,9 @@ class OccurrencesController < ApplicationController + + # Private + + before_filter :login_required + # GET /occurrences # GET /occurrences.xml def index diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 6e826c00..a684327d 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,5 +1,9 @@ class PagesController < ApplicationController - + + # Private + + before_filter :login_required + def preview @page = Page.find(params[:id]) diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index e2c04329..32110aef 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb @@ -1,5 +1,9 @@ class RevisionsController < ApplicationController + # Private + + before_filter :login_required + layout 'admin' def index diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 813344ba..e115b35c 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,6 +1,8 @@ # This controller handles the login/logout function of the site. class SessionsController < ApplicationController + # Public + layout 'admin' # render new.rhtml diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 9248402e..7433d21e 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -1,4 +1,7 @@ class TagsController < ApplicationController + + # Public + def index end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7e8fc9b1..19f6b2d2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,9 @@ class UsersController < ApplicationController + # Private + + before_filter :login_required + layout 'admin' def index -- cgit v1.3