From e597142266722046f1a6c34522f4cccd89b62c1a Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 12 Mar 2016 16:06:27 +0100 Subject: [PATCH] fix some permissions and their formatting --- controllers/AchievementsController.inc | 26 +++++++++--------- controllers/CharactergroupsController.inc | 32 +++++++++++------------ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/controllers/AchievementsController.inc b/controllers/AchievementsController.inc index d57a47a4..3ec78132 100644 --- a/controllers/AchievementsController.inc +++ b/controllers/AchievementsController.inc @@ -37,13 +37,14 @@ * @var array */ public $permissions = array( - 'index' => array('admin', 'moderator', 'user'), - 'create' => array('admin', 'moderator', 'user'), - 'moveup' => array('admin', 'moderator', 'user'), - 'movedown' => array('admin', 'moderator', 'user'), - 'edit' => array('admin', 'moderator', 'user'), + 'index' => array('admin', 'moderator', 'user'), + 'create' => array('admin', 'moderator', 'user'), + 'moveup' => array('admin', 'moderator', 'user'), + 'movedown' => array('admin', 'moderator', 'user'), + 'edit' => array('admin', 'moderator', 'user'), 'conditions' => array('admin', 'moderator', 'user'), - 'delete' => array('admin', 'moderator', 'user') + 'manage' => array('admin', 'moderator', 'user'), + 'delete' => array('admin', 'moderator', 'user') ); /** * User seminary permissions @@ -51,13 +52,14 @@ * @var array */ public $seminaryPermissions = array( - 'index' => array('admin', 'moderator', 'user'), - 'create' => array('admin'), - 'moveup' => array('admin', 'moderator'), - 'movedown' => array('admin', 'moderator'), - 'edit' => array('admin', 'moderator'), + 'index' => array('admin', 'moderator', 'user'), + 'create' => array('admin'), + 'moveup' => array('admin', 'moderator'), + 'movedown' => array('admin', 'moderator'), + 'edit' => array('admin', 'moderator'), 'conditions' => array('admin', 'moderator'), - 'delete' => array('admin') + 'manage' => array('admin', 'moderator'), + 'delete' => array('admin') ); diff --git a/controllers/CharactergroupsController.inc b/controllers/CharactergroupsController.inc index b2f9ce09..4418248d 100644 --- a/controllers/CharactergroupsController.inc +++ b/controllers/CharactergroupsController.inc @@ -37,16 +37,16 @@ * @var array */ public $permissions = array( - 'index' => array('admin', 'moderator', 'user'), - 'groupsgroup' => array('admin', 'moderator', 'user'), + 'index' => array('admin', 'moderator', 'user'), + 'groupsgroup' => array('admin', 'moderator', 'user'), 'creategroupsgroup' => array('admin', 'moderator', 'user'), - 'editgroupsgroup' => array('admin', 'moderator', 'user'), + 'editgroupsgroup' => array('admin', 'moderator', 'user'), 'deletegroupsgroup' => array('admin', 'moderator', 'user'), - 'group' => array('admin', 'moderator', 'user'), - 'managegroup' => array('admin', 'moderator', 'user'), - 'creategroup' => array('admin', 'moderator', 'user'), - 'editgroup' => array('admin', 'moderator', 'user'), - 'deletegroup' => array('admin', 'moderator', 'user') + 'group' => array('admin', 'moderator', 'user'), + 'managegroup' => array('admin', 'moderator', 'user'), + 'creategroup' => array('admin', 'moderator', 'user'), + 'editgroup' => array('admin', 'moderator', 'user'), + 'deletegroup' => array('admin', 'moderator', 'user') ); /** * User seminary permissions @@ -54,16 +54,16 @@ * @var array */ public $seminaryPermissions = array( - 'index' => array('admin', 'moderator', 'user'), - 'groupsgroup' => array('admin', 'moderator', 'user'), + 'index' => array('admin', 'moderator', 'user'), + 'groupsgroup' => array('admin', 'moderator', 'user'), 'creategroupsgroup' => array('admin', 'moderator'), - 'editgroupsgroup' => array('admin', 'moderator'), + 'editgroupsgroup' => array('admin', 'moderator'), 'deletegroupsgroup' => array('admin', 'moderator'), - 'group' => array('admin', 'moderator', 'user'), - 'managegroup' => array('admin', 'moderator'), - 'creategroup' => array('admin', 'moderator'), - 'editgroup' => array('admin', 'moderator', 'user'), - 'deletegroup' => array('admin', 'moderator') + 'group' => array('admin', 'moderator', 'user'), + 'managegroup' => array('admin', 'moderator'), + 'creategroup' => array('admin', 'moderator'), + 'editgroup' => array('admin', 'moderator', 'user'), + 'deletegroup' => array('admin', 'moderator') );