Use 'modpanel' perms to display admin panel menu

beaver-dev · beaver-dev · commit 6087cf85e70e · 2016-04-16T20:09:17.000+02:00
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
@@ -22,7 +22,7 @@ public function __construct()
         translate('admin/bans');
         translate('admin/common');
 
-        if (!User::can('mod.bans')) {
+        if (!User::can('modpanel.bans') || !User::can('mod.ban_users')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
@@ -19,7 +19,7 @@ class Index
     public function __construct()
     {
         translate('admin/index');
-        if (!User::can('mod.view')) {
+        if (!User::can('modpanel.index')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
@@ -12,14 +12,15 @@
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 
 class Reports
 {
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Reports();
         translate('admin/reports');
-        if (!User::can('mod.reports')) {
+        if (!User::can('modpanel.reports')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
@@ -20,7 +20,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Users();
         translate('admin/users');
-        if (!User::can('mod.users')) {
+        if (!User::can('modpanel.users')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
@@ -207,12 +207,13 @@ public function create_db(array $data)
         }
 
         // Init permissions
-        Container::get('perms')->addParent(4, 3);
+        Container::get('perms')->addParent(4, array(3));
         Container::get('perms')->addParent(2, array(3,4));
         Container::get('perms')->addParent(1, array(2,3,4));
+
         Container::get('perms')->allowGroup(3, array('board.read', 'users.view', 'search.topics', 'search.users'));
         Container::get('perms')->allowGroup(4, array('topic.reply', 'topic.post', 'topic.delete', 'post.delete', 'post.edit', 'email.send'));
-        Container::get('perms')->allowGroup(2, array('mod.*', 'board.title.set'));
+        Container::get('perms')->allowGroup(2, array('modpanel.*', 'mod.is_mod', 'mod.edit_users', 'mod.rename_users', 'mod.change_passwords', 'mod.promote_users', 'mod.ban_users', 'board.title.set'));
         Container::get('perms')->allowGroup(1, array('board.*'));
         // Init preferences
         Container::get('prefs')->set(array(
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
@@ -115,10 +115,10 @@ public static function get_content($url)
     protected static function load_default_menu()
     {
         return array(
-            'mod.index' => array('title' => 'Index', 'url' => 'adminIndex'),
-            'mod.users' => array('title' => 'Users', 'url' => 'adminUsers'),
-            'mod.bans' => array('title' => 'Bans', 'url' => 'adminBans'),
-            'mod.reports' => array('title' => 'Reports', 'url' => 'adminReports'),
+            'modpanel.index' => array('title' => 'Index', 'url' => 'adminIndex'),
+            'modpanel.users' => array('title' => 'Users', 'url' => 'adminUsers'),
+            'modpanel.bans' => array('title' => 'Bans', 'url' => 'adminBans'),
+            'modpanel.reports' => array('title' => 'Reports', 'url' => 'adminReports'),
             'board.options' => array('title' => 'Options', 'url' => 'adminOptions'),
             'board.permissions' => array('title' => 'Permissions', 'url' => 'adminPermissions'),
             'board.categories' => array('title' => 'Categories', 'url' => 'adminCategories'),
diff --git a/featherbb/View/admin/menu.php b/featherbb/View/admin/menu.php
@@ -23,7 +23,7 @@
                         <div class="inbox">
                             <ul>
 <?php foreach ($menu_items as $perm => $data) {
-    if (preg_match('/^mod\..*$/', $perm)) {
+    if (preg_match('/^modpanel\..*$/', $perm)) {
         if (User::can($perm)) {
             // ForumSettings::get('o_report_method') == '0' || ForumSettings::get('o_report_method') == '2')
             echo "\t\t\t\t\t\t\t\t".'<li'.($page == strtolower($data['title']) ? ' class="isactive"' : '').'><a href="'.Router::pathFor($data['url']).'">'.__($data['title']).'</a></li>'."\n";

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct()`
`22`	`22`	`translate('admin/bans');`
`23`	`23`	`translate('admin/common');`
`24`	`24`
`25`		`- if (!User::can('mod.bans')) {`
	`25`	`+ if (!User::can('modpanel.bans') \|\| !User::can('mod.ban_users')) {`
`26`	`26`	`throw new Error(__('No permission'), '403');`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Index`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`	`21`	`translate('admin/index');`
`22`		`- if (!User::can('mod.view')) {`
	`22`	`+ if (!User::can('modpanel.index')) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,15 @@`
`12`	`12`	`use FeatherBB\Core\AdminUtils;`
`13`	`13`	`use FeatherBB\Core\Url;`
`14`	`14`	`use FeatherBB\Core\Utils;`
	`15`	`+use FeatherBB\Core\Error;`
`15`	`16`
`16`	`17`	`class Reports`
`17`	`18`	`{`
`18`	`19`	`public function __construct()`
`19`	`20`	`{`
`20`	`21`	`$this->model = new \FeatherBB\Model\Admin\Reports();`
`21`	`22`	`translate('admin/reports');`
`22`		`- if (!User::can('mod.reports')) {`
	`23`	`+ if (!User::can('modpanel.reports')) {`
`23`	`24`	`throw new Error(__('No permission'), '403');`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function __construct()`
`20`	`20`	`{`
`21`	`21`	`$this->model = new \FeatherBB\Model\Admin\Users();`
`22`	`22`	`translate('admin/users');`
`23`		`- if (!User::can('mod.users')) {`
	`23`	`+ if (!User::can('modpanel.users')) {`
`24`	`24`	`throw new Error(__('No permission'), '403');`
`25`	`25`	`}`
`26`	`26`	`}`