clean up code

2021-09-02 23:54:55 +02:00 · 2021-09-02 23:54:55 +02:00 · b397ea81fc
parent 635297e159
commit b397ea81fc
7 changed files with 85 additions and 71 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,26 +1,30 @@
-whiteListCom 0.7 - 2021-08-19
- * fix PSR2 coding style
- * update license
+0.7.1 - dev
+- [ ] ?
+- [x] clean up code

-whiteListCom 0.6 - 2013-11-13
- * Clean up code
+0.7 - 2021-08-19
+- fix PSR2 coding style
+- update license

-whiteListCom 0.5 - 2011-01-19
- * Fixed calls to blog object
- * Fixed (hope so) postgreSQL compatibility
- * Added messages on admin
- * New year copyright
+0.6 - 2013-11-13
+- Clean up code

-whiteListCom 0.4 - 2010-06-05
- * Switched to DC 2.2
+0.5 - 2011-01-19
+- Fixed calls to blog object
+- Fixed (hope so) postgreSQL compatibility
+- Added messages on admin
+- New year copyright

-whiteListCom 0.3 - 2009-11-08
- * Fixed whitout comment_trackback in admin comments list
- * Fixed typo
- * Added LICENSE
- 
-whiteListCom 0.2 - 2009-09-27
- * Changed to antispam system
+0.4 - 2010-06-05
+- Switched to DC 2.2

-whiteListCom 0.1 - 2009-09-16
- * First lab release
+0.3 - 2009-11-08
+- Fixed whitout comment_trackback in admin comments list
+- Fixed typo
+- Added LICENSE
+
+0.2 - 2009-09-27
+- Changed to antispam system
+
+0.1 - 2009-09-16
+- First lab release
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 ## WHAT IS WHITELISTCOM ?

-whiteListCom "White list for comments" is a plugin for the open-source 
+_whiteListCom_ "White list for comments" is a plugin for the open-source 
 web publishing software called Dotclear.

 Set up a list of users which can publish comments without validation 
@ -10,14 +10,14 @@ and a list of reserved names (pair of nickname / email ).

 ## REQUIREMENTS

- whiteListCom requires: 
+_whiteListCom_ requires: 

-  * permissions to manage antispam
-  * Dotclear 2.6
+ * permissions to manage antispam
+ * Dotclear 2.6

 ## USAGE

-First install whiteListCom, manualy from a zip package or from 
+First install _whiteListCom_, manualy from a zip package or from 
 Dotaddict repository. (See Dotclear's documentation to know how do this)

 Enable and configure "Unmoderated authors" of "Reserved names" 
@ -28,4 +28,4 @@ Note: User must write a comment before able to be added to the list.

 * License : GNU GPL v2
 * Source & contribution : [GitHub Page](https://github.com/JcDenis/whiteListCom)
- * Packages & details:  [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/whiteListCom)
+ * Packages & details:  [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/whiteListCom)
--- a/_define.php
+++ b/_define.php
@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of whiteListCom, 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 whiteListCom, 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,11 +21,12 @@ $this->registerModule(
    'Jean-Christian Denis and Contributors',
    '0.7.1',
    [
+        'requires' => [['core', '2.19']],
        'permissions' => 'admin',
        'priority' => 200,
-        'type'          => 'plugin',
-        'dc_min'        => '2.18',
-        'support'       => 'https://github.com/JcDenis/whiteListCom',
-        'details'       => 'https://plugins.dotaddict.org/dc2/details/whiteListCom'
+        'type'=> 'plugin',
+        'support'=> 'https://github.com/JcDenis/whiteListCom',
+        'details'=> 'https://plugins.dotaddict.org/dc2/details/whiteListCom',
+        'repository' => 'https://raw.githubusercontent.com/JcDenis/whiteListCom/master/dcstore.xml'
    ]
 );
--- a/_prepend.php
+++ b/_prepend.php
@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of whiteListCom, 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 whiteListCom, 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;
--- a/dcstore.xml
+++ b/dcstore.xml
@ -0,0 +1,11 @@
+<modules xmlns:da="http://dotaddict.org/da/">
+<module id="whiteListCom">
+<name>Liste blanche des commentaires</name>
+<version>0.7.1</version>
+<author>Jean-Christian Denis and Contributors</author>
+<desc>Whitelists for comments moderation</desc>
+<file>https://github.com/JcDenis/whiteListCom/releases/download/v0.7.1/plugin-whiteListCom.zip</file>
+<da:details>https://plugins.dotaddict.org/dc2/details/whiteListCom</da:details>
+<da:support>https://github.com/JcDenis/whiteListCom</da:support>
+</module>
+</modules>
--- a/inc/lib.whitelistcom.php
+++ b/inc/lib.whitelistcom.php
@ -1,15 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-#
-# This file is part of whiteListCom, 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 whiteListCom, 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;
@ -263,13 +263,13 @@ class whiteListCom
        $this->core = $core;
        $this->con = $core->con;
        $this->blog = $core->con->escape($core->blog->id);
-        
+
        $core->blog->settings->addNamespace('whiteListCom');
        $this->settings = $core->blog->settings->whiteListCom;
-        
+
        $unmoderated = $this->settings->whiteListCom_unmoderated;
        $this->unmoderated = self::decode($unmoderated);
-        
+
        $reserved = $this->settings->whiteListCom_reserved;
        $this->reserved = self::decode($reserved);
    }
@ -283,7 +283,7 @@ class whiteListCom
            'Whitelist of unmoderated users on comments',
            true,false
        );
-        
+
        $this->settings->put(
            'whiteListCom_reserved',
            self::encode($this->reserved),
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@ -36,6 +36,4 @@ $GLOBALS['__l10n']['This name is reserved to an other user.'] = 'Ce nom est rés

 $GLOBALS['__l10n']['Whitelists for comments moderation'] = 'Listes blanches pour la modération de commentaires';

-$GLOBALS['__l10n']['Whitelist comments'] = 'Liste blanche des commentaires';
-
-?>
+$GLOBALS['__l10n']['Whitelist comments'] = 'Liste blanche des commentaires';