CHANGELOG.md

@@ -1,9 +1,3 @@
-dcAdvancedCleaner 1.5 - 2023.10.13
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1
-* Code review
-
 dcAdvancedCleaner 1.4 - 2023.10.07
 ===========================================================
 * Require Dotclear 2.28

README.md

@@ -1,7 +1,7 @@
 # README
 
-[![Release](https://img.shields.io/badge/release-1.5-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases)
+[![Release](https://img.shields.io/badge/release-1.4-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases)
-![Date](https://img.shields.io/badge/date-2023.10.13-c44d58.svg)
+![Date](https://img.shields.io/badge/date-2023.10.07-c44d58.svg)
 [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/src/branch/master/LICENSE)
@@ -14,10 +14,10 @@ _dcAdvancedCleaner_ is a plugin for the open-source web publishing software call
 
 ## REQUIREMENTS
 
-* Dotclear 2.28
-* PHP 8.1+
-* Plugin Uninstaller
 * Permissions superadmin
+* Dotclear 2.28
+* PHP >= 8.1
+* Plugin Uninstaller
 
 ## USAGE
 
@@ -32,12 +32,7 @@ Once it's done you can manage cleaners from menu
 * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
 * Source & contribution : [Gitea Page](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner) or [GitHub Page](https://github.com/JcDenis/dcAdvancedCleaner)
 * Packages & details: [Gitea Page](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner)
-
+* Discuss and help : [Dotclear Forum](https://forum.dotclear.org/viewtopic.php?id=40381)
-* [License](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/src/branch/master/LICENSE)
-* [Packages & details](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner))
-* [Sources & contributions](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner) (or on [GitHub](https://github.com/JcDenis/dcAdvancedCleaner))
-* [Issues & security](https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/issues) (or on [GitHub](https://github.com/JcDenis/dcAdvancedCleaner/issues))
-* [Discuss & help](https://forum.dotclear.org/viewtopic.php?id=40381)
 
 ## CONTRIBUTORS
 

_define.php

@@ -1,30 +1,31 @@
 <?php
-
 /**
- * @file
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
- * @brief       The plugin dcAdvancedCleaner definition
- * @ingroup     dcAdvancedCleaner
  *
- * @defgroup    dcAdvancedCleaner Plugin dcAdvancedCleaner.
+ * @package Dotclear
+ * @subpackage Plugin
  *
- * Make a huge cleaning of dotclear.
+ * @author Jean-Christian Denis and Contributors
  *
- * @author      Jean-Christian Denis (author)
+ * @copyright Jean-Christian Denis
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-declare(strict_types=1);
+if (!defined('DC_RC_PATH')) {
+    return null;
+}
 
 $this->registerModule(
     'Advanced cleaner',
     'Make a huge cleaning of dotclear',
     'Jean-Christian Denis and Contributors',
-    '1.5',
+    '1.4',
     [
         'requires' => [
+            ['php', '8.1'],
             ['core', '2.28'],
             ['Uninstaller', '1.0'],
         ],
-        'permissions' => 'My',
+        'permissions' => null,
         'type'        => 'plugin',
         'support'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
         'details'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',

dcstore.xml

@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="dcAdvancedCleaner">
     <name>Advanced cleaner</name>
-    <version>1.5</version>
+    <version>1.4</version>
     <author>Jean-Christian Denis and Contributors</author>
     <desc>Make a huge cleaning of dotclear</desc>
-    <file>https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases/download/v1.5/plugin-dcAdvancedCleaner.zip</file>
+    <file>https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/releases/download/v1.4/plugin-dcAdvancedCleaner.zip</file>
     <da:dcmin>2.28</da:dcmin>
     <da:details>https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/src/branch/master/README.md</da:details>
     <da:support>https://git.dotclear.watch/JcDenis/dcAdvancedCleaner/issues</da:support>

locales/en/resources.php

@@ -1,11 +1,16 @@
 <?php
-
 /**
- * @file
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
- * @brief   dcAdvancedCleaner resources helper.
- * @ingroup dcAdvancedCleaner
  *
- * @author      Jean-Christian Denis (author)
+ * @package Dotclear
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-\Dotclear\App::backend()->resources()->set('help', 'dcAdvancedCleaner', __DIR__ . '/help/dcAdvancedCleaner.html');
+if (!defined('DC_RC_PATH')) {
+    return;
+}
+dcCore::app()->resources['help']['dcAdvancedCleaner'] = __DIR__ . '/help/dcAdvancedCleaner.html';

locales/fr/resources.php

@@ -1,11 +1,16 @@
 <?php
-
 /**
- * @file
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
- * @brief   dcAdvancedCleaner resources helper.
- * @ingroup dcAdvancedCleaner
  *
- * @author      Jean-Christian Denis (author)
+ * @package Dotclear
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-\Dotclear\App::backend()->resources()->set('help', 'dcAdvancedCleaner', __DIR__ . '/help/dcAdvancedCleaner.html');
+if (!defined('DC_RC_PATH')) {
+    return;
+}
+dcCore::app()->resources['help']['dcAdvancedCleaner'] = __DIR__ . '/help/dcAdvancedCleaner.html';

src/Backend.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -8,13 +18,6 @@ use Dotclear\App;
 use Dotclear\Core\Process;
 use Dotclear\Core\Backend\Favorites;
 
-/**
- * @brief   dcAdvancedCleaner backend class.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class Backend extends Process
 {
     public static function init(): bool

src/Manage.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -25,13 +35,6 @@ use Dotclear\Helper\Html\Form\{
 use Dotclear\Helper\Html\Html;
 use Exception;
 
-/**
- * @brief   dcAdvancedCleaner manage class.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class Manage extends Process
 {
     public static function init(): bool

src/ManageVars.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -11,62 +21,27 @@ use Dotclear\Plugin\Uninstaller\{
 };
 use Exception;
 
-/**
- * @brief   dcAdvancedCleaner vars definition class.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class ManageVars
 {
-    /**
+    /** @var    ManageVars  self instance */
-     * self instance.
-     *
-     * @var     ManageVars  $container
-     */
     private static $container;
 
-    /**
+    /** @var    CleanersStack   The cleaners stack */
-     * The cleaners stack.
-     *
-     * @var     CleanersStack   $cleaners
-     */
     public readonly CleanersStack $cleaners;
 
-    /**
+    /** @var    null|CleanerParent  The post form cleaner */
-     * The post form cleaner.
-     *
-     * @var     null|CleanerParent  $cleaner
-     */
     public readonly ?CleanerParent $cleaner;
 
-    /**
+    /** @var string     $related    The post form related action id */
-     * The post form related action id.
-     *
-     * @var     string  $related
-     */
     public readonly string $related;
 
-    /**
+    /** @var    array<int,string>   The post form selected ns */
-     * The post form selected ns.
-     *
-     * @var     array<int,string>   $entries
-     */
     public readonly array $entries;
 
-    /**
+    /** @var    string  The post form action id */
-     * The post form action id.
-     *
-     * @var     string  $action
-     */
     public readonly string $action;
 
-    /**
+    /** @var    array<string,string>    The form actions combo */
-     * The form actions combo.
-     *
-     * @var     array<string,string>    $combo
-     */
     public readonly array $combo;
 
     protected function __construct()

src/My.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -7,18 +17,10 @@ namespace Dotclear\Plugin\dcAdvancedCleaner;
 use Dotclear\App;
 use Dotclear\Module\MyPlugin;
 
-/**
- * @brief   dcAdvancedCleaner My helper.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class My extends MyPlugin
 {
     public static function checkCustomContext(int $context): ?bool
     {
-        // Limit to backend and super admin
+        return $context === self::PREPEND ? App::auth()->isSuperAdmin() : null;
-        return App::task()->checkContext('BACKEND') && App::auth()->isSuperAdmin();
     }
 }

src/Prepend.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -12,13 +22,6 @@ use Dotclear\Plugin\activityReport\{
 };
 use Dotclear\Plugin\Uninstaller\Uninstaller;
 
-/**
- * @brief   dcAdvancedCleaner prepend class.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class Prepend extends Process
 {
     public static function init(): bool

src/Uninstall.php

@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * @brief dcAdvancedCleaner, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and Contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\dcAdvancedCleaner;
@@ -7,13 +17,6 @@ namespace Dotclear\Plugin\dcAdvancedCleaner;
 use Dotclear\Core\Process;
 use Dotclear\Plugin\Uninstaller\Uninstaller;
 
-/**
- * @brief   dcAdvancedCleaner uninstall class.
- * @ingroup dcAdvancedCleaner
- *
- * @author      Jean-Christian Denis (author)
- * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 class Uninstall extends Process
 {
     public static function init(): bool