From 8dff5e8f5555501390f4494d982ff675b4426fb0 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Thu, 2 Sep 2021 22:14:32 +0200
Subject: [PATCH] clean up again...

---
 CHANGELOG.md                |  8 +++-----
 _admin.php                  | 22 +++++++++++-----------
 _config.php                 | 22 +++++++++++-----------
 _define.php                 | 22 +++++++++++-----------
 _install.php                | 22 +++++++++++-----------
 _prepend.php                | 22 +++++++++++-----------
 _uninstall.php              | 23 +++++++++++------------
 dcstore.xml                 | 11 +++++++++++
 inc/class.dc.packman.php    | 22 +++++++++++-----------
 inc/lib.packman.filezip.php | 22 +++++++++++-----------
 inc/lib.packman.php         | 26 +++++++++++++-------------
 index.php                   | 22 +++++++++++-----------
 locales/fr/main.lang.php    |  3 +--
 13 files changed, 127 insertions(+), 120 deletions(-)
 create mode 100644 dcstore.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 042078a..1a3cec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,6 @@
-todo
-- plop
-
-2021.08.28
+2021.08.22.1 - dev
 - add option to convert newline from files content on the fly
+- clean up again...
 
 2021.08.22
 - fix PSR2 coding style
@@ -45,4 +43,4 @@ todo
 - Added install and uninstall features
 - Added help
 - Added LICENSE
-- Cleaned up
+- Cleaned up
\ No newline at end of file
diff --git a/_admin.php b/_admin.php
index 9966368..7da3631 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/_config.php b/_config.php
index c4ffd50..68d8e2e 100644
--- a/_config.php
+++ b/_config.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_CONTEXT_MODULE')) {
     return null;
diff --git a/_define.php b/_define.php
index f8707eb..04ceb2a 100644
--- a/_define.php
+++ b/_define.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/_install.php b/_install.php
index 13da451..d0beb79 100644
--- a/_install.php
+++ b/_install.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/_prepend.php b/_prepend.php
index b5eec2e..7d175bf 100644
--- a/_prepend.php
+++ b/_prepend.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/_uninstall.php b/_uninstall.php
index 438a8e4..dba17d6 100644
--- a/_uninstall.php
+++ b/_uninstall.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_CONTEXT_ADMIN')) {
     return null;
@@ -38,7 +38,6 @@ $this->addUserAction(
     /* desc */  __('delete the version number')
 );
 
-
 $this->addDirectAction(
     /* type */  'settings',
     /* action */    'delete_all',
diff --git a/dcstore.xml b/dcstore.xml
new file mode 100644
index 0000000..4e5c984
--- /dev/null
+++ b/dcstore.xml
@@ -0,0 +1,11 @@
+<modules xmlns:da="http://dotaddict.org/da/">
+<module id="pacKman">
+<name>pacKman</name>
+<version>2021.08.22.1</version>
+<author>Jean-Christian Denis</author>
+<desc>Manage your Dotclear packages</desc>
+<file>https://github.com/JcDenis/pacKman/releases/download/v2021.08.22.1/plugin-pacKman.zip</file>
+<da:details>https://plugins.dotaddict.org/dc2/details/pacKman</da:details>
+<da:support>https://github.com/JcDenis/pacKman</da:support>
+</module>
+</modules>
\ No newline at end of file
diff --git a/inc/class.dc.packman.php b/inc/class.dc.packman.php
index c582d22..ec9139c 100644
--- a/inc/class.dc.packman.php
+++ b/inc/class.dc.packman.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/inc/lib.packman.filezip.php b/inc/lib.packman.filezip.php
index b93c342..12fcf98 100644
--- a/inc/lib.packman.filezip.php
+++ b/inc/lib.packman.filezip.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 class packmanFileZip extends fileZip
 {
diff --git a/inc/lib.packman.php b/inc/lib.packman.php
index fb29803..cd82be7 100644
--- a/inc/lib.packman.php
+++ b/inc/lib.packman.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 
 if (!defined('DC_CONTEXT_ADMIN')) {
     return null;
@@ -126,7 +126,7 @@ class libPackman
 
         '</div>';
     }
-    
+
     public static function repository($core, $modules, $type, $title)
     {
         if (!in_array($type, ['plugins', 'themes', 'repository'])) {
@@ -147,7 +147,7 @@ class libPackman
         }
 
         $combo_action = [__('delete') => 'delete'];
-        
+
         if ($type == 'plugins' || $type == 'themes') {
             $combo_action[__('install')] = 'install';
         }
diff --git a/index.php b/index.php
index 12fcffa..40e337e 100644
--- a/index.php
+++ b/index.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of pacKman, 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 pacKman, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis
+ * 
+ * @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/locales/fr/main.lang.php b/locales/fr/main.lang.php
index 6d775a5..5661402 100644
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@@ -132,5 +132,4 @@ $GLOBALS['__l10n']['Configuration'] = 'Configuration';
 $GLOBALS['__l10n']['Plugins root'] = 'Racine des plugins';
 
 #index.php:316
-$GLOBALS['__l10n']['Themes root'] = 'Racine des themes';
-
+$GLOBALS['__l10n']['Themes root'] = 'Racine des themes';
\ No newline at end of file