JcDenis/pacKman
1
0
Fork 0
Code Issues Pull Requests Projects Releases 6 Wiki Activity

fix init check

Browse Source
This commit is contained in:
Jean-Christian Paul Denis 2023-03-19 23:40:08 +01:00
parent 5e56f7ce10
commit 86da84f2ad
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
5 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Backend.php
View File

@ -24,16 +24,16 @@ class Backend extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init == defined('DC_CONTEXT_ADMIN')
self::$init = dcCore::app()->auth->isSuperAdmin() && version_compare(phpversion(), My::PHP_MIN, '>='); && dcCore::app()->auth?->isSuperAdmin()
} && My::phpCompliant();
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }

16
src/Config.php
View File

@ -33,20 +33,16 @@ class Config extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init == defined('DC_CONTEXT_ADMIN')
if (version_compare(phpversion(), My::PHP_MIN, '>=')) { && dcCore::app()->auth?->isSuperAdmin()
self::$init = true; && My::phpCompliant();
} else {
dcCore::app()->error->add(sprintf(__('%s required php >= %s'), My::id(), My::PHP_MIN));
}
}
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }
@ -79,7 +75,7 @@ class Config extends dcNsProcess
public static function render(): void public static function render(): void
{ {
if (!self::$init) { if (!static::$init) {
return; return;
} }

9
src/Install.php
View File

@ -22,17 +22,16 @@ class Install extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
self::$init = version_compare(phpversion(), My::PHP_MIN, '>=') && My::phpCompliant()
&& dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version')); && dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version'));
}
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }

12
src/Manage.php
View File

@ -28,16 +28,16 @@ class Manage extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
self::$init = dcCore::app()->auth->isSuperAdmin() && version_compare(phpversion(), My::PHP_MIN, '>='); && dcCore::app()->auth?->isSuperAdmin()
} && My::phpCompliant();
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }
@ -268,7 +268,7 @@ class Manage extends dcNsProcess
public static function render(): void public static function render(): void
{ {
if (!self::$init) { if (!static::$init) {
return; return;
} }

14
src/My.php
View File

@ -35,13 +35,27 @@ class My
'_disabled', '_disabled',
]; ];
/**
* This module id
*/
public static function id(): string public static function id(): string
{ {
return basename(dirname(__DIR__)); return basename(dirname(__DIR__));
} }
/**
* This module name
*/
public static function name(): string public static function name(): string
{ {
return __((string) dcCore::app()->plugins->moduleInfo(self::id(), 'name')); return __((string) dcCore::app()->plugins->moduleInfo(self::id(), 'name'));
} }
/**
* Check php version
*/
public static function phpCompliant(): bool
{
return version_compare(phpversion(), self::PHP_MIN, '>=');
}
} }