From 7c4dfabc5c7b616f3c35e7b4f17941fcb364ef6f Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Thu, 2 Sep 2021 23:22:11 +0200
Subject: [PATCH] clean up code

---
 CHANGELOG.md             | 19 ++++++++++---------
 README.md                | 10 +++++-----
 _admin.php               | 22 +++++++++++-----------
 _define.php              | 24 ++++++++++++------------
 _public.php              | 22 +++++++++++-----------
 _widgets.php             | 24 ++++++++++++------------
 dcstore.xml              |  6 ++----
 locales/fr/main.lang.php |  3 +--
 8 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb32804..85c3e6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,32 @@
-topWriter x.x - xxxx.xx.xx
- * literal rank of writer depending of num of com
+0.8.1 - dev
+- [ ] literal rank of writer depending of num of com
+- [x] clean up code
 
-topWriter 0.8 - 2021.08.27
+0.8 - 2021.08.27
 - clean up (PSR2, short array, ...)
 - update widget class
 - fix translations
 - update license
 
-topWriter 0.7 - 25-04-2015 - Pierre Van Glabeke
+0.7 - 25-04-2015 - Pierre Van Glabeke
 - Modification url support
 
-topWriter 0.6 - 23-01-2015 - Pierre Van Glabeke
+0.6 - 23-01-2015 - Pierre Van Glabeke
 - Modifications locales pour widget
 
-topWriter 0.5 - 19-01-2015 - Pierre Van Glabeke
+0.5 - 19-01-2015 - Pierre Van Glabeke
 - Compatibilité dc2.7
 
-topWriter 0.4 - 2013-11-12
+0.4 - 2013-11-12
 - Switch to Dotclear 2.6
 - Add widget options
 - Use plural forms
 
-topWriter 0.3 - 2010-10-06
+0.3 - 2010-10-06
 - Switched to DC 2.2
 - Fixed list order (thanks to Atv')
 
-topWriter 0.2 - 2009-08-10
+0.2 - 2009-08-10
 - Fixed php 5.3 compatibility
 - Fixed PostGreSQL compatibility
 - Added option to exclude post authors from comment list
\ No newline at end of file
diff --git a/README.md b/README.md
index ea33e0c..5adb35e 100644
--- a/README.md
+++ b/README.md
@@ -9,14 +9,14 @@ Show most active contributor on a widget.
 
 ## REQUIREMENTS
 
- topWriter requires: 
+_topWriter_ requires: 
 
-  * permissions to manage widgets
-  * Dotclear 2.6
+ * permissions to manage widgets
+ * Dotclear 2.19
 
 ## USAGE
 
-First install topWriter, manualy from a zip package or from 
+First install _topWriter_, manualy from a zip package or from 
 Dotaddict repository. (See Dotclear's documentation to know how do this)
 
 Add and configure "Top writer" from widgets manager.
@@ -31,4 +31,4 @@ There are two widget: entries and comments.
 ## CONTRIBUTORS
 
  * Jean-Chirstian Denis
- * Pierre Van Glabeke
+ * Pierre Van Glabeke
\ No newline at end of file
diff --git a/_admin.php b/_admin.php
index b456899..459867f 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of topWriter, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
-# 
-# Licensed under the GPL version 2.0 license.
-# A copy of this license is available in LICENSE file or at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK ------------------------------------
+/**
+ * @brief topWriter, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis, Pierre Van Glabeke
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_CONTEXT_ADMIN')) {
     return null;
diff --git a/_define.php b/_define.php
index 576f71f..18ca130 100644
--- a/_define.php
+++ b/_define.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of topWriter, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
-# 
-# Licensed under the GPL version 2.0 license.
-# A copy of this license is available in LICENSE file or at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK ------------------------------------
+/**
+ * @brief topWriter, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis, Pierre Van Glabeke
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_RC_PATH')) {
     return null;
@@ -21,9 +21,9 @@ $this->registerModule(
     'Jean-Christian Denis, Pierre Van Glabeke',
     '0.8.1',
     [
+        'requires' => [['core', '2.19']],
         'permissions' => 'admin',
         'type' => 'plugin',
-        'dc_min' => '2.19',
         'support' => 'http://forum.dotclear.org/viewtopic.php?pid=333002#p333002',
         'details' => 'http://plugins.dotaddict.org/dc2/details/topWriter',
         'repository' => 'https://raw.githubusercontent.com/JcDenis/topWriter/master/dcstore.xml'
diff --git a/_public.php b/_public.php
index efa292a..3d7ac51 100644
--- a/_public.php
+++ b/_public.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of topWriter, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
-# 
-# Licensed under the GPL version 2.0 license.
-# A copy of this license is available in LICENSE file or at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK ------------------------------------
+/**
+ * @brief topWriter, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis, Pierre Van Glabeke
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_RC_PATH')) {
     return null;
diff --git a/_widgets.php b/_widgets.php
index dfb53a5..202cea2 100644
--- a/_widgets.php
+++ b/_widgets.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of topWriter, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
-# 
-# Licensed under the GPL version 2.0 license.
-# A copy of this license is available in LICENSE file or at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK ------------------------------------
+/**
+ * @brief topWriter, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis, Pierre Van Glabeke
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_RC_PATH')) {
     return null;
@@ -221,7 +221,7 @@ class topWriterWidget
                 sprintf('<ul>%s</ul>', $content)
         );
     }
-    
+
     public static function topPost($w)
     {
         global $core;
diff --git a/dcstore.xml b/dcstore.xml
index 7f4998b..a929b75 100644
--- a/dcstore.xml
+++ b/dcstore.xml
@@ -1,13 +1,11 @@
 <modules xmlns:da="http://dotaddict.org/da/">
 <module id="topWriter">
 <name>topWriter</name>
-<version>0.8</version>
+<version>0.8.1</version>
 <author>Jean-Christian Denis, Pierre Van Glabeke</author>
 <desc>Ranking of the most prolific writers and/or commentators</desc>
-<file>https://github.com/JcDenis/topWriter/releases/download/v0.8/plugin-topWriter.zip</file>
-<da:dcmin>2.19</da:dcmin>
+<file>https://github.com/JcDenis/topWriter/releases/download/v0.8.1/plugin-topWriter.zip</file>
 <da:details>http://plugins.dotaddict.org/dc2/details/topWriter</da:details>
-<da:section></da:section>
 <da:support>http://forum.dotclear.org/viewtopic.php?pid=333002#p333002</da:support>
 </module>
 </modules>
\ No newline at end of file
diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php
index 46e4689..212367f 100644
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@@ -71,5 +71,4 @@ $GLOBALS['__l10n']['%s entries'] = '%s billets';
 
 $GLOBALS['__l10n']['un comment'] = 'un commentaire';
 
-$GLOBALS['__l10n']['%s comments'] = '%s commentaires';
-
+$GLOBALS['__l10n']['%s comments'] = '%s commentaires';
\ No newline at end of file