CHANGELOG.md

@@ -1,22 +1,3 @@
-pacKman 2023.11.04
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1+
-* Fix typo
-* Code review
-
-pacKman 2023.10.19
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1+
-* cosmetic code review
-
-pacKman 2023.10.13
-===========================================================
-* Require Dotclear 2.28
-* Require PHP 8.1+
-* Upgrade to last minute change to Dotclear 2.28
-
 pacKman 2023.10.09
 ===========================================================
 * Require Dotclear 2.28

README.md

@@ -1,7 +1,7 @@
 # README
 
-[![Release](https://img.shields.io/badge/release-2023.11.04-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/pacKman/releases)
+[![Release](https://img.shields.io/badge/release-2023.10.07-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/pacKman/releases)
-![Date](https://img.shields.io/badge/date-2023.11.04-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/pacKman)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/pacKman/src/branch/master/LICENSE)
@@ -16,9 +16,9 @@ _pacKman_ is a plugin for the open-source web publishing software called [Dotcle
 
 * Dotclear 2.28
 * PHP 8.1+
-* Dotclear super administrator permissions
+* Super administrator permissions
-* System writable cache directory 
+* A writable cache directory 
-* System writable directory to put packages. (can be VAR dir)
+* A writable directory to put packages. (can be VAR dir)
 
 ## USAGE
 
@@ -37,11 +37,11 @@ Once it's done you can manage your packages from menu
 * [Packages & details](https://git.dotclear.watch/JcDenis/pacKman/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/pacKman))
 * [Sources & contributions](https://git.dotclear.watch/JcDenis/pacKman) (or on [GitHub](https://github.com/JcDenis/pacKman))
 * [Issues & security](https://git.dotclear.watch/JcDenis/pacKman/issues) (or on [GitHub](https://github.com/JcDenis/pacKman/issues))
-* [Discuss & help](https://forum.dotclear.org/viewtopic.php?id=40066)
+* [Discuss and help](https://forum.dotclear.org/viewtopic.php?id=40066)
 
 ## CONTRIBUTORS
 
-* Jean-Christian Denis (author)
+* Jean-Christian Denis
 * Philippe aka Dissitou
 * franck-paul
 

_define.php

@@ -9,6 +9,7 @@
  * Manage your Dotclear packages.
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 declare(strict_types=1);
@@ -17,13 +18,12 @@ $this->registerModule(
     'Packages repository',
     'Manage your Dotclear packages',
     'Jean-Christian Denis',
-    '2023.11.04',
+    '2023.10.09',
     [
-        'requires'    => [['core', '2.28']],
+        'requires'   => [['core', '2.28']],
-        'permissions' => 'My',
+        'type'       => 'plugin',
-        'type'        => 'plugin',
+        'support'    => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
-        'support'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
+        'details'    => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
-        'details'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
+        'repository' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
-        'repository'  => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
     ]
 );

dcstore.xml

@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="pacKman">
     <name>Packages repository</name>
-    <version>2023.11.04</version>
+    <version>2023.10.09</version>
     <author>Jean-Christian Denis</author>
     <desc>Manage your Dotclear packages</desc>
-    <file>https://git.dotclear.watch/JcDenis/pacKman/releases/download/v2023.11.04/plugin-pacKman.zip</file>
+    <file>https://git.dotclear.watch/JcDenis/pacKman/releases/download/v2023.10.09/plugin-pacKman.zip</file>
     <da:dcmin>2.28</da:dcmin>
     <da:details>https://git.dotclear.watch/JcDenis/pacKman/src/branch/master/README.md</da:details>
     <da:support>https://git.dotclear.watch/JcDenis/pacKman/issues</da:support>

locales/fr/resources.php

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

src/Backend.php

@@ -9,10 +9,11 @@ use Dotclear\Core\Process;
 use Dotclear\Core\Backend\Favorites;
 
 /**
- * @brief       pacKman backend class.
+ * @brief   pacKman backend class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Backend extends Process

src/Config.php

@@ -21,10 +21,11 @@ use Dotclear\Helper\Html\Form\{
 use Exception;
 
 /**
- * @brief       pacKman configuration class.
+ * @brief   pacKman configuration class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Config extends Process
@@ -59,7 +60,7 @@ class Config extends Process
             Notices::addSuccessNotice(
                 __('Configuration has been successfully updated.')
             );
-            App::backend()->url()->redirect('admin.plugins', [
+            App::backend()->url->redirect('admin.plugins', [
                 'module' => My::id(),
                 'conf'   => '1',
                 'redir'  => App::backend()->__get('list')->getRedir(),
@@ -111,7 +112,7 @@ class Config extends Process
                 // pack_repository
                 (new Para())->items([
                     (new Label($check_repo . __('Path to repository:')))->for('pack_repository'),
-                    (new Input('pack_repository'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_repository),
+                    (new Input('pack_repository'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_repository),
                 ]),
                 (new Note())->class('form-note')->text(
                     sprintf(
@@ -131,13 +132,13 @@ class Config extends Process
                 // pack_filename
                 (new Para())->items([
                     (new Label($check_first . __('Name of exported package:')))->for('pack_filename'),
-                    (new Input('pack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_filename),
+                    (new Input('pack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_filename),
                 ]),
                 (new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%'))->class('form-note'),
                 // secondpack_filename
                 (new Para())->items([
                     (new Label($check_second . __('Name of second exported package:')))->for('secondpack_filename'),
-                    (new Input('secondpack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->secondpack_filename),
+                    (new Input('secondpack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->secondpack_filename),
                 ]),
                 (new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%-%version%'))->class('form-note'),
                 // pack_overwrite
@@ -150,7 +151,7 @@ class Config extends Process
                 // pack_excludefiles
                 (new Para())->items([
                     (new Label(__('Extra files to exclude from package:')))->for('pack_excludefiles'),
-                    (new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_excludefiles),
+                    (new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_excludefiles),
                 ]),
                 (new Note())->text(sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz'))->class('form-note'),
                 // pack_nocomment

src/Core.php

@@ -12,10 +12,11 @@ use Dotclear\Module\ModuleDefine;
 use Exception;
 
 /**
- * @brief       pacKman main class.
+ * @brief   pacKman main class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Core

src/Install.php

@@ -9,10 +9,11 @@ use Dotclear\Core\Process;
 use Exception;
 
 /**
- * @brief       pacKman install class.
+ * @brief   pacKman install class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Install extends Process

src/Manage.php

@@ -19,10 +19,11 @@ use Dotclear\Helper\Network\Http;
 use Exception;
 
 /**
- * @brief       pacKman manage page class.
+ * @brief   pacKman manage page class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Manage extends Process

src/My.php

@@ -8,10 +8,11 @@ use Dotclear\App;
 use Dotclear\Module\MyPlugin;
 
 /**
- * @brief       pacKman My plugin helper.
+ * @brief   pacKman My plugin helper.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class My extends MyPlugin
@@ -36,10 +37,7 @@ class My extends MyPlugin
 
     public static function checkCustomContext(int $context): ?bool
     {
-        return match ($context) {
+        // Only backend and super admin
-            // Limit to super admin
+        return $context === self::INSTALL ? null : App::task()->checkContext('BACKEND') && App::auth()->isSuperAdmin();
-            self::MODULE => App::auth()->isSuperAdmin(),
-            default      => null,
-        };
     }
 }

src/Settings.php

@@ -5,75 +5,40 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\pacKman;
 
 /**
- * @brief       pacKman settings class.
+ * @brief   pacKman settings class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Settings
 {
-    /**
+    // Remove comments from files
-     * Remove comments from files.
-     *
-     * @var     bool   $pack_nocomment
-     */
     public readonly bool $pack_nocomment;
 
-    /**
+    // Remove comments from files
-     * Remove comments from files.
-     *
-     * @var     bool    $pack_fixnewline
-     */
     public readonly bool $pack_fixnewline;
 
-    /**
+    // Overwrite existing package
-     * Overwrite existing package.
-     *
-     * @var     bool    $pack_overwrite
-     */
     public readonly bool $pack_overwrite;
 
-    /**
+    // Name of package
-     * Name of package.
-     *
-     * @var     string  $pack_filename
-     */
     public readonly string $pack_filename;
 
-    /**
+    // Name of second package
-     * Name of second package.
-     *
-     * @var     string  $secondpack_filename
-     */
     public readonly string $secondpack_filename;
 
-    /**
+    // Path to package repository
-     * Path to package repository.
-     *
-     * @var     string  $pack_repository
-     */
     public readonly string $pack_repository;
 
-    /**
+    // Seperate themes and plugins repository
-     * Seperate themes and plugins repository.
-     *
-     * @var     bool    $pack_typedrepo
-     */
     public readonly bool $pack_typedrepo;
 
-    /**
+    // Extra files to exclude from package
-     * Extra files to exclude from package.
-     *
-     * @var     string  $pack_excludefiles
-     */
     public readonly string $pack_excludefiles;
 
-    /**
+    // Hide distributed modules from lists
-     * Hide distributed modules from lists.
-     *
-     * @var     bool    $hide_distrib
-     */
     public readonly bool $hide_distrib;
 
     /**

src/Uninstall.php

@@ -8,10 +8,11 @@ use Dotclear\Core\Process;
 use Dotclear\Plugin\Uninstaller\Uninstaller;
 
 /**
- * @brief       pacKman Uninstaller class.
+ * @brief   pacKman Uninstaller class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Uninstall extends Process

src/Utils.php

@@ -25,10 +25,11 @@ use Dotclear\Module\ModuleDefine;
 use Exception;
 
 /**
- * @brief       pacKman utils class.
+ * @brief   pacKman utils class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Utils
@@ -98,7 +99,7 @@ class Utils
     /**
      * Get modules list form.
      *
-     * @param   array<int|string, mixed>    $modules    The modules
+     * @param   array<int,ModuleDefine>     $modules    The modules
      * @param   string                      $type       The modules type
      * @param   string                      $title      The list title
      *
@@ -116,9 +117,6 @@ class Utils
         $tbody = [];
         self::sort($modules);
         foreach ($modules as $module) {
-            if (!is_a($module, ModuleDefine::class)) {
-                continue;
-            }
             $tbody[] = (new Para(null, 'tr'))
                 ->class('line')
                 ->items([
@@ -228,7 +226,7 @@ class Utils
         if (str_contains($type, 'repository')) {
             $helpers_addon[] = (new Link())
                 ->class('button')
-                ->href(App::backend()->url()->get('admin.plugin.' . My::id(), ['purge' => 1]) . '#packman-repository-' . $type)
+                ->href(App::backend()->url->get('admin.plugin.' . My::id(), ['purge' => 1]) . '#packman-repository-' . $type)
                 ->text(__('Select non lastest versions'))
             ;
         }
@@ -276,7 +274,7 @@ class Utils
                             (new Text('a', Html::escapeHTML(basename($module->get('root')))))
                                 ->class('packman-download')
                                 ->extra(
-                                    'href="' . App::backend()->url()->get('admin.plugin.' . My::id(), [
+                                    'href="' . App::backend()->url->get('admin.plugin.' . My::id(), [
                                         'package' => basename($module->get('root')),
                                         'repo'    => $type,
                                     ]) . '"'

src/Zip.php

@@ -5,13 +5,14 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\pacKman;
 
 /**
- * @brief       pacKman zip class.
+ * @brief   pacKman zip class.
- * @ingroup     pacKman
+ * @ingroup pacKman
  *
  * This class extends dotclear zip class
  * to tweak writeFile method.
  *
  * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Zip extends \Dotclear\Helper\File\Zip\Zip