renamed ActionRouter::checkPermissions to checkPreconditions

As discussed in #1933
dokuwiki · Apr 12, 2018 · b2c9cd1 · b2c9cd1
1 parent 13ce475
commit b2c9cd1
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 33 deletions.
diff --git a/_test/tests/inc/Action/general.test.php b/_test/tests/inc/Action/general.test.php
@@ -133,15 +133,15 @@ public function testBaseClassAclPermission($name) {
         $conf['subscribers'] = 1;
 
         try {
-            $class->checkPermissions();
+            $class->checkPreconditions();
         } catch(\Exception $e) {
             $this->assertNotSame(ActionAclRequiredException::class, get_class($e));
         }
 
         $conf['useacl'] = 0;
 
         try {
-            $class->checkPermissions();
+            $class->checkPreconditions();
         } catch(\Exception $e) {
             $this->assertSame(ActionAclRequiredException::class, get_class($e));
         }
@@ -166,15 +166,15 @@ public function testBaseClassUserPermission($name) {
         $_SERVER['REMOTE_USER'] = 'test';
 
         try {
-            $class->checkPermissions();
+            $class->checkPreconditions();
         } catch(\Exception $e) {
             $this->assertNotSame(ActionUserRequiredException::class, get_class($e));
         }
 
         unset($_SERVER['REMOTE_USER']);
 
         try {
-            $class->checkPermissions();
+            $class->checkPreconditions();
         } catch(\Exception $e) {
             $this->assertSame(ActionUserRequiredException::class, get_class($e));
         }

diff --git a/inc/Action/AbstractAclAction.php b/inc/Action/AbstractAclAction.php
@@ -14,8 +14,8 @@
 abstract class AbstractAclAction extends AbstractAction {
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
         global $conf;
         global $auth;
         if(!$conf['useacl']) throw new ActionAclRequiredException();

diff --git a/inc/Action/AbstractAction.php b/inc/Action/AbstractAction.php
@@ -44,12 +44,12 @@ public function __construct($actionname = '') {
     abstract public function minimumPermission();
 
     /**
-     * Check permissions are correct to run this action
+     * Check conditions are met to run this action
      *
      * @throws ActionException
      * @return void
      */
-    public function checkPermissions() {
+    public function checkPreconditions() {
     }
 
     /**

diff --git a/inc/Action/AbstractUserAction.php b/inc/Action/AbstractUserAction.php
@@ -14,8 +14,8 @@
 abstract class AbstractUserAction extends AbstractAclAction {
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
         global $INPUT;
         if(!$INPUT->server->str('REMOTE_USER')) {
             throw new ActionUserRequiredException();

diff --git a/inc/Action/Admin.php b/inc/Action/Admin.php
@@ -24,8 +24,8 @@ public function minimumPermission() {
         }
     }
 
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         global $INFO;
         if(!$INFO['ismanager']) {

diff --git a/inc/Action/Draft.php b/inc/Action/Draft.php
@@ -25,8 +25,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
         global $INFO;
         if(!file_exists($INFO['draft'])) throw new ActionException('edit');
     }

diff --git a/inc/Action/Edit.php b/inc/Action/Edit.php
@@ -26,8 +26,8 @@ public function minimumPermission() {
     /**
      * @inheritdoc falls back to 'source' if page not writable
      */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
         global $INFO;
 
         // no edit permission? view source

diff --git a/inc/Action/Login.php b/inc/Action/Login.php
@@ -19,9 +19,9 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
+    public function checkPreconditions() {
         global $INPUT;
-        parent::checkPermissions();
+        parent::checkPreconditions();
         if($INPUT->server->has('REMOTE_USER')) {
             // nothing to do
             throw new ActionException();

diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         /** @var \DokuWiki_Auth_Plugin $auth */
         global $auth;

diff --git a/inc/Action/Profile.php b/inc/Action/Profile.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         /** @var \DokuWiki_Auth_Plugin $auth */
         global $auth;

diff --git a/inc/Action/ProfileDelete.php b/inc/Action/ProfileDelete.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         /** @var \DokuWiki_Auth_Plugin $auth */
         global $auth;

diff --git a/inc/Action/Register.php b/inc/Action/Register.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         /** @var \DokuWiki_Auth_Plugin $auth */
         global $auth;

diff --git a/inc/Action/Resendpwd.php b/inc/Action/Resendpwd.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         /** @var \DokuWiki_Auth_Plugin $auth */
         global $auth;

diff --git a/inc/Action/Search.php b/inc/Action/Search.php
@@ -27,8 +27,8 @@ public function minimumPermission() {
      *
      * @inheritdoc
      */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
     }
 
     public function preProcess()

diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php
@@ -20,8 +20,8 @@ public function minimumPermission() {
     }
 
     /** @inheritdoc */
-    public function checkPermissions() {
-        parent::checkPermissions();
+    public function checkPreconditions() {
+        parent::checkPreconditions();
 
         global $conf;
         if(isset($conf['subscribers']) && !$conf['subscribers']) throw new ActionDisabledException();

diff --git a/inc/ActionRouter.php b/inc/ActionRouter.php
@@ -204,7 +204,7 @@ public function checkAction(AbstractAction $action) {
             throw new ActionDisabledException();
         }
 
-        $action->checkPermissions();
+        $action->checkPreconditions();
 
         if(isset($INFO)) {
             $perm = $INFO['perm'];