CHANGELOG.md

@@ -1,71 +1,50 @@
-bloganniv 2.3 - 2023.08.06
-===========================================================
-* Require Dotclear 2.27
-* Require PHP 7.4+
-* Upgrade to Dotclear 2.27
-* Move third party repository
-* Use Dotclear style for changelog
-
-bloganniv 2.2 - 2023.05.13
-===========================================================
-* Require Dotclear 2.26
+2.2 - 2023.05.13
+* require Dotclear 2.26
 * release for Dotclear 2.26 stable
 
-bloganniv 2.1 - 2023.04.24
-===========================================================
+2.1 - 2023.04.24
 * require Dotclear 2.26
 * fix nullsafe warnings
 * remove magic
 
-bloganniv 2.0 - 2023.04.11
-===========================================================
+2.0 - 2023.04.11
 * require Dotclear 2.26
 * use namespace
 
-bloganniv 1.6 - 2022.12.16
-===========================================================
+1.6 - 2022.12.16
 * update to dotclear 2.24
 * fix phpstan errors
 
-bloganniv 1.5.1 - 2015.04.22 - Pierre Van Glabeke
-===========================================================
+1.5.1 - 2015.04.22 - Pierre Van Glabeke
 * nommage widget
 * modifs localisation
 
-bloganniv 1.5 - Pierre Van Glabeke
-===========================================================
+1.5 - Pierre Van Glabeke
 * compatibilité dc2.7
 
-bloganniv 1.4.1 - Pierre Van Glabeke
-===========================================================
+1.4.1 - Pierre Van Glabeke
 * Ajustements settings
 * Fin de ligne unix
 * complément define.php
 
-bloganniv 1.4 - Pierre Van Glabeke
-===========================================================
+1.4 - Pierre Van Glabeke
 * Modifs affichage pour le widget (remplacement paragraphe par une liste)
 
-bloganniv 1.3.1
-===========================================================
+1.3.1
 * Ajout choix affichage page pour le widget (content only + css)
 
-bloganniv 1.3
-===========================================================
+1.3
 * Ajout choix affichage page pour le widget
 * Correction de traduction
 
-bloganniv 1.2
-===========================================================
+1.2
 * Ajout du piochage automatique de la date du blog si non saisie dans le widget
 * Ajout @ devant la fonction checkdate pour eviter un warning
 
-bloganniv 1.1
-===========================================================
+1.1
 * Compatibilité dc2.2
 * Localisation
 * Intégration corrections proposées sur http://www.myouaibe.com/index.php/post/2007/08/23/Plugin-BlogAnniv-pour-DOTCLEAR-2
 
-bloganniv 1.0
-===========================================================
+1.0
 * Création

README.md

@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/JcDenis/bloganniv)](https://github.com/JcDenis/bloganniv/releases)
 [![Date](https://img.shields.io/github/release-date/JcDenis/bloganniv)](https://github.com/JcDenis/bloganniv/releases)
 [![Issues](https://img.shields.io/github/issues/JcDenis/bloganniv)](https://github.com/JcDenis/bloganniv/issues)
-[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-blue.svg)](https://fr.dotclear.org/download)
+[![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/bloganniv)
 [![License](https://img.shields.io/github/license/JcDenis/bloganniv)](https://github.com/JcDenis/bloganniv/blob/master/LICENSE)
 
@@ -22,7 +22,7 @@ It adds widget showing:
  _bloganniv_ requires: 
 
   * permissions to manage widgets
-  * Dotclear 2.27
+  * Dotclear 2.26
 
 ## USAGE
 
@@ -34,8 +34,8 @@ Add and configure "Blog anniv" from widgets manager.
 ## 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/bloganniv) or [GitHub Page](https://github.com/JcDenis/bloganniv)
- * Packages & details : [Gitea Page](https://git.dotclear.watch/JcDenis/bloganniv/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/bloganniv)
+ * Source & contribution : [GitHub Page](https://github.com/JcDenis/bloganniv)
+ * Packages & details : [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/bloganniv)
 
 ## CONTRIBUTORS
 

_define.php

@@ -10,7 +10,7 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-if (!defined('DC_RC_PATH')) {
+if (!defined('DC_RC_PATH') || is_null(dcCore::app()->auth)) {
     return null;
 }
 
@@ -18,15 +18,15 @@ $this->registerModule(
     'Blog Anniv',
     'Counting the number of days before and after a particular date',
     'Fran6t, Pierre Van Glabeke and Contributors',
-    '2.3',
+    '2.2',
     [
-        'requires'    => [['core', '2.27']],
+        'requires'    => [['core', '2.26']],
         'permissions' => dcCore::app()->auth->makePermissions([
             dcCore::app()->auth::PERMISSION_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',
+        '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',
     ]
 );

dcstore.xml

@@ -2,12 +2,12 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="bloganniv">
     <name>Blog Anniv</name>
-    <version>2.3</version>
+    <version>2.2</version>
     <author>Fran6t, Pierre Van Glabeke and Contributors</author>
     <desc>Counting the number of days before and after a particular date</desc>
-    <file>https://gitea.dotclear.watch/JcDenis/bloganniv/releases/download/v2.3/plugin-bloganniv.zip</file>
-    <da:dcmin>2.27</da:dcmin>
-    <da:details>https://git.dotclear.watch/JcDenis/bloganniv/src/branch/master/README.md</da:details>
-    <da:support>https://git.dotclear.watch/JcDenis/bloganniv/issues</da:support>
+    <file>https://github.com/JcDenis/bloganniv/releases/download/v2.2/plugin-bloganniv.zip</file>
+    <da:dcmin>2.26</da:dcmin>
+    <da:details>https://plugins.dotaddict.org/dc2/details/bloganniv</da:details>
+    <da:support>https://github.com/JcDenis/bloganniv</da:support>
   </module>
 </modules>

src/Backend.php

@@ -15,18 +15,20 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\bloganniv;
 
 use dcCore;
-use Dotclear\Core\Process;
+use dcNsProcess;
 
-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');
+
+        return static::$init;
     }
 
     public static function process(): bool
     {
-        if (!self::status()) {
+        if (!static::$init) {
             return false;
         }
 

src/Frontend.php

@@ -15,18 +15,20 @@ declare(strict_types=1);
 namespace Dotclear\Plugin\bloganniv;
 
 use dcCore;
-use Dotclear\Core\Process;
+use dcNsProcess;
 
-class Frontend extends Process
+class Frontend extends dcNsProcess
 {
     public static function init(): bool
     {
-        return self::status(My::checkContext(My::FRONTEND));
+        static::$init = defined('DC_RC_PATH');
+
+        return static::$init;
     }
 
     public static function process(): bool
     {
-        if (!self::status()) {
+        if (!static::$init) {
             return false;
         }
 

src/My.php

@@ -14,11 +14,36 @@ declare(strict_types=1);
 
 namespace Dotclear\Plugin\bloganniv;
 
-use Dotclear\Module\MyPlugin;
+use dcCore;
 
 /**
  * This module definitions.
  */
-class My extends MyPlugin
+class My
 {
+    /**
+     * 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__);
+    }
 }

src/Widgets.php

@@ -90,7 +90,7 @@ class Widgets
                 $nbrejours = abs($timestamp2 - $timestamp1) / 86400;
                 $nbreannee = abs($annee2 - $annee - 1);
             }
-            // abs($timestamp2 - $timestamp1)/(86400*7); //Affichage du nombre de semaine : 3.85
+        // abs($timestamp2 - $timestamp1)/(86400*7); //Affichage du nombre de semaine : 3.85
         } else {
             // date invalide
             return '';