diff options
| author | hukl <contact@smyck.org> | 2009-09-06 17:23:32 +0200 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-09-06 17:23:32 +0200 |
| commit | 4c82210b4ab1d60962b170fdabe8a44515969e94 (patch) | |
| tree | 7d37751033e1b0b9b39018bfbb0db9201693d459 /app/controllers | |
| parent | 8ff9a6876785e04f695466c5d536b535223d8fdc (diff) | |
Marked Controllers private / public and added authorization filters accordingly
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/assets_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/content_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/events_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/menu_items_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/nodes_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/occurrences_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/pages_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/revisions_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/sessions_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tags_controller.rb | 3 | ||||
| -rw-r--r-- | 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 b911727..538e7d7 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | class AdminController < ApplicationController | 1 | class AdminController < ApplicationController |
| 2 | |||
| 3 | # Private | ||
| 4 | |||
| 2 | before_filter :login_required | 5 | before_filter :login_required |
| 3 | 6 | ||
| 4 | def index | 7 | def index |
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index b1abb0f..cfaf176 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | class AssetsController < ApplicationController | 1 | class AssetsController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 3 | layout 'admin' | 7 | layout 'admin' |
| 4 | 8 | ||
| 5 | def index | 9 | def index |
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index d1bfa6b..250e6ba 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | class ContentController < ApplicationController | 1 | class ContentController < ApplicationController |
| 2 | 2 | ||
| 3 | # Public | ||
| 4 | |||
| 3 | before_filter :find_page | 5 | before_filter :find_page |
| 4 | 6 | ||
| 5 | # This is the method that renders most of the the public content. It recieves | 7 | # This is the method that renders most of the the public content. It recieves |
| @@ -27,7 +29,7 @@ class ContentController < ApplicationController | |||
| 27 | 29 | ||
| 28 | def render_gallery | 30 | def render_gallery |
| 29 | @images = @page.assets.images | 31 | @images = @page.assets.images |
| 30 | render :file => "custom/page_templates/public/gallery"#, :layout => true | 32 | render :file => "custom/page_templates/public/gallery" |
| 31 | end | 33 | end |
| 32 | 34 | ||
| 33 | private | 35 | private |
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 00b98f1..805e941 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | class EventsController < ApplicationController | 1 | class EventsController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 3 | layout 'admin' | 7 | layout 'admin' |
| 4 | 8 | ||
| 5 | # GET /events | 9 | # GET /events |
diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb index dac78d9..808da15 100644 --- a/app/controllers/menu_items_controller.rb +++ b/app/controllers/menu_items_controller.rb | |||
| @@ -1,4 +1,8 @@ | |||
| 1 | class MenuItemsController < ApplicationController | 1 | class MenuItemsController < ApplicationController |
| 2 | |||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 2 | 6 | ||
| 3 | layout 'admin' | 7 | layout 'admin' |
| 4 | 8 | ||
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 07bbbac..f8b8058 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | class NodesController < ApplicationController | 1 | class NodesController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 3 | layout 'admin' | 5 | layout 'admin' |
| 6 | |||
| 4 | before_filter :login_required | 7 | before_filter :login_required |
| 5 | before_filter :find_node, :only => [ | 8 | before_filter :find_node, :only => [ |
| 6 | :show, | 9 | :show, |
diff --git a/app/controllers/occurrences_controller.rb b/app/controllers/occurrences_controller.rb index e3f1cdd..751be40 100644 --- a/app/controllers/occurrences_controller.rb +++ b/app/controllers/occurrences_controller.rb | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | class OccurrencesController < ApplicationController | 1 | class OccurrencesController < ApplicationController |
| 2 | |||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 2 | # GET /occurrences | 7 | # GET /occurrences |
| 3 | # GET /occurrences.xml | 8 | # GET /occurrences.xml |
| 4 | def index | 9 | def index |
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 6e826c0..a684327 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | class PagesController < ApplicationController | 1 | class PagesController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 3 | def preview | 7 | def preview |
| 4 | @page = Page.find(params[:id]) | 8 | @page = Page.find(params[:id]) |
| 5 | 9 | ||
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index e2c0432..32110ae 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | class RevisionsController < ApplicationController | 1 | class RevisionsController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 3 | layout 'admin' | 7 | layout 'admin' |
| 4 | 8 | ||
| 5 | def index | 9 | def index |
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 813344b..e115b35 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | # This controller handles the login/logout function of the site. | 1 | # This controller handles the login/logout function of the site. |
| 2 | class SessionsController < ApplicationController | 2 | class SessionsController < ApplicationController |
| 3 | 3 | ||
| 4 | # Public | ||
| 5 | |||
| 4 | layout 'admin' | 6 | layout 'admin' |
| 5 | 7 | ||
| 6 | # render new.rhtml | 8 | # render new.rhtml |
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 9248402..7433d21 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | class TagsController < ApplicationController | 1 | class TagsController < ApplicationController |
| 2 | |||
| 3 | # Public | ||
| 4 | |||
| 2 | def index | 5 | def index |
| 3 | end | 6 | end |
| 4 | 7 | ||
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7e8fc9b..19f6b2d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | class UsersController < ApplicationController | 1 | class UsersController < ApplicationController |
| 2 | 2 | ||
| 3 | # Private | ||
| 4 | |||
| 5 | before_filter :login_required | ||
| 6 | |||
| 3 | layout 'admin' | 7 | layout 'admin' |
| 4 | 8 | ||
| 5 | def index | 9 | def index |
