master
Jean-Christian Paul Denis 2023-04-24 13:21:40 +02:00
parent 1c882964be
commit a31c9dedae
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
9 changed files with 26 additions and 16 deletions

View File

@ -87,7 +87,7 @@ abstract class AbstractCleaner
/** /**
* Get all values from the cleaner. * Get all values from the cleaner.
* *
* @return array<int,array<string,string>> The values. * @return array<int,ValueDescriptor> The values.
*/ */
abstract public function values(): array; abstract public function values(): array;
@ -96,7 +96,7 @@ abstract class AbstractCleaner
* *
* @param string $ns The namespace * @param string $ns The namespace
* *
* @return array<int,array<string,string>> The values. * @return array<int,ValueDescriptor> The values.
*/ */
public function related(string $ns): array public function related(string $ns): array
{ {

View File

@ -73,6 +73,11 @@ class Backend extends dcNsProcess
return true; return true;
} }
/**
* Perfom direct action on module deletion.
*
* @param dcModuleDefine $define The module
*/
protected static function moduleBeforeDelete(dcModuleDefine $define): void protected static function moduleBeforeDelete(dcModuleDefine $define): void
{ {
if (dcCore::app()->blog?->settings->get('system')->get('no_uninstall_direct')) { if (dcCore::app()->blog?->settings->get('system')->get('no_uninstall_direct')) {
@ -108,7 +113,12 @@ class Backend extends dcNsProcess
} }
} }
protected static function modulesToolsHeader() /**
* Get backend URL of uninstaller js.
*
* @return string The URL
*/
protected static function modulesToolsHeader(): string
{ {
return dcUtils::jsModuleLoad(My::id() . '/js/backend.js'); return dcUtils::jsModuleLoad(My::id() . '/js/backend.js');
} }

View File

@ -96,7 +96,7 @@ class Preferences extends AbstractCleaner
$sql->from(dcCore::app()->prefix . dcWorkspace::WS_TABLE_NAME) $sql->from(dcCore::app()->prefix . dcWorkspace::WS_TABLE_NAME)
->columns([ ->columns([
$sql->as($sql->count('*'), 'counter'), $sql->as($sql->count('*'), 'counter'),
'pref_ws' 'pref_ws',
]) ])
->where($sql->orGroup(['user_id IS NULL', 'user_id IS NOT NULL'])) ->where($sql->orGroup(['user_id IS NULL', 'user_id IS NOT NULL']))
->group('pref_ws'); ->group('pref_ws');
@ -124,7 +124,7 @@ class Preferences extends AbstractCleaner
$sql->from(dcCore::app()->prefix . dcWorkspace::WS_TABLE_NAME) $sql->from(dcCore::app()->prefix . dcWorkspace::WS_TABLE_NAME)
->columns([ ->columns([
$sql->as($sql->count('*'), 'counter'), $sql->as($sql->count('*'), 'counter'),
'pref_id' 'pref_id',
]) ])
->where($sql->orGroup(['user_id IS NULL', 'user_id IS NOT NULL'])) ->where($sql->orGroup(['user_id IS NULL', 'user_id IS NOT NULL']))
->and('pref_ws = ' . $sql->quote($ns)) ->and('pref_ws = ' . $sql->quote($ns))

View File

@ -100,7 +100,7 @@ class Settings extends AbstractCleaner
$sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME) $sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME)
->columns([ ->columns([
$sql->as($sql->count('*'), 'counter'), $sql->as($sql->count('*'), 'counter'),
'setting_ns' 'setting_ns',
]) ])
->where($sql->orGroup(['blog_id IS NULL', 'blog_id IS NOT NULL'])) ->where($sql->orGroup(['blog_id IS NULL', 'blog_id IS NOT NULL']))
->group('setting_ns'); ->group('setting_ns');
@ -128,7 +128,7 @@ class Settings extends AbstractCleaner
$sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME) $sql->from(dcCore::app()->prefix . dcNamespace::NS_TABLE_NAME)
->columns([ ->columns([
$sql->as($sql->count('*'), 'counter'), $sql->as($sql->count('*'), 'counter'),
'setting_id' 'setting_id',
]) ])
->where($sql->orGroup(['blog_id IS NULL', 'blog_id IS NOT NULL'])) ->where($sql->orGroup(['blog_id IS NULL', 'blog_id IS NOT NULL']))
->and('setting_ns = ' . $sql->quote($ns)) ->and('setting_ns = ' . $sql->quote($ns))