From b62a04d387a7b9f946ff48c59e24acc3555b1f55 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Thu, 2 Sep 2021 21:08:55 +0200
Subject: [PATCH] clean up code

---
 CHANGELOG.md             | 75 +++++++++++++++++++++-------------------
 _admin.php               | 22 ++++++------
 _config.php              | 22 ++++++------
 _define.php              | 26 +++++++-------
 _install.php             | 22 ++++++------
 _public.php              | 22 ++++++------
 dcstore.xml              |  8 ++---
 js/admin.js              | 11 ------
 locales/fr/main.lang.php |  3 +-
 9 files changed, 100 insertions(+), 111 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94ac7b8..3f4dbf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,48 +1,51 @@
-fac 0.9.1
- * fix translations
+0.9.2 - 2021.09.02
+- update license bloc to phpdoc
 
-fac 0.9
- * split superadmin and admin config
- * move blog settings from plugin config to blog pref
- * fix help
- * use php short array code
+0.9.1 - 2021.08.23
+- fix translations
 
-fac 0.8.1
- * fix context filters
+0.9
+- split superadmin and admin config
+- move blog settings from plugin config to blog pref
+- fix help
+- use php short array code
 
-fac 0.8 - 2021-08-19
- * update license
- * fixed PSR2 coding style
+0.8.1
+- fix context filters
 
-fac 0.7 - 2013-11-11
- * Switch to Dotclear 2.6
- * Fix missing feed description
+0.8 - 2021-08-19
+- update license
+- fixed PSR2 coding style
 
-fac 0.6.1 - 2010-11-12
- * Fixed install on nightly build
+0.7 - 2013-11-11
+- Switch to Dotclear 2.6
+- Fix missing feed description
 
-fac 0.6 - 2010-08-16
- * Added compatibility with plugin muppet
+0.6.1 - 2010-11-12
+- Fixed install on nightly build
 
-fac 0.5 - 2010-06-05
- * Switched to DC 2.2
- * Added predefined format (thx to Jean-Michel) (closes #459)
+0.6 - 2010-08-16
+- Added compatibility with plugin muppet
 
-fac 0.4.1 - 2010-04-10
- * Fixed typo (thx to Jean-Michel) (closes #458)
+0.5 - 2010-06-05
+- Switched to DC 2.2
+- Added predefined format (thx to Jean-Michel) (closes #459)
 
-fac 0.4 - 2010-05-25
- * Fixed Timeout error
- * Fixed DC 2.1.7
+0.4.1 - 2010-04-10
+- Fixed typo (thx to Jean-Michel) (closes #458)
 
-fac 0.3 - 2010-04-10
- * Added options to format feed
- * Added DC 2.2 compatibility
- * Removed class and used metadata
- * Changed admin page design
+0.4 - 2010-05-25
+- Fixed Timeout error
+- Fixed DC 2.1.7
 
-fac 0.2 - 2010-02-17
- * Fixed some fields in admin
+0.3 - 2010-04-10
+- Added options to format feed
+- Added DC 2.2 compatibility
+- Removed class and used metadata
+- Changed admin page design
 
-fac 0.1 - 2010-02-16
- * First lab release
\ No newline at end of file
+0.2 - 2010-02-17
+- Fixed some fields in admin
+
+0.1 - 2010-02-16
+- First lab release
\ No newline at end of file
diff --git a/_admin.php b/_admin.php
index fbbb2cf..18bb379 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of fac, 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 fac, 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/_config.php b/_config.php
index 4392759..6b32da5 100644
--- a/_config.php
+++ b/_config.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of fac, 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 fac, 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_MODULE')) {
     return null;
diff --git a/_define.php b/_define.php
index b049115..389f5b4 100644
--- a/_define.php
+++ b/_define.php
@@ -1,29 +1,29 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of fac, 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 fac, 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;
 }
 
 $this->registerModule(
-    'fac',
+    'Feed after content',
     'Add RSS/Atom feeds after entries content',
     'Jean-Christian Denis and Contributors',
     '0.9.2',
     [
+        'requires' => [['core', '2.19']], 
         'permissions' => 'usage,contentadmin',
         'type' => 'plugin',
-        'dc_min' => '2.19',
         'support' => 'https://github.com/JcDenis/fac',
         'details' => 'https://plugins.dotaddict.org/dc2/details/fac',
         'repository' => 'https://raw.githubusercontent.com/JcDenis/fac/master/repository.xml',
diff --git a/_install.php b/_install.php
index dc2021f..fd76d33 100644
--- a/_install.php
+++ b/_install.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of fac, 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 fac, 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/_public.php b/_public.php
index 8910498..4286feb 100644
--- a/_public.php
+++ b/_public.php
@@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of fac, 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 fac, 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
index 21455da..18e2cd2 100644
--- a/dcstore.xml
+++ b/dcstore.xml
@@ -2,12 +2,10 @@
 <module id="fac">
 <name>Feed after content</name>
 <version>0.9.2</version>
-<author>Jean-Christian Denis and contributors</author>
+<author>Jean-Christian Denis and Contributors</author>
 <desc>Add RSS/Atom feeds after entries content</desc>
-<file>https://github.com/JcDenis/fac/releases/download/v0.9/plugin-fac.zip</file>
-<da:dcmin>2.19</da:dcmin>
+<file>https://github.com/JcDenis/fac/releases/download/v0.9.2/plugin-fac.zip</file>
 <da:details>https://plugins.dotaddict.org/dc2/details/fac</da:details>
-<da:section></da:section>
 <da:support>https://github.com/JcDenis/fac</da:support>
 </module>
-</modules>
+</modules>
\ No newline at end of file
diff --git a/js/admin.js b/js/admin.js
index 9e40614..4af6ac0 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -1,14 +1,3 @@
-/* -- BEGIN LICENSE BLOCK ----------------------------------
- * This file is part of fac, a plugin for Dotclear 2.
- * 
- * Copyright (c) 2009-2010 JC Denis and contributors
- * jcdenis@gdwd.com
- * 
- * 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 ------------------------------------*/
-
 $(function(){
 	/* toogle admin form sidebar */
 	$('#fac h5').toggleWithLegend(
diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php
index 3a02833..436c7c5 100644
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@@ -169,5 +169,4 @@ $GLOBALS['__l10n']['Description of entry'] = 'Description du billet';
 #_public.php:120
 $GLOBALS['__l10n']['a related feed'] = 'un flux lié';
 
-$GLOBALS['__l10n']['Add RSS/Atom feeds after entries content'] = 'Ajouter des flux RSS/Atom après le contenu des billets';
-
+$GLOBALS['__l10n']['Add RSS/Atom feeds after entries content'] = 'Ajouter des flux RSS/Atom après le contenu des billets';
\ No newline at end of file