12 changed files with 180 additions and 161 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,83 +1,62 @@
-licenseBootstrap 2023.08.14
-===========================================================
-* Require Dotclear 2.27
-* Require PHP 8.1
-* Upgrade to Dotclear 2.27 stable
-* Move third party repository
-* Use Dotclear style for CHANGELOG
+2023.05.13
+- require dotclea r2.26
+- require php 8.1
+- use define php_min
+- fix dump() method

-licenseBootstrap 2023.05.13
-===========================================================
-* require dotclea r2.26
-* require php 8.1
-* use define php_min
-* fix dump() method
+2023.04.22
+- require dotclea r2.26
+- require php 8.1
+- add plugin Uninstaller features
+- use latest helper namespace
+- fix nullsafe warnings

-licenseBootstrap 2023.04.22
-===========================================================
-* require dotclea r2.26
-* require php 8.1
-* add plugin Uninstaller features
-* use latest helper namespace
-* fix nullsafe warnings
+2023.03.25
+- require dotclea r2.26
+- require php 8.1
+- use namespace

-licenseBootstrap 2023.03.25
-===========================================================
-* require dotclea r2.26
-* require php 8.1
-* use namespace
+2022.12.22
+- add wtfpl license
+- use SVG icon
+- use anonymous function
+- use abstract plugin id
+- change serialize stuff into json stuff
+- fix pacKman behavoir dis|enable
+- fix autoload
+- fix permissions
+- fix install

-licenseBootstrap 2022.12.22
-===========================================================
-* add wtfpl license
-* use SVG icon
-* use anonymous function
-* use abstract plugin id
-* change serialize stuff into json stuff
-* fix pacKman behavoir dis|enable
-* fix autoload
-* fix permissions
-* fix install
+2022.11.20
+- fix compatibility with Dotclear 2.24 (required)

-licenseBootstrap 2022.11.20
-===========================================================
-* fix compatibility with Dotclear 2.24 (required)
+2021.09.10
+- clean up code
+- Tested for Dotclear 2.19

-licenseBootstrap 2021.09.10
-===========================================================
-* clean up code
-* Tested for Dotclear 2.19
+2013.12.01
+- Fix install
+- Fix user info

-licenseBootstrap 2013.12.01
-===========================================================
-* Fix install
-* Fix user info
+2013.10.29
+- Fix full license bug
+- Fix french help and support links

-licenseBootstrap 2013.10.29
-===========================================================
-* Fix full license bug
-* Fix french help and support links
+2013.10.28
+- Switched to DC 2.6
+- New icon
+- Add dashboard icon
+- Clean up code and (again) lighter admin interface

-licenseBootstrap 2013.10.28
-===========================================================
-* Switched to DC 2.6
-* New icon
-* Add dashboard icon
-* Clean up code and (again) lighter admin interface
+2013.05.11
+- Fixed page title and messages and contents

-licenseBootstrap 2013.05.11
-===========================================================
-* Fixed page title and messages and contents
+0.3 - 2010.06.05
+- Switched to DC 2.2
+- Changed admin interface (easy, light, fast)

-licenseBootstrap 0.3 - 2010.06.05
-===========================================================
-* Switched to DC 2.2
-* Changed admin interface (easy, light, fast)
+0.2 - 2009.11.09
+- Changed lots of things

-licenseBootstrap 0.2 - 2009.11.09
-===========================================================
-* Changed lots of things
-
-licenseBootstrap 0.1 - 2009.10.09
-===========================================================
-* First lab release
+0.1 - 2009.10.09
+- First lab release
--- a/README.md
+++ b/README.md
@ -1,14 +1,15 @@
 # README

-[![Release](https://img.shields.io/badge/release-2023.08.15-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/licenseBootstrap/releases)
-[![Date](https://img.shields.io/badge/date-2023.08.14-c44d58.svg)](https://git.dotclear.watch/JcDenis/licenseBootstrap/releases)
-[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-137bbb.svg)](https://fr.dotclear.org/download)
-[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/licenseBootstrap)
-[![License](https://img.shields.io/github/license/JcDenis/licenseBootstrap)](https://git.dotclear.watch/JcDenis/licenseBootstrap/blob/master/LICENSE)
+[![Release](https://img.shields.io/github/v/release/JcDenis/licenseBootstrap)](https://github.com/JcDenis/licenseBootstrap/releases)
+[![Date](https://img.shields.io/github/release-date/JcDenis/licenseBootstrap)](https://github.com/JcDenis/licenseBootstrap/releases)
+[![Issues](https://img.shields.io/github/issues/JcDenis/licenseBootstrap)](https://github.com/JcDenis/licenseBootstrap/issues)
+[![Dotclear](https://img.shields.io/badge/dotclear-v2.26-blue.svg)](https://fr.dotclear.org/download)
+[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/licenseBootstrap)
+[![License](https://img.shields.io/github/license/JcDenis/licenseBootstrap)](https://github.com/JcDenis/licenseBootstrap/blob/master/LICENSE)

 ## WHAT IS LICENSEBOOTSTRAP ?

-_licenseBootstrap_ is a plugins for the open-source 
+licenseBootstrap is a plugins for the open-source 
 web publishing software called Dotclear.

 It help super admin to add license to their 
@ -16,15 +17,15 @@ themes and plugins from Dotclear administration pages.

 ## REQUIREMENTS

-_licenseBootstrap_ requires: 
+ licenseBootstrap requires: 

-* Super administrator permissions
-* Dotclear 2.26
-* Php 8.1+
+  * Super administrator permissions
+  * Dotclear 2.26
+  * Php >= 8.1

 ## USAGE

-First install _licenseBootstrap_, mannualy from a zip package or from 
+First install licenseBootstrap, mannualy from a zip package or from 
 Dotaddict repository. (See Dotclear's documentation to know how do this)

 Go to ''plugins manager'', expand licenseBootstrap information then 
@ -33,18 +34,18 @@ go to ''configure plugin'', fill in form.
 Once it's done you can manage your modules license from menu 
 ''License bootstrap'' on sidebar or you can add dashboard icon.

-By default, _licenseBootstrap_ uses old style code blocs,
+By default, licenseBootstrap uses old style code blocs,
 if you want a modern style you should use a more recent plugin 
 like the one called ''improve''.

 ## LINKS

-* License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
-* Source & contribution : [Gitea Page](https://git.dotclear.watch/JcDenis/licenseBootstrap) or [GitHub Page](https://github.com/JcDenis/licenseBootstrap)
-* Packages & details: [Gitea Page](https://git.dotclear.watch/JcDenis/licenseBootstrap/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/licenseBootstrap)
+ * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
+ * Source & contribution : [GitHub Page](https://github.com/licenseBootstrap)
+ * Packages & details : [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/licenseBootstrap)

 ## CONTRIBUTORS

-* Jean-Christian Denis (author)
+ * Jean-Christian Denis

-You are welcome to contribute to this code.
+ You are welcome to contribute to this code.
--- a/_define.php
+++ b/_define.php
@ -18,7 +18,7 @@ $this->registerModule(
    'License bootstrap',
    'Add license to your plugins and themes',
    'Jean-Christian Denis',
-    '2023.08.15',
+    '2023.05.13',
    [
        'requires' => [
            ['php', '8.1'],
@ -26,8 +26,8 @@ $this->registerModule(
        ],
        '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',
-        'repository'  => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
+        'support'     => 'https://github.com/JcDenis/' . basename(__DIR__),
+        'details'     => 'https://plugins.dotaddict.org/dc2/details/' . basename(__DIR__),
+        'repository'  => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/dcstore.xml',
    ]
 );
--- a/dcstore.xml
+++ b/dcstore.xml
@ -2,12 +2,12 @@
 <modules xmlns:da="http://dotaddict.org/da/">
  <module id="licenseBootstrap">
    <name>License bootstrap</name>
-    <version>2023.08.15</version>
+    <version>2023.05.13</version>
    <author>Jean-Christian Denis</author>
    <desc>Add license to your plugins and themes</desc>
-    <file>https://git.dotclear.watch/JcDenis/licenseBootstrap/releases/download/v2023.08.15/plugin-licenseBootstrap.zip</file>
+    <file>https://github.com/JcDenis/licenseBootstrap/releases/download/v2023.05.13/plugin-licenseBootstrap.zip</file>
    <da:dcmin>2.26</da:dcmin>
-    <da:details>https://git.dotclear.watch/JcDenis/licenseBootstrap/src/branch/master/README.md</da:details>
-    <da:support>https://git.dotclear.watch/JcDenis/licenseBootstrap/issues</da:support>
+    <da:details>https://plugins.dotaddict.org/dc2/details/licenseBootstrap</da:details>
+    <da:support>https://github.com/JcDenis/licenseBootstrap</da:support>
  </module>
 </modules>
--- a/src/Backend.php
+++ b/src/Backend.php
@ -14,37 +14,37 @@ declare(strict_types=1);

 namespace Dotclear\Plugin\licenseBootstrap;

+use dcAdmin;
 use dcCore;
-use Dotclear\Core\Backend\Favorites;
-use Dotclear\Core\Process;
+use dcFavorites;
+use dcNsProcess;
+use dcPage;

-class Backend extends Process
+class Backend extends dcNsProcess
 {
    public static function init(): bool
    {
-        return self::status(My::checkContext(My::BACKEND));
+        static::$init = defined('DC_CONTEXT_ADMIN')
+            && dcCore::app()->auth?->isSuperAdmin();
+
+        return static::$init;
    }

    public static function process(): bool
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return false;
        }

-        My::addBackendMenuItem();
-
        dcCore::app()->addBehaviors([
-            'adminDashboardFavoritesV2' => function (Favorites $favs): void {
-                $favs->register(
-                    My::id(),
-                    [
+            'adminDashboardFavoritesV2' => function (dcFavorites $favs): void {
+                $favs->register(My::id(), [
                    'title'      => My::name(),
-                        'url'        => My::manageUrl(),
-                        'small-icon' => My::icons(),
-                        'large-icon' => My::icons(),
-                        //'permissions' => null,
-                    ]
-                );
+                    'url'        => dcCore::app()->adminurl?->get('admin.plugin.' . My::id()),
+                    'small-icon' => dcPage::getPF(My::id() . '/icon.svg'),
+                    'large-icon' => dcPage::getPF(My::id() . '/icon.svg'),
+                    //'permissions' => dcCore::app()->auth->isSuperAdmin(),
+                ]);
            },
            'packmanBeforeCreatePackage' => function ($module) {
                if (Settings::init()->behavior_packman) {
@ -53,6 +53,14 @@ class Backend extends Process
            },
        ]);

+        dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
+            My::name(),
+            dcCore::app()->adminurl?->get('admin.plugin.' . My::id()),
+            dcPage::getPF(My::id() . '/icon.svg'),
+            preg_match('/' . preg_quote((string) dcCore::app()->adminurl?->get('admin.plugin.' . My::id())) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
+            dcCore::app()->auth?->isSuperAdmin()
+        );
+
        return true;
    }
 }
--- a/src/Config.php
+++ b/src/Config.php
@ -15,8 +15,8 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\licenseBootstrap;

 use dcCore;
-use Dotclear\Core\Backend\Notices;
-use Dotclear\Core\Process;
+use dcPage;
+use dcNsProcess;
 use Dotclear\Helper\Html\Form\{
    Checkbox,
    Div,
@ -29,16 +29,19 @@ use Dotclear\Helper\Html\Form\{
 };
 use Exception;

-class Config extends Process
+class Config extends dcNsProcess
 {
    public static function init(): bool
    {
-        return self::status(My::checkContext(My::CONFIG));
+        static::$init == defined('DC_CONTEXT_ADMIN')
+            && dcCore::app()->auth?->isSuperAdmin();
+
+        return static::$init;
    }

    public static function process(): bool
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return false;
        }

@ -65,10 +68,10 @@ class Config extends Process
            $s->writeSetting('license_name', Utils::getName($license_name));
            $s->writeSetting('license_head', Utils::encode($license_head));

-            Notices::addSuccessNotice(
+            dcPage::addSuccessNotice(
                __('Configuration has been successfully updated.')
            );
-            dcCore::app()->admin->url->redirect('admin.plugins', [
+            dcCore::app()->adminurl?->redirect('admin.plugins', [
                'module' => My::id(),
                'conf'   => '1',
                'redir'  => dcCore::app()->admin->__get('list')->getRedir(),
@ -82,7 +85,7 @@ class Config extends Process

    public static function render(): void
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return;
        }

--- a/src/Install.php
+++ b/src/Install.php
@ -16,19 +16,22 @@ namespace Dotclear\Plugin\licenseBootstrap;

 use dcCore;
 use dcNamespace;
-use Dotclear\Core\Process;
+use dcNsProcess;
 use Exception;

-class Install extends Process
+class Install extends dcNsProcess
 {
    public static function init(): bool
    {
-        return self::status(My::checkContext(My::INSTALL));
+        static::$init = defined('DC_CONTEXT_ADMIN')
+            && dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version'));
+
+        return static::$init;
    }

    public static function process(): bool
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return false;
        }

--- a/src/Manage.php
+++ b/src/Manage.php
@ -15,12 +15,9 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\licenseBootstrap;

 use dcCore;
+use dcPage;
 use dcThemes;
-use Dotclear\Core\Backend\{
-    Notices,
-    Page
-};
-use Dotclear\Core\Process;
+use dcNsProcess;
 use Dotclear\Helper\Html\Html;
 use Dotclear\Helper\Html\Form\{
    Checkbox,
@ -34,16 +31,19 @@ use Dotclear\Helper\File\Path;
 use Dotclear\Helper\Network\Http;
 use Exception;

-class Manage extends Process
+class Manage extends dcNsProcess
 {
    public static function init(): bool
    {
-        return self::status(My::checkContext(My::MANAGE));
+        static::$init = defined('DC_CONTEXT_ADMIN')
+            && dcCore::app()->auth?->isSuperAdmin();
+
+        return static::$init;
    }

    public static function process(): bool
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return false;
        }

@ -75,14 +75,13 @@ class Manage extends Process
                Utils::addLicense($module);
            }

-            Notices::addSuccessNotice(
+            dcPage::addSuccessNotice(
                __('License successfully added.')
            );
-            if (empty($_POST['redir'])) {
-                My::redirect();
-            } else {
-                Http::redirect($_POST['redir']);
-            };
+            Http::redirect(
+                empty($_POST['redir']) ?
+                dcCore::app()->admin->getPageURL() : $_POST['redir']
+            );
        } catch(Exception $e) {
            dcCore::app()->error->add($e->getMessage());
        }
@ -92,28 +91,28 @@ class Manage extends Process

    public static function render(): void
    {
-        if (!self::status()) {
+        if (!static::$init) {
            return;
        }

        $m = self::loadModules();

        # Display
-        Page::openModule(
+        dcPage::openModule(
            My::name(),
-            Page::jsPageTabs() .
-            My::jsLoad('licensebootstrap') .
+            dcPage::jsPageTabs() .
+            dcPage::jsModuleLoad(My::id() . '/js/licensebootstrap.js') .

            # --BEHAVIOR-- licenseBootstrapAdminHeader
            dcCore::app()->callBehavior('licenseBootstrapAdminHeader')
        );

        echo
-        Page::breadcrumb([
+        dcPage::breadcrumb([
            __('Plugins') => '',
            My::name()    => '',
        ]) .
-        Notices::getNotices();
+        dcPage::notices();

        self::displayModulesList(
            $m['plugins']->getModules(),
@ -127,9 +126,9 @@ class Manage extends Process
            __('Installed themes')
        );

-        Page::helpBlock('licenseBootstrap');
+        dcPage::helpBlock('licenseBootstrap');

-        Page::closeModule();
+        dcPage::closeModule();
    }

    private static function displayModulesList(array $modules, string $type, string $title): void
@ -186,7 +185,6 @@ class Manage extends Process
        '<p class="checkboxes-helpers"></p>' .
        (new Para())->items([
            (new Hidden(['redir'], empty($_REQUEST['redir']) ? '' : Html::escapeHTML($_REQUEST['redir']))),
-            (new Hidden(['process'], 'Plugin')),
            (new Hidden(['p'], My::id())),
            (new Hidden(['type'], $type)),
            (new Hidden(['action'], 'addlicense')),
--- a/src/My.php
+++ b/src/My.php
@ -15,19 +15,38 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\licenseBootstrap;

 use dcCore;
-use Dotclear\Module\MyPlugin;

 /**
 * This module definitions.
 */
-class My extends MyPlugin
+class My
 {
    /** @var    string  Licenses default templates folder name */
    public const TEMPLATE_FOLDER = 'licenses';

-    protected static function checkCustomContext(int $context): ?bool
+    /**
+     * This module id.
+     */
+    public static function id(): string
    {
-        return $context === My::INSTALL ? null :
-            defined('DC_CONTEXT_ADMIN') && dcCore::app()->auth->isSuperAdmin();
+        return basename(dirname(__DIR__));
+    }
+
+    /**
+     * This module name.
+     */
+    public static function name(): string
+    {
+        $name = dcCore::app()->plugins->moduleInfo(self::id(), 'name');
+
+        return __(is_string($name) ? $name : self::id());
+    }
+
+    /**
+     * This module path.
+     */
+    public static function path(): string
+    {
+        return dirname(__DIR__);
    }
 }
--- a/src/Settings.php
+++ b/src/Settings.php
@ -14,6 +14,8 @@ declare(strict_types=1);

 namespace Dotclear\Plugin\licenseBootstrap;

+use dcCore;
+
 class Settings
 {
    /** @var Settings self instance */
@ -51,7 +53,7 @@ class Settings
     */
    public function __construct()
    {
-        $s = My::settings();
+        $s = dcCore::app()->blog?->settings->get(My::id());

        $this->hide_distrib     = (bool) ($s?->get('hide_distrib') ?? false);
        $this->overwrite        = (bool) ($s?->get('overwrite') ?? false);
@ -89,8 +91,8 @@ class Settings
    public function writeSetting(string $key, mixed $value): bool
    {
        if (property_exists($this, $key) && settype($value, gettype($this->{$key})) === true) {
-            My::settings()->drop($key);
-            My::settings()->put($key, $value, gettype($this->{$key}), '', true, true);
+            dcCore::app()->blog?->settings->get(My::id())->drop($key);
+            dcCore::app()->blog?->settings->get(My::id())->put($key, $value, gettype($this->{$key}), '', true, true);

            return true;
        }
--- a/src/Uninstall.php
+++ b/src/Uninstall.php
@ -15,19 +15,21 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\licenseBootstrap;

 use dcCore;
-use Dotclear\Core\Process;
+use dcNsProcess;
 use Dotclear\Plugin\Uninstaller\Uninstaller;

-class Uninstall extends Process
+class Uninstall extends dcNsProcess
 {
    public static function init(): bool
    {
-        return self::status(My::checkContext(My::UNINSTALL));
+        static::$init = defined('DC_CONTEXT_ADMIN');
+
+        return static::$init;
    }

    public static function process(): bool
    {
-        if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
+        if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
            return false;
        }

--- a/src/Utils.php
+++ b/src/Utils.php
@ -34,6 +34,10 @@ class Utils
     */
    public static function addLicense(array $module): void
    {
+        if (is_null(dcCore::app()->auth)) {
+            return;
+        }
+
        $s = Settings::init();

        # --BEHAVIOR-- licenseBootstrapBeforeAddLicense