From 5687b72e5fae6b2a573fb8f61cd8908b85ed0ab5 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sun, 6 Aug 2023 23:08:44 +0200 Subject: [PATCH] upgrade to Dotclear 2.27 --- src/Backend.php | 42 +++++++++++++++--------------------------- src/Frontend.php | 10 ++++------ src/Install.php | 19 +++++-------------- src/My.php | 29 ++--------------------------- src/Uninstall.php | 10 ++++------ src/Widgets.php | 6 +++--- 6 files changed, 33 insertions(+), 83 deletions(-) diff --git a/src/Backend.php b/src/Backend.php index ba453c8..66b8238 100644 --- a/src/Backend.php +++ b/src/Backend.php @@ -16,8 +16,8 @@ namespace Dotclear\Plugin\dcLatestVersions; use ArrayObject; use dcCore; -use dcNsProcess; use dcUpdate; +use Dotclear\Core\Process; use Dotclear\Helper\Html\Form\{ Checkbox, Label, @@ -25,18 +25,16 @@ use Dotclear\Helper\Html\Form\{ }; use Dotclear\Helper\Html\Html; -class Backend extends dcNsProcess +class Backend extends Process { public static function init(): bool { - static::$init = defined('DC_CONTEXT_ADMIN'); - - return static::$init; + return self::status(My::checkContext(My::BACKEND)); } public static function process(): bool { - if (!static::$init) { + if (!self::status()) { return false; } @@ -44,15 +42,15 @@ class Backend extends dcNsProcess 'initWidgets' => [Widgets::class, 'initWidgets'], 'adminDashboardItemsV2' => function (ArrayObject $__dashboard_items): void { // nullsafe PHP < 8.0 - if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->auth->user_prefs) || is_null(dcCore::app()->blog)) { + if (is_null(dcCore::app()->blog)) { return; } - if (!dcCore::app()->auth->user_prefs->get('dashboard')->get('dcLatestVersionsItems')) { + if (!My::prefs()->get('dashboard_items')) { return; } - $builds = explode(',', (string) dcCore::app()->blog->settings->get(My::id())->get('builds')); + $builds = explode(',', (string) My::settings()->get('builds')); if (empty($builds[0])) { return; } @@ -97,14 +95,9 @@ class Backend extends dcNsProcess }, 'adminDashboardOptionsFormV2' => function (): void { - // nullsafe PHP < 8.0 - if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->auth->user_prefs)) { - return; - } - - if (!dcCore::app()->auth->user_prefs->get('dashboard')->prefExists('dcLatestVersionsItems')) { - dcCore::app()->auth->user_prefs->get('dashboard')->put( - 'dcLatestVersionsItems', + if (!My::prefs()->prefExists('dashboard_items')) { + My::prefs()->put( + 'dashboard_items', false, 'boolean' ); @@ -115,10 +108,10 @@ class Backend extends dcNsProcess '

' . Html::escapeHTML(My::name()) . '

' . (new Para()) ->__call('items', [[ - (new Checkbox('dcLatestVersionsItems', (bool) dcCore::app()->auth->user_prefs->get('dashboard')->get('dcLatestVersionsItems'))) + (new Checkbox(My::id() . 'dashboard_items', (bool) My::prefs()->get('dashboard_items'))) ->__call('value', [1]), (new Label(__("Show Dotclear's latest versions on dashboards."), Label::OUTSIDE_LABEL_AFTER)) - ->__call('for', ['dcLatestVersionsItems']) + ->__call('for', [My::id() . 'dashboard_items']) ->__call('class', ['classic']), ]]) ->render() . @@ -126,14 +119,9 @@ class Backend extends dcNsProcess }, 'adminAfterDashboardOptionsUpdate' => function (?string $user_id): void { - // nullsafe PHP < 8.0 - if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->auth->user_prefs)) { - return; - } - - dcCore::app()->auth->user_prefs->get('dashboard')->put( - 'dcLatestVersionsItems', - !empty($_POST['dcLatestVersionsItems']), + My::prefs()->put( + 'dashboard_items', + !empty($_POST[My::id() . 'dashboard_items']), 'boolean' ); }, diff --git a/src/Frontend.php b/src/Frontend.php index 10feba5..b572595 100644 --- a/src/Frontend.php +++ b/src/Frontend.php @@ -15,20 +15,18 @@ declare(strict_types=1); namespace Dotclear\Plugin\dcLatestVersions; use dcCore; -use dcNsProcess; +use Dotclear\Core\Process; -class Frontend extends dcNsProcess +class Frontend extends Process { public static function init(): bool { - static::$init = defined('DC_RC_PATH'); - - return static::$init; + return self::status(My::checkContext(My::FRONTEND)); } public static function process(): bool { - if (!static::$init) { + if (!self::status()) { return false; } diff --git a/src/Install.php b/src/Install.php index 64f5d7a..8989c97 100644 --- a/src/Install.php +++ b/src/Install.php @@ -14,31 +14,22 @@ declare(strict_types=1); namespace Dotclear\Plugin\dcLatestVersions; -use dcCore; -use dcNsProcess; +use Dotclear\Core\Process; -class Install extends dcNsProcess +class Install extends Process { public static function init(): bool { - static::$init = defined('DC_CONTEXT_ADMIN') - && dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version')); - - return static::$init; + return self::status(My::checkContext(My::INSTALL)); } public static function process(): bool { - if (!static::$init) { + if (!self::status()) { return false; } - // nullsafe PHP < 8.0 - if (is_null(dcCore::app()->blog)) { - return false; - } - - dcCore::app()->blog->settings->get(My::id())->put( + My::settings()->put( 'builds', 'stable,unstable,testing', 'string', diff --git a/src/My.php b/src/My.php index 2abf279..3e7514d 100644 --- a/src/My.php +++ b/src/My.php @@ -14,36 +14,11 @@ declare(strict_types=1); namespace Dotclear\Plugin\dcLatestVersions; -use dcCore; +use Dotclear\Module\MyPlugin; /** * This module definitions. */ -class My +class My extends MyPlugin { - /** - * This module id. - */ - public static function id(): string - { - 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__); - } } diff --git a/src/Uninstall.php b/src/Uninstall.php index 7b29a72..4092fd4 100644 --- a/src/Uninstall.php +++ b/src/Uninstall.php @@ -15,21 +15,19 @@ declare(strict_types=1); namespace Dotclear\Plugin\dcLatestVersions; use dcCore; -use dcNsProcess; +use Dotclear\Core\Process; use Dotclear\Plugin\Uninstaller\Uninstaller; -class Uninstall extends dcNsProcess +class Uninstall extends Process { public static function init(): bool { - static::$init = defined('DC_CONTEXT_ADMIN'); - - return static::$init; + return self::status(My::checkContext(My::UNINSTALL)); } public static function process(): bool { - if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) { + if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) { return false; } diff --git a/src/Widgets.php b/src/Widgets.php index 47200dc..23ed7ec 100644 --- a/src/Widgets.php +++ b/src/Widgets.php @@ -26,7 +26,7 @@ class Widgets { $w ->create( - 'dclatestversionswidget', + My::id() . 'widget', My::name(), [self::class, 'parseWidget'], null, @@ -59,7 +59,7 @@ class Widgets } # Builds to check - $builds = explode(',', (string) dcCore::app()->blog->settings->get(My::id())->get('builds')); + $builds = explode(',', (string) My::settings()->get('builds')); if (empty($builds[0])) { return ''; } @@ -104,7 +104,7 @@ class Widgets # Display return $w->renderDiv( (bool) $w->__get('content_only'), - 'dclatestversionswidget ' . $w->__get('class'), + My::id() . 'widget ' . $w->__get('class'), '', ($w->__get('title') ? $w->renderTitle(Html::escapeHTML($w->__get('title'))) : '') . sprintf('', implode('', $li)) );