From 118bd06eadcae982bdebca2a6517e789caa22cb6 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Mon, 9 Oct 2023 22:38:35 +0200
Subject: [PATCH] release 0.9.1

---
 CHANGELOG.md    |  7 +++++
 README.md       |  2 +-
 _define.php     | 32 ++++++++++++-----------
 dcstore.xml     |  4 +--
 src/Backend.php | 20 +++++++-------
 src/Config.php  | 20 +++++++-------
 src/Install.php | 23 +++++++----------
 src/My.php      | 27 +++++++------------
 src/Utils.php   | 69 ++++++++++++++++++++++++++++---------------------
 9 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cb2337..7f78038 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+DotclearWatch 0.9.1 - 2023.10.09
+===========================================================
+* Require dotclear 2.28
+* Require php 8.1
+* Fix permissions
+* Code review
+
 DotclearWatch 0.9 - 2023.10.07
 ===========================================================
 * Require dotclear 2.28
diff --git a/README.md b/README.md
index bce15ac..7ed9aee 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # README
 
 [![Release](https://img.shields.io/badge/release-0.9-a2cbe9.svg)](https://git.dotclear.watch/dw/DotclearWatch/releases)
-![Date](https://img.shields.io/badge/date-2023.10.07-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/DotclearWatch)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/dw/DotclearWatch/src/branch/master/LICENSE)
diff --git a/_define.php b/_define.php
index ad6e9cf..a514480 100644
--- a/_define.php
+++ b/_define.php
@@ -1,28 +1,30 @@
 <?php
 /**
- * @brief DotclearWatch, a plugin for Dotclear 2
+ * @file
+ * @brief       The plugin DotclearWatch definition
+ * @ingroup     DotclearWatch
  *
- * @package Dotclear
- * @subpackage Plugin
+ * @defgroup    DotclearWatch Plugin DotclearWatch.
  *
- * @author Jean-Christian Denis and contributors
+ * QSend report about your Dotclear.
  *
- * @copyright Jean-Christain Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ * @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);
+
 $this->registerModule(
     'Dotclear Watch',
     'Send report about your Dotclear',
     'Jean-Christian Denis and contributors',
-    '0.9',
+    '0.9.1',
     [
-        'requires' => [
-            ['php', '8.1'],
-            ['core', '2.28'],
-        ],
-        'type'       => 'plugin',
-        'support'    => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/issues',
-        'details'    => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/src/branch/master/README.md',
-        'repository' => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
+        'requires'    => [['core', '2.28']],
+        'permissions' => 'My',
+        'type'        => 'plugin',
+        'support'     => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/issues',
+        'details'     => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/src/branch/master/README.md',
+        'repository'  => 'https://git.dotclear.watch/dw/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
     ]
 );
diff --git a/dcstore.xml b/dcstore.xml
index b1d5e5d..9851ff4 100644
--- a/dcstore.xml
+++ b/dcstore.xml
@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="DotclearWatch">
     <name>Dotclear Watch</name>
-    <version>0.9</version>
+    <version>0.9.1</version>
     <author>Jean-Christian Denis and contributors</author>
     <desc>Send report about your Dotclear</desc>
-    <file>https://git.dotclear.watch/dw/DotclearWatch/releases/download/v0.9/plugin-DotclearWatch.zip</file>
+    <file>https://git.dotclear.watch/dw/DotclearWatch/releases/download/v0.9.1/plugin-DotclearWatch.zip</file>
     <da:dcmin>2.28</da:dcmin>
     <da:details>https://git.dotclear.watch/dw/DotclearWatch/src/branch/master/README.md</da:details>
     <da:support>https://git.dotclear.watch/dw/DotclearWatch/issues</da:support>
diff --git a/src/Backend.php b/src/Backend.php
index 71f49a0..a8a6f5a 100644
--- a/src/Backend.php
+++ b/src/Backend.php
@@ -1,15 +1,5 @@
 <?php
-/**
- * @brief DotclearWatch, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christain Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
+
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\DotclearWatch;
@@ -17,6 +7,14 @@ namespace Dotclear\Plugin\DotclearWatch;
 use Dotclear\App;
 use Dotclear\Core\Process;
 
+/**
+ * @brief   DotclearWatch backend class.
+ * @ingroup DotclearWatch
+ *
+ * @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
 {
     public static function init(): bool
diff --git a/src/Config.php b/src/Config.php
index bf21dbc..970e52c 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,13 +1,5 @@
 <?php
-/**
- * @brief DotclearWatch, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugins
- *
- * @copyright Olivier Meunier & Association Dotclear
- * @copyright GPL-2.0-only
- */
+
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\DotclearWatch;
@@ -30,6 +22,14 @@ use Dotclear\Helper\Html\Form\{
 };
 use Dotclear\Helper\Html\Html;
 
+/**
+ * @brief   DotclearWatch configuration class.
+ * @ingroup DotclearWatch
+ *
+ * @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
 {
     private static string $hidden_modules  = '';
@@ -37,7 +37,7 @@ class Config extends Process
 
     public static function init(): bool
     {
-        return self::status(My::checkContext(My::MANAGE));
+        return self::status(My::checkContext(My::CONFIG));
     }
 
     public static function process(): bool
diff --git a/src/Install.php b/src/Install.php
index 1234a35..66d58a6 100644
--- a/src/Install.php
+++ b/src/Install.php
@@ -1,21 +1,19 @@
 <?php
-/**
- * @brief DotclearWatch, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christain Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
+
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\DotclearWatch;
 
 use Dotclear\Core\Process;
 
+/**
+ * @brief   DotclearWatch install class.
+ * @ingroup DotclearWatch
+ *
+ * @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
 {
     public static function init(): bool
@@ -25,8 +23,7 @@ class Install extends Process
 
     public static function process(): bool
     {
-        $s = My::settings();
-        if (self::status() && $s !== null) {
+        if (self::status() && ($s = My::settings()) !== null) {
             $s->put(
                 'hidden_modules',
                 'DotclearWatch',
diff --git a/src/My.php b/src/My.php
index 6e0475f..7761fcf 100644
--- a/src/My.php
+++ b/src/My.php
@@ -1,27 +1,20 @@
 <?php
-/**
- * @brief DotclearWatch, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christain Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
+
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\DotclearWatch;
 
-use Dotclear\App;
 use Dotclear\Module\MyPlugin;
 
+/**
+ * @brief   DotclearWatch My helper.
+ * @ingroup DotclearWatch
+ *
+ * @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
 {
-    protected static function checkCustomContext(int $context): ?bool
-    {
-        return $context === My::INSTALL ? null :
-            defined('DC_CONTEXT_ADMIN') && App::auth()->isSuperAdmin();
-    }
+    // Use default permissions
 }
diff --git a/src/Utils.php b/src/Utils.php
index 2de2054..09c6aa4 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -1,15 +1,5 @@
 <?php
-/**
- * @brief DotclearWatch, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christain Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
+
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\DotclearWatch;
@@ -20,21 +10,49 @@ use Dotclear\Helper\Network\HttpClient;
 use Dotclear\Module\ModuleDefine;
 use Exception;
 
+/**
+ * @brief   DotclearWatch utils class.
+ * @ingroup DotclearWatch
+ *
+ * @author      Jean-Christian Denis
+ * @copyright   Jean-Christian Denis
+ * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 class Utils
 {
-    /** @var    int     The expiration delay before resend report (one week) */
+    /**
+     * The expiration delay before resend report (one week).
+     *
+     * @var     int     EXPIRED_DELAY
+     */
     public const EXPIRED_DELAY = 604800;
 
-    /** @var    string  The default distant API URL */
+    /**
+     * The default distant API URL.
+     *
+     * @var     string  DISTANT_API_URL
+     */
     public const DISTANT_API_URL = 'https://dotclear.watch/api';
 
-    /** @var    string  The distant API version */
+    /**
+     * The distant API version.
+     *
+     * @var     string  DISTANT_API_VERSION
+     */
     public const DISTANT_API_VERSION = '1.1';
 
-    /** @var    array<int,string>   The hiddens modules IDs */
+    /**
+     * The hiddens modules IDs.
+     *
+     * @var     array<int,string>   $hiddens
+     */
     private static array $hiddens = [];
 
-    /** @var    string  Multiblog unique identifiant */
+    /**
+     * Multiblog unique identifiant.
+     *
+     * @var     string  $uid
+     */
     private static string $uid = '';
 
     /**
@@ -74,7 +92,7 @@ class Utils
             if ($strict && in_array($define->getId(), $hiddens)) {
                 continue;
             }
-            $modules[$define->getId()] = $define->get('version');
+            $modules[(string) $define->getId()] = (string) $define->get('version');
         }
 
         return $modules;
@@ -100,7 +118,7 @@ class Utils
             if ($strict && in_array($define->getId(), $hiddens)) {
                 continue;
             }
-            $modules[$define->getId()] = $define->get('version');
+            $modules[(string) $define->getId()] = (string) $define->get('version');
         }
 
         return $modules;
@@ -240,12 +258,12 @@ class Utils
 
     private static function check(): bool
     {
-        return defined('DC_CRYPT_ALGO');
+        return true; // not yet
     }
 
     private static function key(): string
     {
-        return Crypt::hmac(self::uid() . My::id(), DC_CRYPT_ALGO);
+        return Crypt::hmac(self::uid() . My::id(), App::config()->cryptAlgo());
     }
 
     private static function uid(): string
@@ -315,15 +333,6 @@ class Utils
         App::log()->addLog($cur);
     }
 
-    private static function read(): string
-    {
-        $rs = App::log()->getLogs([
-            'log_table' => My::id() . '_report',
-        ]);
-
-        return $rs->isEmpty() || !is_string($rs->f('log_msg')) ? '' : $rs->f('log_msg');
-    }
-
     private static function expired(): bool
     {
         $rs = App::log()->getLogs([
@@ -349,7 +358,7 @@ class Utils
                 'count' => (int) App::blogs()->getBlogs([], true)->f(0),
             ],
             'core' => [
-                'version' => DC_VERSION,
+                'version' => App::config()->dotclearVersion(),
             ],
             'server' => self::getServer(),
             'php'    => [