code review

CHANGELOG.md

@@ -1,3 +1,16 @@
+construction 1.9.2 - 2023.10.25
+===========================================================
+* Require Dotclear 2.28
+* Require PHP 8.1
+* Code review
+
+construction 1.9.1 - 2023.10.23
+===========================================================
+* Require Dotclear 2.28
+* Require PHP 8.1
+* Fix a typo
+* Fix repository branch
+
 construction 1.9 - 2023.10.15
 ===========================================================
 * Require Dotclear 2.28

README.md

@@ -1,7 +1,7 @@
 # README
 
-[![Release](https://img.shields.io/badge/release-1.9-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/construction/releases)
-![Date](https://img.shields.io/badge/date-2023.10.15-c44d58.svg)
+[![Release](https://img.shields.io/badge/release-1.9.2-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/construction/releases)
+![Date](https://img.shields.io/badge/date-2023.10.25-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/construction)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/construction/src/branch/master/LICENSE)

_define.php

@@ -18,7 +18,7 @@ $this->registerModule(
     'Construction',
     'Place your blog maintenance',
     'Osku and contributors',
-    '1.9',
+    '1.9.2',
     [
         'requires'    => [['core', '2.28']],
         'permissions' => 'My',

dcstore.xml

@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="construction">
     <name>Construction</name>
-    <version>1.9</version>
+    <version>1.9.2</version>
     <author>Osku and contributors</author>
     <desc>Place your blog maintenance</desc>
-    <file>https://git.dotclear.watch/JcDenis/construction/releases/download/v1.9/plugin-construction.zip</file>
+    <file>https://git.dotclear.watch/JcDenis/construction/releases/download/v1.9.2/plugin-construction.zip</file>
     <da:dcmin>2.28</da:dcmin>
     <da:details>https://git.dotclear.watch/JcDenis/construction/src/branch/master/README.md</da:details>
     <da:support>https://git.dotclear.watch/JcDenis/construction/issues</da:support>

src/Backend.php

@@ -29,7 +29,7 @@ class Backend extends Process
             return false;
         }
 
-        My::addBackendMenuItem(App::backend()->menus()::MENU_PLUGINS, [], '(&.*)?$', My::settings()->get('flag') ? 'construction-blog' : '');
+        My::addBackendMenuItem();
 
         App::behavior()->addBehaviors([
             'adminPageHTMLHead' => function (): void {

src/Frontend.php

@@ -32,27 +32,24 @@ class Frontend extends Process
         }
 
         App::behavior()->addBehavior('publicBeforeDocumentV2', function (): void {
-            // nullsafe PHP < 8.0
-            if (!App::blog()->isDefined()) {
-                return;
-            }
-
             if (!My::settings()->get('flag')) {
                 return;
             }
 
-            $tplset = App::themes()->moduleInfo(App::blog()->settings()->get('system')->get('theme'), 'tplset');
-            if (!empty($tplset) && is_dir(implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]))) {
-                App::frontend()->template()->setPath(App::frontend()->template()->getPath(), implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]));
-            } else {
-                App::frontend()->template()->setPath(App::frontend()->template()->getPath(), implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', App::config()->defaultTplset()]));
+            $tplset = App::themes()->getDefine(App::blog()->settings()->get('system')->get('theme'))->get('tplset');
+            if (empty($tplset) || !is_dir(implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]))) {
+                $tplset = App::config()->defaultTplset();
             }
+            App::frontend()->template()->appendPath(implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]));
 
             $all_allowed_ip = json_decode((string) My::settings()->get('allowed_ip'), true);
             if (!is_array($all_allowed_ip)) {
                 $all_allowed_ip = [];
             }
             $extra_urls = json_decode((string) My::settings()->get('extra_urls'), true);
+            if (!is_array($extra_urls)) {
+                $extra_urls = [];
+            }
             if (!in_array(Http::realIP(), $all_allowed_ip)) {
                 App::url()->registerDefault(function (?string $args): void {
                     App::url()->type = 'default';

src/Manage.php

@@ -48,11 +48,6 @@ class Manage extends Process
             return false;
         }
 
-        // nullsafe PHP < 8.0
-        if (!App::blog()->isDefined()) {
-            return false;
-        }
-
         $s = My::settings();
 
         if (!empty($_POST['saveconfig'])) {
@@ -93,11 +88,6 @@ class Manage extends Process
             return;
         }
 
-        // nullsafe PHP < 8.0
-        if (!App::blog()->isDefined()) {
-            return;
-        }
-
         $s       = My::settings();
         $editor  = App::auth()->getOption('editor');
         $nb_rows = count(json_decode($s->get('allowed_ip'), true));
@@ -136,14 +126,14 @@ class Manage extends Process
                     (new Note())->class('form-note')->text(sprintf(__('Your IP is <strong>%s</strong> - the allowed IP can view the blog normally.'), (string) Http::realIP())),
                     (new Para())->class('area')->items([
                         (new Label(__('Extra allowed URL types:'), Label::OUTSIDE_LABEL_BEFORE))->for('construction_extra_urls'),
-                        (new Input('construction_extra_urls'))->size(20)->maxlenght(255)->class('maximal')->value(Html::escapeHTML(implode(',', json_decode($s->get('extra_urls'), true)))),
+                        (new Input('construction_extra_urls'))->size(20)->maxlength(255)->class('maximal')->value(Html::escapeHTML(implode(',', json_decode($s->get('extra_urls'), true)))),
                     ]),
                 ]),
                 (new Div())->class('fieldset')->items([
                     (new Text('h4', __('Presentation'))),
                     (new Para())->class('area')->items([
                         (new Label(__('Title:'), Label::OUTSIDE_LABEL_BEFORE))->for('construction_title'),
-                        (new Input('construction_title'))->size(20)->maxlenght(255)->class('maximal')->value(Html::escapeHTML($s->get('title'))),
+                        (new Input('construction_title'))->size(20)->maxlength(255)->class('maximal')->value(Html::escapeHTML($s->get('title'))),
                     ]),
                     (new Para())->class('area')->items([
                         (new Label(__('Message:'), Label::OUTSIDE_LABEL_BEFORE))->for('construction_message'),