JcDenis
/
dcAdvancedCleaner
1
0
Fork 0
Code Issues 3 Pull Requests Releases 5 Activity

update to PSR12

master
Jean-Christian Paul Denis 2021-11-06 16:19:49 +01:00
parent 2a3323b79d
commit 7c0d3f45e5
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
15 changed files with 240 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,8 +1,11 @@
0.8.1 - dev
- [ ] orphan media cleaner
- fix permissions
- move actions to independent tools
- add var folder
- update admin page to a lighter interface
- update translation (and remove .lang.php file)
- update to PSR12
0.8 - 2021.09.07
- update DC official values (themes,settings,tables...)

1
_admin.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}

4
_config.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_MODULE')) {
return null;
}
@ -54,8 +53,7 @@ if (!empty($_POST['save'])) {
'redir' => empty($_REQUEST['redir']) ? $list->getURL() . '#plugins' : $_REQUEST['redir']
]
);
}
catch(Exception $e) {
} catch (Exception $e) {
$core->error->add($e->getMessage());
}
}

1
_define.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}

2
_install.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}
@ -47,5 +46,6 @@ try {
return true;
} catch (Exception $e) {
$core->error->add($e->getMessage());
return false;
}

1
_prepend.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}

18
inc/class.advanced.cleaner.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
abstract class advancedCleaner
{
protected $core;
@ -32,7 +31,6 @@ abstract class advancedCleaner
$this->core = $core;
$this->init();
}
public static function create(arrayObject $o, dcCore $core)
@ -59,6 +57,7 @@ abstract class advancedCleaner
$this->properties[$k] = (string) $v;
}
}
return true;
}
@ -107,6 +106,7 @@ abstract class advancedCleaner
$i++;
}
}
return $rs;
}
@ -119,9 +119,11 @@ abstract class advancedCleaner
$roots = [$roots];
}
foreach ($roots as $root) {
if (file_exists($root . '/' . $folder))
if (file_exists($root . '/' . $folder)) {
return self::delTree($root . '/' . $folder, $delfolder);
}
}
return false;
}
@ -135,7 +137,7 @@ abstract class advancedCleaner
}
$files = files::scandir($path);
foreach($files AS $file) {
foreach ($files as $file) {
if (in_array($file, $exclude)) {
continue;
}
@ -146,6 +148,7 @@ abstract class advancedCleaner
$res[] = empty($dir) ? $file : $dir . '/' . $file;
}
}
return $res;
}
@ -163,7 +166,8 @@ abstract class advancedCleaner
while (($entryname = $d->read()) !== false) {
if ($entryname != '.' && $entryname != '..') {
if (is_dir($dir . '/' . $entryname)) {
if (!self::delTree($dir . '/' . $entryname)) {return false;
if (!self::delTree($dir . '/' . $entryname)) {
return false;
}
} else {
if (!@unlink($dir . '/' . $entryname)) {
@ -176,8 +180,8 @@ abstract class advancedCleaner
if ($delroot) {
return @rmdir($dir);
} else {
}
return true;
}
}
}

5
inc/class.dc.advanced.cleaner.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_ADMIN_CONTEXT')) {
return null;
}
@ -29,7 +28,7 @@ class dcAdvancedCleaner
$this->core->callBehavior('advancedCleanerAdd', $cleaners, $this->core);
foreach ($cleaners as $cleaner) {
if ($cleaner instanceOf advancedCleaner && !isset($this->cleaners[$cleaner->id])) {
if ($cleaner instanceof advancedCleaner && !isset($this->cleaners[$cleaner->id])) {
$this->cleaners[$cleaner->id] = $cleaner;
}
}
@ -49,6 +48,7 @@ class dcAdvancedCleaner
if ($silent) {
return false;
}
throw new exception(sprintf(__('unknow cleaner type %s'), $type));
}
@ -68,6 +68,7 @@ class dcAdvancedCleaner
if ($ret === false) {
$msg = $this->cleaners[$type]->error($action);
throw new Exception($msg ?? __('Unknow error'));
}

5
inc/class.dc.uninstaller.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_ADMIN_CONTEXT')) {
return null;
}
@ -124,7 +123,6 @@ class dcUninstaller
{
if (file_exists($root . '/_define.php')
&& file_exists($root . '/_uninstall.php')) {
$this->id = basename($root);
$this->mroot = $root;
@ -171,6 +169,7 @@ class dcUninstaller
if ($id && isset($this->modules[$id])) {
return $this->modules[$id];
}
return $this->modules;
}
@ -259,6 +258,7 @@ class dcUninstaller
}
$res[$k] = $this->actions[$group][$id][$k];
}
return $res;
}
@ -323,6 +323,7 @@ class dcUninstaller
if (!isset($this->callbacks[$group][$id])) {
return [];
}
return $this->callbacks[$group][$id];
}

12
inc/lib.advanced.cleaner.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class advancedCleanerSettings extends advancedCleaner
{
protected function init(): bool
@ -68,7 +67,7 @@ class advancedCleanerSettings extends advancedCleaner
'SELECT setting_ns ' .
'FROM ' . $this->core->prefix . 'setting ' .
'WHERE blog_id IS NULL ' .
"OR blog_id IS NOT NULL " .
'OR blog_id IS NOT NULL ' .
'GROUP BY setting_ns'
);
@ -79,8 +78,8 @@ class advancedCleanerSettings extends advancedCleaner
$rs[$i]['value'] = $this->core->con->select(
'SELECT count(*) FROM ' . $this->core->prefix . 'setting ' .
"WHERE setting_ns = '" . $res->setting_ns . "' " .
"AND (blog_id IS NULL OR blog_id IS NOT NULL) " .
"GROUP BY setting_ns "
'AND (blog_id IS NULL OR blog_id IS NOT NULL) ' .
'GROUP BY setting_ns '
)->f(0);
$i++;
}
@ -148,6 +147,7 @@ class advancedCleanerTables extends advancedCleaner
if ($action == 'delete') {
return __('Failed to delete table');
}
return '';
}
@ -317,6 +317,7 @@ class advancedCleanerPlugins extends advancedCleaner
if ($action == 'delete') {
return __('Failed to delete plugin folder');
}
return '';
}
@ -378,6 +379,7 @@ class advancedCleanerThemes extends advancedCleaner
if ($action == 'delete') {
return __('Failed to delete themes folder');
}
return '';
}
@ -437,6 +439,7 @@ class advancedCleanerCaches extends advancedCleaner
if ($action == 'delete') {
return __('Failed to delete cache folder');
}
return '';
}
@ -489,6 +492,7 @@ class advancedCleanerVars extends advancedCleaner
if ($action == 'delete') {
return __('Failed to delete var folder');
}
return '';
}

1
inc/lib.dc.advanced.cleaner.activityreport.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}

5
inc/lib.dc.advanced.cleaner.behaviors.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_ADMIN_CONTEXT')) {
return null;
}
@ -92,6 +91,7 @@ class behaviorsDcAdvancedCleaner
if (!count($modules)) {
echo '<p>' . __('There is no module with uninstall features') . '</p></div>';
return null;
}
@ -121,12 +121,12 @@ class behaviorsDcAdvancedCleaner
if (!isset($actions[$prop_id])) {
echo '--</td>';
continue;
}
$j = 0;
foreach ($actions[$prop_id] as $action_id => $action) {
if (!isset($props[$prop_id][$action['action']])) {
continue;
}
@ -155,7 +155,6 @@ class behaviorsDcAdvancedCleaner
$k = 0;
foreach ($callbacks as $callback_id => $callback) {
$ret = base64_encode(serialize($callback['func']));
echo '<label class="classic">' .

4
index.php
View File

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}
@ -44,8 +43,7 @@ if (!empty($_POST['entries']) && !empty($_POST['action'])) {
'admin.plugin.dcAdvancedCleaner',
['part' => $cleaner->id]
);
}
catch(Exception $e) {
} catch (Exception $e) {
$core->error->add($e->getMessage());
}
}

28
locales/en/resources.php
View File

@ -1,16 +1,18 @@
<?php
# -- BEGIN LICENSE BLOCK ----------------------------------
# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
#
# Copyright (c) 2009 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 ------------------------------------
if (!defined('DC_RC_PATH')){return;}
if (!isset($__resources['help']['dcAdvancedCleaner']))
{
/**
* @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 (!isset($__resources['help']['dcAdvancedCleaner'])) {
$__resources['help']['dcAdvancedCleaner'] = dirname(__FILE__) . '/help/dcAdvancedCleaner.html';
}

28
locales/fr/resources.php
View File

@ -1,16 +1,18 @@
<?php
# -- BEGIN LICENSE BLOCK ----------------------------------
# This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
#
# Copyright (c) 2009 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 ------------------------------------
if (!defined('DC_RC_PATH')){return;}
if (!isset($__resources['help']['dcAdvancedCleaner']))
{
/**
* @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 (!isset($__resources['help']['dcAdvancedCleaner'])) {
$__resources['help']['dcAdvancedCleaner'] = dirname(__FILE__) . '/help/dcAdvancedCleaner.html';
}