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

---
 CHANGELOG.md             | 72 +++++++++++++++++++++-------------------
 _admin.php               | 22 ++++++------
 _define.php              | 27 +++++++--------
 _install.php             | 22 ++++++------
 _prepend.php             | 22 ++++++------
 _public.php              | 22 ++++++------
 dcstore.xml              | 11 ++++++
 locales/fr/main.lang.php |  4 +--
 8 files changed, 108 insertions(+), 94 deletions(-)
 create mode 100644 dcstore.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d455b6a..061bed0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,45 +1,49 @@
-postExpired xxxx.xx.xx
- * Not fix: Wrong timezone on admin vs public expired date
+2021.08.20.1 - dev
+ - [ ] fix wrong timezone on admin vs public expired date
+ - [x] clean up again...
 
-postExpired 2021.08.19
- * update license and fix PSR2 coding style
+2021.08.20
+- fix metadata call
 
-postExpired 2013.11.13
- * Fixed wrong field name for category
+2021.08.19
+- update license and fix PSR2 coding style
 
-postExpired 2013.11.03
- * Switch to Dotclear 2.6
- * Use new posts actions
- * Save all options in one meta
- * Limit plugin to contentadmin
+2013.11.13
+- Fixed wrong field name for category
 
-postExpired 2013.06.30
- * Fixed post_type and posts_actions
+2013.11.03
+- Switch to Dotclear 2.6
+- Use new posts actions
+- Save all options in one meta
+- Limit plugin to contentadmin
 
-postExpired 0.5 - 2010-08-17
- * Added compatibility with plugins 'pages' and 'muppet'
+2013.06.30
+- Fixed post_type and posts_actions
 
-postExpired 0.4 - 2010-08-03
- * Added actions (comments, trackbacks) (closes #525)
- * Speed up public part (less sql resquests)
- * Fixed typo
+0.5 - 2010-08-17
+- Added compatibility with plugins 'pages' and 'muppet'
 
-postExpired 0.3.1 - 2010-06-21
- * Fixed user rights
- * Fixed (again) PHP 5.3 compatibility
- * Fixed typo
+0.4 - 2010-08-03
+- Added actions (comments, trackbacks) (closes #525)
+- Speed up public part (less sql resquests)
+- Fixed typo
 
-postExpired 0.3 - 2010-06-08
- * Switched to DC 2.2 (settings,meta)
+0.3.1 - 2010-06-21
+- Fixed user rights
+- Fixed (again) PHP 5.3 compatibility
+- Fixed typo
 
-postExpired 0.2.1 - 2010-05-28
- * Fixed DC 2.1.7 settings bugs
+0.3 - 2010-06-08
+- Switched to DC 2.2 (settings,meta)
 
-postExpired 0.2 - 2010-04-14
- * Added actions choice (status,category,selected)
- * Added template block and value
- * Added behaviors to open choices
- * Enhanced db resquest on public side
+0.2.1 - 2010-05-28
+- Fixed DC 2.1.7 settings bugs
 
-postExpired 0.1 - 2010-04-10
- * First lab release
\ No newline at end of file
+0.2 - 2010-04-14
+- Added actions choice (status,category,selected)
+- Added template block and value
+- Added behaviors to open choices
+- Enhanced db resquest on public side
+
+0.1 - 2010-04-10
+- First lab release
\ No newline at end of file
diff --git a/_admin.php b/_admin.php
index 0d8da43..98111bf 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of postExpired, 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 postExpired, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis and Contributors
+ * 
+ * @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 492dd76..7d78e1a 100644
--- a/_define.php
+++ b/_define.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of postExpired, 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 postExpired, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis and Contributors
+ * 
+ * @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,10 +21,11 @@ $this->registerModule(
     'Jean-Christian Denis and Contributors',
     '2021.08.20.1',
     [
+        'requires' => [['core', '2.19']],
         'permissions'   => 'usage,contentadmin',
         'type'          => 'plugin',
-        'dc_min'        => '2.18',
         'support'       => 'https://github.com/JcDenis/postExpired',
-        'details'       => 'https://plugins.dotaddict.org/dc2/details/postExpired'
+        'details'       => 'https://plugins.dotaddict.org/dc2/details/postExpired',
+        'repository' => 'https://raw.githubusercontent.com/JcDenis/postExpired/master/dcstore.xml'
     ]
 );
\ No newline at end of file
diff --git a/_install.php b/_install.php
index 95ab4be..e3fea2e 100644
--- a/_install.php
+++ b/_install.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of postExpired, 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 postExpired, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis and Contributors
+ * 
+ * @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 c17d400..bb19e86 100644
--- a/_prepend.php
+++ b/_prepend.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of postExpired, 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 postExpired, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis and Contributors
+ * 
+ * @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/_public.php b/_public.php
index 9146afc..086b23c 100644
--- a/_public.php
+++ b/_public.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of postExpired, 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 postExpired, a plugin for Dotclear 2
+ * 
+ * @package Dotclear
+ * @subpackage Plugin
+ * 
+ * @author Jean-Christian Denis and Contributors
+ * 
+ * @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/dcstore.xml b/dcstore.xml
new file mode 100644
index 0000000..6b8856c
--- /dev/null
+++ b/dcstore.xml
@@ -0,0 +1,11 @@
+<modules xmlns:da="http://dotaddict.org/da/">
+<module id="postExpired">
+<name>Billets périmés</name>
+<version>2021.08.20.1</version>
+<author>Jean-Christian Denis and Contributors</author>
+<desc>Change entries options at a given date</desc>
+<file>https://github.com/JcDenis/postExpired/releases/download/v2021.08.20.1/plugin-postExpired.zip</file>
+<da:details>https://plugins.dotaddict.org/dc2/details/postExpired</da:details>
+<da:support>https://github.com/JcDenis/postExpired</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 0b3b73b..4ada102 100644
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@@ -57,6 +57,4 @@ $GLOBALS['__l10n']['Closed'] = 'Fermé';
 $GLOBALS['__l10n']['Expired on'] = 'Expire le';
 
 #_public.php:26
-$GLOBALS['__l10n']['This entry has no expiration date'] = 'Ce billet n\'a pas de date de péremption';
-
-?>
\ No newline at end of file
+$GLOBALS['__l10n']['This entry has no expiration date'] = 'Ce billet n\'a pas de date de péremption';
\ No newline at end of file