From 53e4a8ee583df656cc7d2f9016e03c423779d722 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sun, 15 Oct 2023 17:54:07 +0200 Subject: [PATCH] upgrade to Dotclear 2.28 --- CHANGELOG.md | 6 +++++ README.md | 12 +++++----- _define.php | 34 +++++++++++++--------------- dcstore.xml | 6 ++--- locales/en/resources.php | 6 +---- locales/fr/resources.php | 6 +---- src/Backend.php | 37 +++++++++++++----------------- src/Frontend.php | 49 ++++++++++++++++++++++++---------------- src/Manage.php | 38 +++++++++++++++---------------- src/My.php | 41 ++++++++++++++++++--------------- src/Uninstall.php | 23 ++++++++----------- src/Widgets.php | 33 +++++++++++++-------------- 12 files changed, 145 insertions(+), 146 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8c0bc..7a08a7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +arlequin 2.5 - 2023.10.15 +=========================================================== +* Require Dotclear 2.28 +* Require PHP 8.1 +* Upgrade to Dotclear 2.28 + arlequin 2.4 - 2023.09.04 =========================================================== * Require Dotclear 2.27 diff --git a/README.md b/README.md index 75740aa..b1a3538 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # README -[![Release](https://img.shields.io/badge/release-2.4-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/arlequin/releases) -![Date](https://img.shields.io/badge/date-2023.09.04-c44d58.svg)] -[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-137bbb.svg)](https://fr.dotclear.org/download) +[![Release](https://img.shields.io/badge/release-2.5-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/arlequin/releases) +![Date](https://img.shields.io/badge/date-2023.10.15-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/arlequin) [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/arlequin/src/branch/master/LICENSE) @@ -14,9 +14,9 @@ _arlequin_ is a plugin for the open-source web publishing software called [Dotcl ## REQUIREMENTS +* Dotclear 2.28 +* PHP 8.1+ * Dotclear content admin permissions to manage theme and public menu -* Dotclear 2.27 -* PHP 7.4+ ## USAGE @@ -40,6 +40,6 @@ you should also add widget to allow visitor to select a theme. * Oleksandr Syenchuk (author) * Gaetan Guillard * Pierre Van Glabeke -* Jean-Christian Denis +* Jean-Christian Denis (latest) You are welcome to contribute to this code. diff --git a/_define.php b/_define.php index a98cee6..dbc2c96 100644 --- a/_define.php +++ b/_define.php @@ -1,32 +1,30 @@ registerModule( 'Arlequin', 'Allows visitors choose a theme', 'Oleksandr Syenchuk, Pierre Van Glabeke and contributors', - '2.4', + '2.5', [ - 'requires' => [['core', '2.27']], - 'permissions' => dcCore::app()->auth->makePermissions([ - dcCore::app()->auth::PERMISSION_CONTENT_ADMIN, - ]), - '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', + 'requires' => [['core', '2.28']], + 'permissions' => 'My', + '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', ] ); diff --git a/dcstore.xml b/dcstore.xml index 5c9b858..0f4aebc 100644 --- a/dcstore.xml +++ b/dcstore.xml @@ -2,11 +2,11 @@ Arlequin - 2.4 + 2.5 Oleksandr Syenchuk, Pierre Van Glabeke and contributors Allows visitors choose a theme - https://git.dotclear.watch/JcDenis/arlequin/releases/download/v2.4/plugin-arlequin.zip - 2.27 + https://git.dotclear.watch/JcDenis/arlequin/releases/download/v2.5/plugin-arlequin.zip + 2.28 https://git.dotclear.watch/JcDenis/arlequin/src/branch/master/README.md https://git.dotclear.watch/JcDenis/arlequin/issues diff --git a/locales/en/resources.php b/locales/en/resources.php index b889956..9753571 100644 --- a/locales/en/resources.php +++ b/locales/en/resources.php @@ -10,8 +10,4 @@ * @copyright Jean-Crhistian Denis * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html */ -if (!defined('DC_RC_PATH')) { - return; -} - -dcCore::app()->resources['help']['arlequin'] = __DIR__ . '/help/arlequin.html'; +\Dotclear\App::backend()->resources()->set('help', 'arlequin', __DIR__ . '/help/arlequin.html'); diff --git a/locales/fr/resources.php b/locales/fr/resources.php index b889956..9753571 100644 --- a/locales/fr/resources.php +++ b/locales/fr/resources.php @@ -10,8 +10,4 @@ * @copyright Jean-Crhistian Denis * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html */ -if (!defined('DC_RC_PATH')) { - return; -} - -dcCore::app()->resources['help']['arlequin'] = __DIR__ . '/help/arlequin.html'; +\Dotclear\App::backend()->resources()->set('help', 'arlequin', __DIR__ . '/help/arlequin.html'); diff --git a/src/Backend.php b/src/Backend.php index de1e51a..4ba83a8 100644 --- a/src/Backend.php +++ b/src/Backend.php @@ -1,26 +1,21 @@ menus()::MENU_BLOG); - dcCore::app()->addBehaviors([ + App::behavior()->addBehaviors([ 'adminDashboardFavoritesV2' => function (Favorites $favs): void { $favs->register(My::id(), [ 'title' => My::name(), 'url' => My::manageUrl(), 'small-icon' => My::icons(), 'large-icon' => My::icons(), - 'permissions' => dcCore::app()->auth->makePermissions([ - dcCore::app()->auth::PERMISSION_CONTENT_ADMIN, + 'permissions' => App::auth()->makePermissions([ + App::auth()::PERMISSION_CONTENT_ADMIN, ]), ]); }, - 'initWidgets' => [Widgets::class, 'initWidgets'], + # 'initWidgets' => Widgets::initWidgets(...), ]); return true; diff --git a/src/Frontend.php b/src/Frontend.php index 6160683..41beea7 100644 --- a/src/Frontend.php +++ b/src/Frontend.php @@ -1,26 +1,35 @@ addBehaviors([ - 'publicBeforeDocumentV2' => [self::class, 'adjustCache'], - 'initWidgets' => [Widgets::class, 'initWidgets'], + App::behavior()->addBehaviors([ + 'publicBeforeDocumentV2' => self::adjustCache(...), + # 'initWidgets' => Widgets::initWidgets(...), ]); return true; @@ -60,19 +69,19 @@ class Frontend extends Process protected static function cookieSuffix(): string { - return base_convert(dcCore::app()->blog->uid, 16, 36); + return base_convert(App::blog()->uid(), 16, 36); } public static function adjustCache(): void { if (!empty($_COOKIE[self::COOKIE_UPDDT_PREFIX . self::cookieSuffix()])) { - dcCore::app()->cache['mod_ts'][] = (int) $_COOKIE[self::COOKIE_UPDDT_PREFIX . self::cookieSuffix()]; + App::frontend()->cache()->addTime((int) $_COOKIE[self::COOKIE_UPDDT_PREFIX . self::cookieSuffix()]); } } public static function switchTheme(string $theme): void { - if (dcCore::app()->blog->settings->get('system')->get('theme') == $theme) { + if (App::blog()->settings()->get('system')->get('theme') == $theme) { return; } @@ -82,7 +91,7 @@ class Frontend extends Process } } - dcCore::app()->blog->settings->get('system')->set('theme', $theme); - dcCore::app()->public->theme = $theme; + App::blog()->settings()->get('system')->set('theme', $theme); + App::frontend()->theme = $theme; } } diff --git a/src/Manage.php b/src/Manage.php index c01cb46..c58b5f7 100644 --- a/src/Manage.php +++ b/src/Manage.php @@ -1,21 +1,11 @@ put('exclude', 'customCSS', 'string', 'Excluded themes'); Notices::AddSuccessNotice(__('Settings have been reinitialized.')); - dcCore::app()->blog->triggerBlog(); + App::blog()->triggerBlog(); } // collect settings @@ -79,7 +77,7 @@ class Manage extends Process $s->put('exclude', $exclude); Notices::AddSuccessNotice(__('System settings have been updated.')); - dcCore::app()->blog->triggerBlog(); + App::blog()->triggerBlog(); My::redirect(['config' => 1]); } @@ -89,11 +87,11 @@ class Manage extends Process $s->drop('exclude'); Notices::AddSuccessNotice(__('Settings have been reinitialized.')); - dcCore::app()->blog->triggerBlog(); + App::blog()->triggerBlog(); My::redirect(['restore' => 1]); } } catch (Exception $e) { - dcCore::app()->error->add($e->getMessage()); + App::error()->add($e->getMessage()); } return true; @@ -107,7 +105,7 @@ class Manage extends Process $models = new ArrayObject(My::distributedModels()); - dcCore::app()->callBehavior('arlequinAddModels', $models); + App::behavior()->callBehavior('arlequinAddModels', $models); $models = iterator_to_array($models); $s = My::settings(); @@ -144,12 +142,12 @@ class Manage extends Process echo Page::breadcrumb([ - Html::escapeHTML(dcCore::app()->blog->name) => '', - My::name() => '', + Html::escapeHTML(App::blog()->name()) => '', + My::name() => '', ]) . Notices::getNotices() . - (new Form(My::id() . 'form'))->method('post')->action(dcCore::app()->admin->getPageURL())->fields([ + (new Form(My::id() . 'form'))->method('post')->action(App::backend()->getPageURL())->fields([ (new Text('h4', __('Switcher display format'))), (new Div())->id('models'), (new Div())->class('two-boxes odd')->items([ diff --git a/src/My.php b/src/My.php index ab716cc..7c2ba69 100644 --- a/src/My.php +++ b/src/My.php @@ -1,34 +1,32 @@ auth->check(dcCore::app()->auth->makePermissions([ - dcCore::app()->auth::PERMISSION_CONTENT_ADMIN, - ]), dcCore::app()->blog->id); + return match ($context) { + self::BACKEND, self::MANAGE, self::MENU => App::task()->checkContext('BACKEND') + && App::auth()->check(App::auth()->makePermissions([ + App::auth()::PERMISSION_CONTENT_ADMIN, + ]), App::blog()->id()), + + default => null, + }; } /** @@ -41,6 +39,8 @@ class My extends MyPlugin * 'e_html'=>'[HTML code]', // Code HTML d'un item pouvant être sélectionné * 'a_html'=>'[HTML code]' // Code HTML d'un item actif (thème sélectionné) * ] + * + * @return array> */ public static function distributedModels(): array { @@ -65,6 +65,11 @@ class My extends MyPlugin ]; } + /** + * Get default models. + * + * @return array + */ public static function defaultModel(): array { return [ diff --git a/src/Uninstall.php b/src/Uninstall.php index 4b09363..9a883e5 100644 --- a/src/Uninstall.php +++ b/src/Uninstall.php @@ -1,23 +1,20 @@ plugins->moduleExists('Uninstaller')) { + if (!self::status()) { return false; } diff --git a/src/Widgets.php b/src/Widgets.php index 6207689..50e944f 100644 --- a/src/Widgets.php +++ b/src/Widgets.php @@ -1,26 +1,24 @@ create( 'arlequin', My::name(), - [self::class,'parseWidget'], + self::parseWidget(...), null, __('Theme switcher') ) @@ -41,13 +39,13 @@ class Widgets public static function parseWidget(WidgetsElement $w): string { - if ($w->offline || !$w->checkHomeOnly(dcCore::app()->url->type)) { + if ($w->offline || !$w->checkHomeOnly(App::url()->type)) { return ''; } $model = json_decode((string) My::settings()->get('model'), true); $exclude = explode(';', (string) My::settings()->get('exclude')); - $modules = array_diff_key(dcCore::app()->themes->getDefines(['state' => dcModuleDefine::STATE_ENABLED], true), array_flip($exclude)); + $modules = array_diff_key(App::themes()->getDefines(['state' => ModuleDefine::STATE_ENABLED], true), array_flip($exclude)); if (!is_array($model) || empty($modules)) { return ''; } @@ -70,7 +68,8 @@ class Widgets $res = ''; foreach ($modules as $id => $module) { - if ($id == dcCore::app()->public->theme) { + $id = (string) $id; + if ($id == App::frontend()->theme) { $format = $model['a_html']; } else { $format = $model['e_html'];