Use User::can() method for perms

beaver-dev · beaver-dev · commit 45d8be880272 · 2016-04-16T12:53:05.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 (!Container::get('perms')->can(User::get(), 'mod.bans')) {
+        if (!User::can('mod.bans')) {
             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 (!Container::get('perms')->can(User::get(), 'board.categories')) {
+        if (!User::can('board.categories')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Censoring();
         translate('admin/censoring');
-        if (!Container::get('perms')->can(User::get(), 'board.censoring')) {
+        if (!User::can('board.censoring')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
@@ -20,7 +20,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Forums();
         translate('admin/forums');
-        if (!Container::get('perms')->can(User::get(), 'board.forums')) {
+        if (!User::can('board.forums')) {
             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 (!Container::get('perms')->can(User::get(), 'board.groups')) {
+        if (!User::can('board.groups')) {
             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 (!Container::get('perms')->can(User::get(), 'mod.view')) {
+        if (!User::can('mod.view')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Maintenance();
         translate('admin/maintenance');
-        if (!Container::get('perms')->can(User::get(), 'board.maintenance')) {
+        if (!User::can('board.maintenance')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Options();
         translate('admin/options');
-        if (!Container::get('perms')->can(User::get(), 'board.options')) {
+        if (!User::can('board.options')) {
             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 (!Container::get('perms')->can(User::get(), 'board.parser')) {
+        if (!User::can('board.parser')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Permissions();
         translate('admin/permissions');
-        if (!Container::get('perms')->can(User::get(), 'board.permissions')) {
+        if (!User::can('board.permissions')) {
             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 (!Container::get('perms')->can(User::get(), 'board.plugins')) {
+        if (!User::can('board.plugins')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
@@ -19,7 +19,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Reports();
         translate('admin/reports');
-        if (!Container::get('perms')->can(User::get(), 'mod.reports')) {
+        if (!User::can('mod.reports')) {
             throw new Error(__('No permission'), '403');
         }
     }
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
@@ -19,7 +19,7 @@ public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Statistics();
         translate('admin/index');
-        if (!Container::get('perms')->can(User::get(), 'mod.statistics')) {
+        if (!User::can('mod.statistics')) {
             throw new Error(__('No permission'), '403');
         }
     }
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 (!Container::get('perms')->can(User::get(), 'board.updates')) {
+        if (!User::can('board.updates')) {
             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 (!Container::get('perms')->can(User::get(), 'mod.users')) {
+        if (!User::can('mod.users')) {
             throw new Error(__('No permission'), '403');
         }
     }
@@ -61,7 +61,7 @@ public function display($req, $res, $args)
 
         // Ban multiple users
         if (Input::post('ban_users') || Input::post('ban_users_comply')) {
-            if (!Container::get('perms')->can(User::get(), 'mod.bans')) {
+            if (!User::can('mod.bans')) {
                 throw new Error(__('No permission'), '403');
             }
 
diff --git a/featherbb/View/admin/menu.php b/featherbb/View/admin/menu.php
@@ -24,7 +24,7 @@
                             <ul>
 <?php foreach ($menu_items as $perm => $data) {
     if (preg_match('/^mod\..*$/', $perm)) {
-        if (Container::get('perms')->can(User::get(), $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";
         }
@@ -34,15 +34,15 @@
                         </div>
                     </div>
 <?php
-if (Container::get('perms')->can(User::get(), 'board.view')):
+if (User::can('board.view')):
 ?>
                     <h2 class="block2"><span><?php _e('Admin menu') ?></span></h2>
                     <div class="box">
                         <div class="inbox">
                             <ul>
 <?php foreach ($menu_items as $perm => $data) {
     if (preg_match('/^board\..*$/', $perm)) {
-        if (Container::get('perms')->can(User::get(), $perm)) {
+        if (User::can($perm)) {
             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 (!Container::get('perms')->can(User::get(), 'mod.bans')) {`
	`25`	`+ if (!User::can('mod.bans')) {`
`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 (!Container::get('perms')->can(User::get(), 'board.categories')) {`
	`24`	`+ if (!User::can('board.categories')) {`
`25`	`25`	`throw new Error(__('No permission'), '403');`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function __construct()`
`18`	`18`	`{`
`19`	`19`	`$this->model = new \FeatherBB\Model\Admin\Censoring();`
`20`	`20`	`translate('admin/censoring');`
`21`		`- if (!Container::get('perms')->can(User::get(), 'board.censoring')) {`
	`21`	`+ if (!User::can('board.censoring')) {`
`22`	`22`	`throw new Error(__('No permission'), '403');`
`23`	`23`	`}`
`24`	`24`	`}`
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\Forums();`
`22`	`22`	`translate('admin/forums');`
`23`		`- if (!Container::get('perms')->can(User::get(), 'board.forums')) {`
	`23`	`+ if (!User::can('board.forums')) {`
`24`	`24`	`throw new Error(__('No permission'), '403');`
`25`	`25`	`}`
`26`	`26`	`}`
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 (!Container::get('perms')->can(User::get(), 'board.groups')) {`
	`22`	`+ if (!User::can('board.groups')) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
`25`	`25`	`}`
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 (!Container::get('perms')->can(User::get(), 'mod.view')) {`
	`22`	`+ if (!User::can('mod.view')) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
`25`	`25`	`}`