diff --git a/inc/Action/AbstractAction.php b/inc/Action/AbstractAction.php index 747c20f2f39c7b8ec395483056069758c95d2bf7..fe139892ad60026e4c71d3f20881b1ccad03b95f 100644 --- a/inc/Action/AbstractAction.php +++ b/inc/Action/AbstractAction.php @@ -41,7 +41,7 @@ abstract class AbstractAction { * * @return int */ - abstract function minimumPermission(); + abstract public function minimumPermission(); /** * Check permissions are correct to run this action diff --git a/inc/Action/Admin.php b/inc/Action/Admin.php index dfe4e11be808e4c62d84d81ac201246ea04b0280..b1f9095ee59c0d345801cabb1a5ae7d3cab2107f 100644 --- a/inc/Action/Admin.php +++ b/inc/Action/Admin.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException; class Admin extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['ismanager']) { diff --git a/inc/Action/Backlink.php b/inc/Action/Backlink.php index 007cc4bc4b3c402f72f89c5992af7b99852682c0..0337917b35b363ab7145cf54d5dfa1cff389072f 100644 --- a/inc/Action/Backlink.php +++ b/inc/Action/Backlink.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Backlink extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Check.php b/inc/Action/Check.php index 38cfd5994e2e85bc1352d63a74bc0ee269f310fa..36ae8e8bd279da7f4581ca3f0b385b32e1097a03 100644 --- a/inc/Action/Check.php +++ b/inc/Action/Check.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Check extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Conflict.php b/inc/Action/Conflict.php index 9f01e9d3e8c8faf3a3ba74f2ea324f7dbd319476..d880b5b28f48d2ad7180eef33e0a7a8eb0e16b3c 100644 --- a/inc/Action/Conflict.php +++ b/inc/Action/Conflict.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Conflict extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['exists']) { return AUTH_EDIT; diff --git a/inc/Action/Denied.php b/inc/Action/Denied.php index ec2619f6d005c28922d8cf8e755d2f44c557401c..c8e01926265cb86dd3b373cb2c69c4830b966dca 100644 --- a/inc/Action/Denied.php +++ b/inc/Action/Denied.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Denied extends AbstractAclAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Diff.php b/inc/Action/Diff.php index 0ced9d8246ba6d692bd9af871958aab226e570df..b14b1d04ed91c4bb47fc739b4c339080a9d4143c 100644 --- a/inc/Action/Diff.php +++ b/inc/Action/Diff.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Diff extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Draft.php b/inc/Action/Draft.php index 798ff789e7bc7e511fee65b502e200573f715e9c..0346cae3bbe829b87223378ddd5f0729b0ad8414 100644 --- a/inc/Action/Draft.php +++ b/inc/Action/Draft.php @@ -13,7 +13,7 @@ namespace dokuwiki\Action; class Draft extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['exists']) { return AUTH_EDIT; diff --git a/inc/Action/Draftdel.php b/inc/Action/Draftdel.php index c2ee9aa53555f5d4da50e8283e50e9b01d00d799..a3e1f28e68dd636e1f1c80816a2450351421a234 100644 --- a/inc/Action/Draftdel.php +++ b/inc/Action/Draftdel.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Draftdel extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_EDIT; } diff --git a/inc/Action/Edit.php b/inc/Action/Edit.php index 051a7496ce6d5116c8ad9b21bcc814174d65a615..7483516811ccd85e9315846921540a0aae19a2c9 100644 --- a/inc/Action/Edit.php +++ b/inc/Action/Edit.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Edit extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['exists']) { return AUTH_READ; // we check again below @@ -36,6 +36,7 @@ class Edit extends AbstractAction { } } + /** @inheritdoc */ public function preProcess() { global $ID; global $INFO; @@ -82,6 +83,7 @@ class Edit extends AbstractAction { lock($ID); } + /** @inheritdoc */ public function tplContent() { html_edit(); } diff --git a/inc/Action/Export.php b/inc/Action/Export.php index e27f67f57c2dfd450775f0ae460dbe22b3581082..1eec27ec3a260e5677cfe684cce59b7f80d79526 100644 --- a/inc/Action/Export.php +++ b/inc/Action/Export.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Export extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Index.php b/inc/Action/Index.php index adb6c508a499352eda4d64200d916467de672a0a..c87a3f89cd97ace23baffae2d5d83346084b25d6 100644 --- a/inc/Action/Index.php +++ b/inc/Action/Index.php @@ -12,10 +12,11 @@ namespace dokuwiki\Action; class Index extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } + /** @inheritdoc */ public function tplContent() { global $IDX; html_index($IDX); diff --git a/inc/Action/Locked.php b/inc/Action/Locked.php index 969c989764c90afa58a982484a79d27450424c83..3ff2c5b8016be2977978d8dcdefd6f94a2ffe73d 100644 --- a/inc/Action/Locked.php +++ b/inc/Action/Locked.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Locked extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Login.php b/inc/Action/Login.php index a46a2f0aa904175bb4c0dc4ec4ec13b5d5e38ddf..982e3c7c2df1ec0d1c450dc3fe726023ad10098d 100644 --- a/inc/Action/Login.php +++ b/inc/Action/Login.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException; class Login extends AbstractAclAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php index 3622b5bd8ea5d798723ddc0be6dd7acc78c22e9c..88f2673bd66930e93b8a2a81d9172d81d41ec813 100644 --- a/inc/Action/Logout.php +++ b/inc/Action/Logout.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionException; class Logout extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Media.php b/inc/Action/Media.php index c6186f93467bb4469b50f7388894236e8014b3b5..77a2a6f0d45cbd3d21c0d0d60dca2c166fac70c3 100644 --- a/inc/Action/Media.php +++ b/inc/Action/Media.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Media extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Plugin.php b/inc/Action/Plugin.php index fea45f3bb623b1858f5975894ffbf45fe45c535b..c3e16bf875520e10df3bff225a7b76f1e78a041c 100644 --- a/inc/Action/Plugin.php +++ b/inc/Action/Plugin.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Plugin extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Profile.php b/inc/Action/Profile.php index 24bd85fbf5b5d11d95eb194f109daff22d77dd42..6931a2589c90d6379bf1a76039bf6b51495b5d0e 100644 --- a/inc/Action/Profile.php +++ b/inc/Action/Profile.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Profile extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/ProfileDelete.php b/inc/Action/ProfileDelete.php index ee6262b17d07834300cfb58a48aac26b63e2e31a..40336fba1f63ed0aa348478befddedd05d6a237f 100644 --- a/inc/Action/ProfileDelete.php +++ b/inc/Action/ProfileDelete.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class ProfileDelete extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Recent.php b/inc/Action/Recent.php index e32f225c673493c2c06110171a0bbc830d597a54..39273b826e4a8be4824e4f5b1b5affbae04192c4 100644 --- a/inc/Action/Recent.php +++ b/inc/Action/Recent.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Recent extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Register.php b/inc/Action/Register.php index e2de119c95e41908db7b9fab941094dcc10370d8..50fa2894d1a0b7cc08911e109be71a09d6fc0592 100644 --- a/inc/Action/Register.php +++ b/inc/Action/Register.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Register extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Resendpwd.php b/inc/Action/Resendpwd.php index 5614b465a776ee612710f2484c14d0f20a4620c4..16548f3834ace2c2f4f8934cc523922cf33a00a7 100644 --- a/inc/Action/Resendpwd.php +++ b/inc/Action/Resendpwd.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Resendpwd extends AbstractAclAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Revert.php b/inc/Action/Revert.php index 5d86656c7a7dda52ce5475cc575d8e0ce607a8f1..559121cce339ae4bb5ec3b3c8791ce4c8bcffd9a 100644 --- a/inc/Action/Revert.php +++ b/inc/Action/Revert.php @@ -15,7 +15,7 @@ use dokuwiki\Action\Exception\ActionException; class Revert extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['ismanager']) { return AUTH_EDIT; @@ -24,8 +24,13 @@ class Revert extends AbstractAction { } } - // fixme check for writability of the current page ($INFO might do it wrong and check the attic version) - + /** + * + * @inheritdoc + * @throws ActionAbort + * @throws ActionException + * @todo check for writability of the current page ($INFO might do it wrong and check the attic version) + */ public function preProcess() { if(!checkSecurityToken()) throw new ActionException(); diff --git a/inc/Action/Revisions.php b/inc/Action/Revisions.php index 941fb6ec53540703435931bab4c4279f57f5c4cd..b8db531c78ae88d69dbfd5b12c68ee717ef872aa 100644 --- a/inc/Action/Revisions.php +++ b/inc/Action/Revisions.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Revisions extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Save.php b/inc/Action/Save.php index 328c218e01ee31164a5c6bcb60830114c56f12c1..dd6da567be40db9ee1c2b3aadeef20744698f179 100644 --- a/inc/Action/Save.php +++ b/inc/Action/Save.php @@ -15,7 +15,7 @@ use dokuwiki\Action\Exception\ActionException; class Save extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { global $INFO; if($INFO['exists']) { return AUTH_EDIT; diff --git a/inc/Action/Search.php b/inc/Action/Search.php index 32a36fca29692b3c9666192eeecdcc78b454dcd3..d4833f4539c7e828fc4b79003e596cb7a6a2bdde 100644 --- a/inc/Action/Search.php +++ b/inc/Action/Search.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\ActionAbort; class Search extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Show.php b/inc/Action/Show.php index 861a91b900248030f2ecb201b2c8e1a24f01cd34..6dbe9a15c253755484c7fc384bd4e1e660f46374 100644 --- a/inc/Action/Show.php +++ b/inc/Action/Show.php @@ -18,7 +18,7 @@ namespace dokuwiki\Action; class Show extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Sitemap.php b/inc/Action/Sitemap.php index 6d72dd27b6c4356ad26df2157cb68e2efdef71c9..025c5153c9d59a4f7bad216fc5554f8114ef08b4 100644 --- a/inc/Action/Sitemap.php +++ b/inc/Action/Sitemap.php @@ -14,7 +14,7 @@ use dokuwiki\Action\Exception\FatalException; class Sitemap extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_NONE; } diff --git a/inc/Action/Source.php b/inc/Action/Source.php index 567ce21d5b75141f6e4171896972acadc00b6cfc..fa3c88a4f648088b9494501c34282f1e68ffd6f1 100644 --- a/inc/Action/Source.php +++ b/inc/Action/Source.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Source extends AbstractAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; } diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php index c90d73fdc46d8f5bca20566c5e05991c56ddb852..762c327833c5c2fd7b5d002e695c5a1cc60cad64 100644 --- a/inc/Action/Subscribe.php +++ b/inc/Action/Subscribe.php @@ -12,7 +12,7 @@ namespace dokuwiki\Action; class Subscribe extends AbstractUserAction { /** @inheritdoc */ - function minimumPermission() { + public function minimumPermission() { return AUTH_READ; }