From 7df00b12bfdc3a0c234737c103b9ac0620a047af Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 10 Sep 2009 01:49:07 +0000 Subject: [PATCH] MINOR Unified permission control for RebuildStaticCacheTask and StaticExporter git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86004 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/StaticExporter.php | 13 +++---------- tasks/RebuildStaticCacheTask.php | 6 ++++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/code/StaticExporter.php b/code/StaticExporter.php index 870f555d..4488b147 100755 --- a/code/StaticExporter.php +++ b/code/StaticExporter.php @@ -15,16 +15,9 @@ class StaticExporter extends Controller { function init() { parent::init(); - if(!Permission::check('ADMIN')) { - $messageSet = array( - 'default' => _t('LeftAndMain.PERMDEFAULT', 'Enter your email address and password to access the CMS.'), - 'alreadyLoggedIn' => _t('LeftAndMain.PERMALREADY', 'I\'m sorry, but you can\'t access that part of the CMS. If you want to log in as someone else, do so below'), - 'logInAgain' => _t('LeftAndMain.PERMAGAIN', 'You have been logged out of the CMS. If you would like to log in again, enter a username and password below.'), - ); - - Security::permissionFailure($this, $messageSet); - return; - } + + $canAccess = (Director::isDev() || Director::is_cli() || Permission::check("ADMIN")); + if(!$canAccess) return Security::permissionFailure($this); } diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php index 2af0bb5f..a363b666 100644 --- a/tasks/RebuildStaticCacheTask.php +++ b/tasks/RebuildStaticCacheTask.php @@ -7,10 +7,12 @@ */ class RebuildStaticCacheTask extends Controller { function init() { + parent::init(); + Versioned::reading_stage('live'); - if(!Director::is_cli() && !Director::isDev() && !Permission::check("ADMIN")) Security::permissionFailure(); - parent::init(); + $canAccess = (Director::isDev() || Director::is_cli() || Permission::check("ADMIN")); + if(!$canAccess) return Security::permissionFailure($this); } function index() {