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

release 1.2

Browse Source
This commit is contained in:
Jean-Christian Paul Denis 2023-07-28 23:14:07 +02:00
parent b734cf87b9
commit b13e0e78e1
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
9 changed files with 74 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@ dev
- [ ] orphan media cleaner - [ ] orphan media cleaner
- [ ] move to plugin maintenance - [ ] move to plugin maintenance
1.2 - 2023.07.28
- require dotclear 2.27
- require php 8.1+
- update to dotclear 2.27-dev
1.1 - 2023.05.13 1.1 - 2023.05.13
- require dotclear 2.26 - require dotclear 2.26
- require php 8.1+ - require php 8.1+

4
README.md
View File

@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/releases) [![Release](https://img.shields.io/github/v/release/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/releases)
[![Date](https://img.shields.io/github/release-date/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/releases) [![Date](https://img.shields.io/github/release-date/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/releases)
[![Issues](https://img.shields.io/github/issues/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/issues) [![Issues](https://img.shields.io/github/issues/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/issues)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.26-blue.svg)](https://fr.dotclear.org/download) [![Dotclear](https://img.shields.io/badge/dotclear-v2.27-blue.svg)](https://fr.dotclear.org/download)
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner) [![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner)
[![License](https://img.shields.io/github/license/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/blob/master/LICENSE) [![License](https://img.shields.io/github/license/JcDenis/dcAdvancedCleaner)](https://github.com/JcDenis/dcAdvancedCleaner/blob/master/LICENSE)
@ -20,7 +20,7 @@ settings, tables, cache, etc...
_dcAdvancedCleaner_ requires: _dcAdvancedCleaner_ requires:
* Permissions superadmin * Permissions superadmin
* Dotclear 2.26 * Dotclear 2.27
* PHP >= 8.1 * PHP >= 8.1
* Plugin Uninstaller * Plugin Uninstaller

4
_define.php
View File

@ -18,11 +18,11 @@ $this->registerModule(
'Advanced cleaner', 'Advanced cleaner',
'Make a huge cleaning of dotclear', 'Make a huge cleaning of dotclear',
'Jean-Christian Denis and Contributors', 'Jean-Christian Denis and Contributors',
'1.1', '1.2',
[ [
'requires' => [ 'requires' => [
['php', '8.1'], ['php', '8.1'],
['core', '2.26'], ['core', '2.27'],
['Uninstaller', '0.8'], ['Uninstaller', '0.8'],
], ],
'permissions' => null, 'permissions' => null,

6
dcstore.xml
View File

@ -2,11 +2,11 @@
<modules xmlns:da="http://dotaddict.org/da/"> <modules xmlns:da="http://dotaddict.org/da/">
<module id="dcAdvancedCleaner"> <module id="dcAdvancedCleaner">
<name>Advanced cleaner</name> <name>Advanced cleaner</name>
<version>1.1</version> <version>1.2</version>
<author>Jean-Christian Denis and Contributors</author> <author>Jean-Christian Denis and Contributors</author>
<desc>Make a huge cleaning of dotclear</desc> <desc>Make a huge cleaning of dotclear</desc>
<file>https://github.com/JcDenis/dcAdvancedCleaner/releases/download/v1.1/plugin-dcAdvancedCleaner.zip</file> <file>https://github.com/JcDenis/dcAdvancedCleaner/releases/download/v1.2/plugin-dcAdvancedCleaner.zip</file>
<da:dcmin>2.26</da:dcmin> <da:dcmin>2.27</da:dcmin>
<da:details>https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner</da:details> <da:details>https://plugins.dotaddict.org/dc2/details/dcAdvancedCleaner</da:details>
<da:support>https://github.com/JcDenis/dcAdvancedCleaner</da:support> <da:support>https://github.com/JcDenis/dcAdvancedCleaner</da:support>
</module> </module>

39
src/Backend.php
View File

@ -14,51 +14,32 @@ declare(strict_types=1);
namespace Dotclear\Plugin\dcAdvancedCleaner; namespace Dotclear\Plugin\dcAdvancedCleaner;
use dcAdmin;
use dcCore; use dcCore;
use dcFavorites; use Dotclear\Core\Process;
use dcNsProcess; use Dotclear\Core\Backend\Favorites;
use dcMenu;
use dcPage;
class Backend extends dcNsProcess class Backend extends Process
{ {
public static function init(): bool public static function init(): bool
{ {
static::$init = defined('DC_CONTEXT_ADMIN'); return self::status(My::checkContext(My::BACKEND));
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) { if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
return false; return false;
} }
if (!is_null(dcCore::app()->auth) My::addBackendMenuItem();
&& !is_null(dcCore::app()->adminurl)
&& (dcCore::app()->menu[dcAdmin::MENU_PLUGINS] instanceof dcMenu)
) {
dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
My::name(),
dcCore::app()->adminurl->get('admin.plugin.' . My::id()),
dcPage::getPF(My::id() . '/icon.svg'),
preg_match(
'/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.' . My::id())) . '(&.*)?$/',
$_SERVER['REQUEST_URI']
),
dcCore::app()->auth->isSuperAdmin()
);
}
dcCore::app()->addBehaviors([ dcCore::app()->addBehaviors([
'adminDashboardFavoritesV2' => function (dcFavorites $favs): void { 'adminDashboardFavoritesV2' => function (Favorites $favs): void {
$favs->register(My::id(), [ $favs->register(My::id(), [
'title' => My::name(), 'title' => My::name(),
'url' => dcCore::app()->adminurl?->get('admin.plugin.' . My::id()), 'url' => My::manageURL(),
'small-icon' => dcPage::getPF(My::id() . '/icon.svg'), 'small-icon' => My::icons(),
'large-icon' => dcPage::getPF(My::id() . '/icon-big.svg'), 'large-icon' => My::icons(),
//'permissions' => dcCore::app()->auth?->isSuperAdmin(), //'permissions' => dcCore::app()->auth?->isSuperAdmin(),
]); ]);
}, },

89
src/Manage.php
View File

@ -15,8 +15,11 @@ declare(strict_types=1);
namespace Dotclear\Plugin\dcAdvancedCleaner; namespace Dotclear\Plugin\dcAdvancedCleaner;
use dcCore; use dcCore;
use dcNsProcess; use Dotclear\Core\Process;
use dcPage; use Dotclear\Core\Backend\{
Notices,
Page
};
use Dotclear\Helper\Html\Form\{ use Dotclear\Helper\Html\Form\{
Checkbox, Checkbox,
Div, Div,
@ -32,19 +35,16 @@ use Dotclear\Helper\Html\Form\{
use Dotclear\Helper\Html\Html; use Dotclear\Helper\Html\Html;
use Exception; use Exception;
class Manage extends dcNsProcess class Manage extends Process
{ {
public static function init(): bool public static function init(): bool
{ {
static::$init = defined('DC_CONTEXT_ADMIN') return self::status(My::checkContext(My::MANAGE));
&& dcCore::app()->auth?->isSuperAdmin();
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) { if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
return false; return false;
} }
@ -55,10 +55,10 @@ class Manage extends dcNsProcess
} }
if (!empty($_POST['option-action'])) { if (!empty($_POST['option-action'])) {
dcCore::app()->blog?->settings->get(My::id())->dropEvery( My::settings()->dropEvery(
'dcproperty_hide' 'dcproperty_hide'
); );
dcCore::app()->blog?->settings->get(My::id())->put( My::settings()->put(
'dcproperty_hide', 'dcproperty_hide',
!empty($_POST['dcproperty_hide']), !empty($_POST['dcproperty_hide']),
'boolean', 'boolean',
@ -66,11 +66,8 @@ class Manage extends dcNsProcess
true, true,
true true
); );
dcPage::addSuccessNotice(__('Configuration successfully updated.')); Notices::addSuccessNotice(__('Configuration successfully updated.'));
dcCore::app()->adminurl?->redirect( My::redirect(['part' => $vars->cleaner->id]);
'admin.plugin.' . My::id(),
['part' => $vars->cleaner->id]
);
} }
if (!empty($vars->entries) && !empty($vars->action)) { if (!empty($vars->entries) && !empty($vars->action)) {
@ -89,11 +86,8 @@ class Manage extends dcNsProcess
} }
} }
dcPage::addSuccessNotice(__('Action successfuly excecuted')); Notices::addSuccessNotice(__('Action successfuly excecuted'));
dcCore::app()->adminurl?->redirect( My::redirect(['part' => $vars->cleaner->id]);
'admin.plugin.' . My::id(),
['part' => $vars->cleaner->id]
);
} catch (Exception $e) { } catch (Exception $e) {
dcCore::app()->error->add($e->getMessage()); dcCore::app()->error->add($e->getMessage());
} }
@ -104,17 +98,17 @@ class Manage extends dcNsProcess
public static function render(): void public static function render(): void
{ {
if (!static::$init) { if (!self::status()) {
return; return;
} }
$vars = ManageVars::init(); $vars = ManageVars::init();
dcPage::openModule( Page::openModule(
My::name(), My::name(),
dcPage::jsJson('dcAdvancedCleaner', ['confirm_delete' => __('Are you sure you perform these ations?')]) . Page::jsJson('dcAdvancedCleaner', ['confirm_delete' => __('Are you sure you perform these ations?')]) .
dcPage::cssModuleLoad(My::id() . '/css/backend.css') . My::cssLoad('backend') .
dcPage::jsModuleLoad(My::id() . '/js/backend.js') My::jsLoad('backend')
); );
# --BEHAVIOR-- dcAdvancedCleanerAdminHeader # --BEHAVIOR-- dcAdvancedCleanerAdminHeader
@ -128,34 +122,34 @@ class Manage extends dcNsProcess
// something went wrong ! // something went wrong !
if (null === $vars->cleaner) { if (null === $vars->cleaner) {
echo echo
dcPage::breadcrumb($breadcrumb) . Page::breadcrumb($breadcrumb) .
dcPage::notices(); Notices::getNotices();
echo (new Text('p', __('There is nothing to display')))->class('error')->render(); echo (new Text('p', __('There is nothing to display')))->class('error')->render();
dcPage::closeModule(); Page::closeModule();
return; return;
} }
$breadcrumb[My::name()] = dcCore::app()->adminurl?->get('admin.plugin.' . My::id()); $breadcrumb[My::name()] = My::manageUrl();
$breadcrumb[$vars->cleaner->name] = ''; $breadcrumb[$vars->cleaner->name] = '';
if (!empty($vars->related)) { if (!empty($vars->related)) {
$breadcrumb[$vars->cleaner->name] = dcCore::app()->adminurl?->get('admin.plugin.' . My::id(), ['part' => $vars->cleaner->id]); $breadcrumb[$vars->cleaner->name] = My::manageUrl(['part' => $vars->cleaner->id]);
$breadcrumb[$vars->related] = ''; $breadcrumb[$vars->related] = '';
} }
echo echo
dcPage::breadcrumb($breadcrumb) . Page::breadcrumb($breadcrumb) .
dcPage::notices(); Notices::getNotices();
if (empty($vars->related)) { if (empty($vars->related)) {
echo echo
(new Form('parts_menu'))->method('get')->action(dcCore::app()->adminurl?->get('admin.plugin.' . My::id()))->fields([ (new Form('parts_menu'))->method('get')->action(dcCore::app()->admin->getPageURL())->fields([
(new Para())->class('anchor-nav')->items([ (new Para())->class('anchor-nav')->items([
(new Label(__('Goto:'), Label::OUTSIDE_LABEL_BEFORE))->for('part')->class('classic'), (new Label(__('Goto:'), Label::OUTSIDE_LABEL_BEFORE))->for('part')->class('classic'),
(new Select(['part', 'select_part']))->default($vars->cleaner->id)->items($vars->combo), (new Select(['part', 'select_part']))->default($vars->cleaner->id)->items($vars->combo),
(new Submit('go'))->value(__('Ok')), (new Submit('go'))->value(__('Ok')),
(new Hidden(['p'], My::id())), ... My::hiddenFields(),
]), ]),
])->render() . ])->render() .
@ -178,7 +172,7 @@ class Manage extends dcNsProcess
} }
echo echo
'<form method="post" action="' . dcCore::app()->adminurl?->get('admin.plugin.' . My::id()) . '" id="form-funcs">' . '<form method="post" action="' . dcCore::app()->admin->getPageURL() . '" id="form-funcs">' .
'<div class="table-outer">' . '<div class="table-outer">' .
'<table><caption>' . sprintf(__('There are %s entries'), count($rs)) . '</caption><thead><tr>' . '<table><caption>' . sprintf(__('There are %s entries'), count($rs)) . '</caption><thead><tr>' .
'<th colspan="2">' . __('Name') . '</th><th colspan="2">' . __('Objects') . '</th>' . '<th colspan="2">' . __('Name') . '</th><th colspan="2">' . __('Objects') . '</th>' .
@ -188,7 +182,7 @@ class Manage extends dcNsProcess
foreach ($rs as $key => $value) { foreach ($rs as $key => $value) {
$distrib = in_array($value->ns, $vars->cleaner->distributed()); $distrib = in_array($value->ns, $vars->cleaner->distributed());
if ($distrib && dcCore::app()->blog?->settings->get(My::id())->get('dcproperty_hide')) { if ($distrib && My::settings()->get('dcproperty_hide')) {
continue; continue;
} }
echo echo
@ -206,7 +200,7 @@ class Manage extends dcNsProcess
__('Values from official distribution') . '" />' __('Values from official distribution') . '" />'
: '') . '</td>' . : '') . '</td>' .
'<td class="maximal">' . ($has_related ? ' <a href="' . '<td class="maximal">' . ($has_related ? ' <a href="' .
dcCore::app()->adminurl?->get('admin.plugin.' . My::id(), ['part' => $vars->cleaner->id, 'related' => $value->ns]) . My::manageUrl(['part' => $vars->cleaner->id, 'related' => $value->ns]) .
'">' . __('Details') . '<a>' : '') . '</td>' . '">' . __('Details') . '<a>' : '') . '</td>' .
'</tr>'; '</tr>';
} }
@ -217,9 +211,8 @@ class Manage extends dcNsProcess
(new Label(__('Action on selected rows:'), Label::OUTSIDE_LABEL_BEFORE))->for('select_action'), (new Label(__('Action on selected rows:'), Label::OUTSIDE_LABEL_BEFORE))->for('select_action'),
(new Select(['action', 'select_action']))->items($combo_actions), (new Select(['action', 'select_action']))->items($combo_actions),
(new Submit('do-action'))->class('delete')->value(__('I understand and I am want to delete this')), (new Submit('do-action'))->class('delete')->value(__('I understand and I am want to delete this')),
(new Hidden(['p'], My::id())),
(new Hidden(['part'], $vars->cleaner->id)), (new Hidden(['part'], $vars->cleaner->id)),
dcCore::app()->formNonce(false), ... My::hiddenFields(),
])->render() . ])->render() .
'<p class="warning">' . '<p class="warning">' .
__('Beware: All actions done here are irreversible and are directly applied') . __('Beware: All actions done here are irreversible and are directly applied') .
@ -228,18 +221,17 @@ class Manage extends dcNsProcess
} }
echo echo
(new Form('option'))->method('post')->action(dcCore::app()->adminurl?->get('admin.plugin.' . My::id()))->fields([ (new Form('option'))->method('post')->action(dcCore::app()->admin->getPageURL())->fields([
(new Para())->items([ (new Para())->items([
(new Submit('option-action'))->value(dcCore::app()->blog?->settings->get(My::id())->get('dcproperty_hide') ? __('Show Dotclear default properties') : __('Hide Dotclear default properties')), (new Submit('option-action'))->value(My::settings()->get('dcproperty_hide') ? __('Show Dotclear default properties') : __('Hide Dotclear default properties')),
(new Hidden('dcproperty_hide', (string) (int) !dcCore::app()->blog->settings->get(My::id())->get('dcproperty_hide'))), (new Hidden('dcproperty_hide', (string) (int) My::settings()->get('dcproperty_hide'))),
(new Hidden(['p'], My::id())),
(new Hidden(['part'], $vars->cleaner->id)), (new Hidden(['part'], $vars->cleaner->id)),
dcCore::app()->formNonce(false), ... My::hiddenFields(),
]), ]),
])->render(); ])->render();
} else { } else {
echo echo
'<p><a class="back" href="' . dcCore::app()->adminurl?->get('admin.plugin.' . My::id(), ['part' => $vars->cleaner->id]) . '">' . __('Back') . '</a></p>' . '<p><a class="back" href="' . My::manageUrl(['part' => $vars->cleaner->id]) . '">' . __('Back') . '</a></p>' .
'<h3>' . $vars->cleaner->name . ' : ' . $vars->related . '</h3><p>' . $vars->cleaner->desc . '</p>'; '<h3>' . $vars->cleaner->name . ' : ' . $vars->related . '</h3><p>' . $vars->cleaner->desc . '</p>';
$distrib = in_array($vars->related, $vars->cleaner->distributed()); $distrib = in_array($vars->related, $vars->cleaner->distributed());
@ -248,7 +240,7 @@ class Manage extends dcNsProcess
echo (new Text('p', __('There is nothing to display')))->class('error')->render(); echo (new Text('p', __('There is nothing to display')))->class('error')->render();
} else { } else {
echo echo
'<form method="post" action="' . dcCore::app()->adminurl?->get('admin.plugin.' . My::id()) . '" id="form-funcs">' . '<form method="post" action="' . dcCore::app()->admin->getPageURL() . '" id="form-funcs">' .
'<div class="table-outer">' . '<div class="table-outer">' .
'<table><caption>' . sprintf(__('There are %s related entries for the group "%s"'), count($rs), $vars->related) . '</caption><thead><tr>' . '<table><caption>' . sprintf(__('There are %s related entries for the group "%s"'), count($rs), $vars->related) . '</caption><thead><tr>' .
'<th colspan="2">' . __('Name') . '</th><th>' . __('Objects') . '</th>' . '<th colspan="2">' . __('Name') . '</th><th>' . __('Objects') . '</th>' .
@ -271,11 +263,10 @@ class Manage extends dcNsProcess
'</tbody></table></div>' . '</tbody></table></div>' .
(new Para())->items([ (new Para())->items([
(new Submit('do-action'))->class('delete')->value(__('I understand and I am want to delete this')), (new Submit('do-action'))->class('delete')->value(__('I understand and I am want to delete this')),
(new Hidden(['p'], My::id())),
(new Hidden(['related'], $vars->related)), (new Hidden(['related'], $vars->related)),
(new Hidden(['part'], $vars->cleaner->id)), (new Hidden(['part'], $vars->cleaner->id)),
(new Hidden(['action'], 'delete_related')), (new Hidden(['action'], 'delete_related')),
dcCore::app()->formNonce(false), ... My::hiddenFields(),
])->render() . ])->render() .
'<p class="warning">' . '<p class="warning">' .
__('Beware: All actions done here are irreversible and are directly applied') . __('Beware: All actions done here are irreversible and are directly applied') .
@ -284,6 +275,6 @@ class Manage extends dcNsProcess
} }
} }
dcPage::closeModule(); Page::closeModule();
} }
} }

31
src/My.php
View File

@ -15,35 +15,12 @@ declare(strict_types=1);
namespace Dotclear\Plugin\dcAdvancedCleaner; namespace Dotclear\Plugin\dcAdvancedCleaner;
use dcCore; use dcCore;
use Dotclear\Module\MyPlugin;
/** class My extends MyPlugin
* This module definitions.
*/
class My
{ {
/** public static function checkCustomContext(int $context): ?bool
* This module id.
*/
public static function id(): string
{ {
return basename(dirname(__DIR__)); return $context === self::PREPEND ? dcCore::app()->auth->isSuperAdmin() : null;
}
/**
* This module name.
*/
public static function name(): string
{
$name = dcCore::app()->plugins->moduleInfo(self::id(), 'name');
return __(is_string($name) ? $name : self::id());
}
/**
* This module path.
*/
public static function path(): string
{
return dirname(__DIR__);
} }
} }

12
src/Prepend.php
View File

@ -14,8 +14,7 @@ declare(strict_types=1);
namespace Dotclear\Plugin\dcAdvancedCleaner; namespace Dotclear\Plugin\dcAdvancedCleaner;
use dcCore; use Dotclear\Core\Process;
use dcNsProcess;
use Dotclear\Plugin\activityReport\{ use Dotclear\Plugin\activityReport\{
Action, Action,
ActivityReport, ActivityReport,
@ -23,19 +22,16 @@ use Dotclear\Plugin\activityReport\{
}; };
use Dotclear\Plugin\Uninstaller\Uninstaller; use Dotclear\Plugin\Uninstaller\Uninstaller;
class Prepend extends dcNsProcess class Prepend extends Process
{ {
public static function init(): bool public static function init(): bool
{ {
static::$init = defined('DC_CONTEXT_ADMIN') return self::status(My::checkContext(My::PREPEND));
&& dcCore::app()->auth?->isSuperAdmin();
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!static::$init) { if (!self::status()) {
return false; return false;
} }

10
src/Uninstall.php
View File

@ -15,21 +15,19 @@ declare(strict_types=1);
namespace Dotclear\Plugin\dcAdvancedCleaner; namespace Dotclear\Plugin\dcAdvancedCleaner;
use dcCore; use dcCore;
use dcNsProcess; use Dotclear\Core\Process;
use Dotclear\Plugin\Uninstaller\Uninstaller; use Dotclear\Plugin\Uninstaller\Uninstaller;
class Uninstall extends dcNsProcess class Uninstall extends Process
{ {
public static function init(): bool public static function init(): bool
{ {
static::$init = defined('DC_CONTEXT_ADMIN'); return self::status(My::checkContext(My::UNINSTALL));
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) { if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
return false; return false;
} }