First pass to clean up code.

2021-09-07 00:09:09 +02:00 · 2021-09-07 00:09:09 +02:00 · bbdd672463
commit bbdd672463
parent b2deebd188
15 changed files with 1071 additions and 1051 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,7 +6,8 @@
 - [ ] fix php7.3+ and php8.0
 - [ ] fix PSR(1)2 coding style
 - [ ] fix translation
- [ ] update license
+- [x] add dcstore (pre release)
+- [x] update license
 - [x] update readme

 0.7.3 - 2018.03.12 - Pierre Van Glabeke
--- a/_admin.php
+++ b/_admin.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;}

--- a/_define.php
+++ b/_define.php
@ -1,29 +1,31 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;}
+if (!defined('DC_RC_PATH')) {
+    return null;
+}

 $this->registerModule(
-	/* Name */			"Advanced cleaner",
-	/* Description*/		"Make a huge cleaning of dotclear",
-	/* Author */			"JC Denis",
-	/* Version */			'0.7.3',
-	/* Properties */
-	array(
+    'Advanced cleaner',
+    'Make a huge cleaning of dotclear',
+    'Jean-Christian Denis and Contributors',
+    '0.7.3.1',
+    [
+        'requires' => [['core', '2.19']],
        'permissions' => null,
        'type' => 'plugin',
-		'dc_min' => '2.9',
-		'support' => 'https://forum.dotclear.org/viewtopic.php?id=40381',
-		'details' => 'http://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner'
-		)
+        'support' => 'https://github.com/JcDenis/dcAdvancedCleaner',
+        'details' => 'https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner',
+        'repository' => 'https://raw.githubusercontent.com/JcDenis/dcAdvancedCleaner/master/dcstore.xml'
+    ]
 );
-	/* date */		#20180213
--- a/_install.php
+++ b/_install.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;}

--- a/_prepend.php
+++ b/_prepend.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;

--- a/dcstore.xml
+++ b/dcstore.xml
@ -0,0 +1,12 @@
+<modules xmlns:da="http://dotaddict.org/da/">
+<module id="dcAdvancedCleaner">
+<name>Nettoyeur avancé</name>
+<version>0.7.3.1</version>
+<author>Jean-Christian Denis and Contributors</author>
+<desc>Make a huge cleaning of dotclear</desc>
+<file>https://github.com/JcDenis/dcAdvancedCleaner/releases/download/v0.7.3.1/plugin-dcAdvancedCleaner.zip</file>
+<da:dcmin>2.19</da:dcmin>
+<da:details>https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner</da:details>
+<da:support>https://github.com/JcDenis/dcAdvancedCleaner</da:support>
+</module>
+</modules>
--- a/inc/class.dc.advanced.cleaner.php
+++ b/inc/class.dc.advanced.cleaner.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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_ADMIN_CONTEXT')){return;}

--- a/inc/class.dc.uninstaller.php
+++ b/inc/class.dc.uninstaller.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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_ADMIN_CONTEXT')){return;}

--- a/inc/lib.dc.advanced.cleaner.activityreport.php
+++ b/inc/lib.dc.advanced.cleaner.activityreport.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;}

--- a/inc/lib.dc.advanced.cleaner.behaviors.php
+++ b/inc/lib.dc.advanced.cleaner.behaviors.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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_ADMIN_CONTEXT')){return;}

--- a/index.php
+++ b/index.php
@ -1,14 +1,15 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
-# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
-# 
-# Copyright (c) 2009-2018 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 ------------------------------------
+/**
+ * @brief dcAdvancedCleaner, 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;}

@ -279,4 +280,3 @@ dcAdvancedCleaner - '.$core->plugins->moduleInfo('dcAdvancedCleaner','version').
 <img alt="dcMiniUrl" src="index.php?pf=dcAdvancedCleaner/icon.png" />
 </p>
 </body></html>';
-?>
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@ -188,5 +188,3 @@ $GLOBALS['__l10n']['Hide Dotclear default properties in actions tabs'] = 'Cacher
 $GLOBALS['__l10n']['Prevent from deleting Dotclear important properties.'] = 'Évite de supprimer des propriétés importantes de Dotclear.';

 $GLOBALS['__l10n']['Make a huge cleaning of dotclear'] = 'Faites un énorme nettoyage de dotclear';
-
-?>