Use User:: isAdmin() in admin controllers

beaver-dev · beaver-dev · commit 61e9b137d19f · 2016-04-17T18:45:50.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('modpanel.bans') || !User::can('mod.ban_users')) {
+        if (!User::can('mod.ban_users')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
@@ -21,7 +21,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Categories();
         translate('admin/categories');
-        if (!User::can('board.categories')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
@@ -11,14 +11,15 @@
 
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 
 class Censoring
 {
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Censoring();
         translate('admin/censoring');
-        if (!User::can('board.censoring')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
@@ -12,6 +12,7 @@
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Url;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 use FeatherBB\Model\Cache;
 
 class Forums
@@ -20,7 +21,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Forums();
         translate('admin/forums');
-        if (!User::can('board.forums')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
@@ -19,7 +19,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Groups();
         translate('admin/groups');
-        if (!User::can('board.groups')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
@@ -19,9 +19,6 @@ class Index
     public function __construct()
     {
         translate('admin/index');
-        if (!User::can('modpanel.index')) {
-            throw new Error(__('No permission'), '403');
-        }
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
@@ -11,14 +11,15 @@
 
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 
 class Maintenance
 {
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Maintenance();
         translate('admin/maintenance');
-        if (!User::can('board.maintenance')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -11,14 +11,15 @@
 
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 
 class Options
 {
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Options();
         translate('admin/options');
-        if (!User::can('board.options')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
@@ -20,7 +20,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Parser();
         translate('admin/parser');
-        if (!User::can('board.parser')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
@@ -11,14 +11,15 @@
 
 use FeatherBB\Core\AdminUtils;
 use FeatherBB\Core\Utils;
+use FeatherBB\Core\Error;
 
 class Permissions
 {
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Permissions();
         translate('admin/permissions');
-        if (!User::can('board.permissions')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
@@ -22,7 +22,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Plugins();
         translate('admin/plugins');
-        if (!User::can('board.plugins')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
@@ -20,9 +20,6 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Reports();
         translate('admin/reports');
-        if (!User::can('modpanel.reports')) {
-            throw new Error(__('No permission'), '403');
-        }
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
@@ -19,9 +19,6 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Statistics();
         translate('admin/index');
-        if (!User::can('mod.statistics')) {
-            throw new Error(__('No permission'), '403');
-        }
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Updates.php b/featherbb/Controller/Admin/Updates.php
@@ -26,7 +26,7 @@ public function __construct()
         translate('admin/index');
         translate('admin/updates');
         translate('admin/plugins');
-        if (!User::can('board.updates')) {
+        if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
@@ -20,9 +20,6 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Users();
         translate('admin/users');
-        if (!User::can('modpanel.users')) {
-            throw new Error(__('No permission'), '403');
-        }
     }
 
     public function display($req, $res, $args)

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('modpanel.bans') \|\| !User::can('mod.ban_users')) {`
	`25`	`+ if (!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
`@@ -21,7 +21,7 @@ public function __construct()`
`21`	`21`	`{`
`22`	`22`	`$this->model = new \FeatherBB\Model\Admin\Categories();`
`23`	`23`	`translate('admin/categories');`
`24`		`- if (!User::can('board.categories')) {`
	`24`	`+ if (!User::isAdmin()) {`
`25`	`25`	`throw new Error(__('No permission'), '403');`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,15 @@`
`11`	`11`
`12`	`12`	`use FeatherBB\Core\AdminUtils;`
`13`	`13`	`use FeatherBB\Core\Utils;`
	`14`	`+use FeatherBB\Core\Error;`
`14`	`15`
`15`	`16`	`class Censoring`
`16`	`17`	`{`
`17`	`18`	`public function __construct()`
`18`	`19`	`{`
`19`	`20`	`$this->model = new \FeatherBB\Model\Admin\Censoring();`
`20`	`21`	`translate('admin/censoring');`
`21`		`- if (!User::can('board.censoring')) {`
	`22`	`+ if (!User::isAdmin()) {`
`22`	`23`	`throw new Error(__('No permission'), '403');`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`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`	`use FeatherBB\Model\Cache;`
`16`	`17`
`17`	`18`	`class Forums`
`@@ -20,7 +21,7 @@ public function __construct()`
`20`	`21`	`{`
`21`	`22`	`$this->model = new \FeatherBB\Model\Admin\Forums();`
`22`	`23`	`translate('admin/forums');`
`23`		`- if (!User::can('board.forums')) {`
	`24`	`+ if (!User::isAdmin()) {`
`24`	`25`	`throw new Error(__('No permission'), '403');`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct()`
`19`	`19`	`{`
`20`	`20`	`$this->model = new \FeatherBB\Model\Admin\Groups();`
`21`	`21`	`translate('admin/groups');`
`22`		`- if (!User::can('board.groups')) {`
	`22`	`+ if (!User::isAdmin()) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ class Index`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`	`21`	`translate('admin/index');`
`22`		`- if (!User::can('modpanel.index')) {`
`23`		`- throw new Error(__('No permission'), '403');`
`24`		`- }`
`25`	`22`	`}`
`26`	`23`
`27`	`24`	`public function display($req, $res, $args)`
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\Parser();`
`22`	`22`	`translate('admin/parser');`
`23`		`- if (!User::can('board.parser')) {`
	`23`	`+ if (!User::isAdmin()) {`
`24`	`24`	`throw new Error(__('No permission'), '403');`
`25`	`25`	`}`
`26`	`26`	`}`