cosmetic code review and typo
This commit is contained in:
parent
f2a5aa0179
commit
616175eef5
@ -9,8 +9,8 @@ use Dotclear\Core\Process;
|
|||||||
use Dotclear\Core\Backend\Favorites;
|
use Dotclear\Core\Backend\Favorites;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman backend class.
|
* @brief pacKman backend class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
@ -21,8 +21,8 @@ use Dotclear\Helper\Html\Form\{
|
|||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman configuration class.
|
* @brief pacKman configuration class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
@ -111,7 +111,7 @@ class Config extends Process
|
|||||||
// pack_repository
|
// pack_repository
|
||||||
(new Para())->items([
|
(new Para())->items([
|
||||||
(new Label($check_repo . __('Path to repository:')))->for('pack_repository'),
|
(new Label($check_repo . __('Path to repository:')))->for('pack_repository'),
|
||||||
(new Input('pack_repository'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_repository),
|
(new Input('pack_repository'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_repository),
|
||||||
]),
|
]),
|
||||||
(new Note())->class('form-note')->text(
|
(new Note())->class('form-note')->text(
|
||||||
sprintf(
|
sprintf(
|
||||||
@ -131,13 +131,13 @@ class Config extends Process
|
|||||||
// pack_filename
|
// pack_filename
|
||||||
(new Para())->items([
|
(new Para())->items([
|
||||||
(new Label($check_first . __('Name of exported package:')))->for('pack_filename'),
|
(new Label($check_first . __('Name of exported package:')))->for('pack_filename'),
|
||||||
(new Input('pack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_filename),
|
(new Input('pack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_filename),
|
||||||
]),
|
]),
|
||||||
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%'))->class('form-note'),
|
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%'))->class('form-note'),
|
||||||
// secondpack_filename
|
// secondpack_filename
|
||||||
(new Para())->items([
|
(new Para())->items([
|
||||||
(new Label($check_second . __('Name of second exported package:')))->for('secondpack_filename'),
|
(new Label($check_second . __('Name of second exported package:')))->for('secondpack_filename'),
|
||||||
(new Input('secondpack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->secondpack_filename),
|
(new Input('secondpack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->secondpack_filename),
|
||||||
]),
|
]),
|
||||||
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%-%version%'))->class('form-note'),
|
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%-%version%'))->class('form-note'),
|
||||||
// pack_overwrite
|
// pack_overwrite
|
||||||
@ -150,7 +150,7 @@ class Config extends Process
|
|||||||
// pack_excludefiles
|
// pack_excludefiles
|
||||||
(new Para())->items([
|
(new Para())->items([
|
||||||
(new Label(__('Extra files to exclude from package:')))->for('pack_excludefiles'),
|
(new Label(__('Extra files to exclude from package:')))->for('pack_excludefiles'),
|
||||||
(new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_excludefiles),
|
(new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_excludefiles),
|
||||||
]),
|
]),
|
||||||
(new Note())->text(sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz'))->class('form-note'),
|
(new Note())->text(sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz'))->class('form-note'),
|
||||||
// pack_nocomment
|
// pack_nocomment
|
||||||
|
@ -12,8 +12,8 @@ use Dotclear\Module\ModuleDefine;
|
|||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman main class.
|
* @brief pacKman main class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
@ -9,8 +9,8 @@ use Dotclear\Core\Process;
|
|||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman install class.
|
* @brief pacKman install class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
@ -19,8 +19,8 @@ use Dotclear\Helper\Network\Http;
|
|||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman manage page class.
|
* @brief pacKman manage page class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
@ -8,8 +8,8 @@ use Dotclear\App;
|
|||||||
use Dotclear\Module\MyPlugin;
|
use Dotclear\Module\MyPlugin;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman My plugin helper.
|
* @brief pacKman My plugin helper.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
@ -36,8 +36,8 @@ class My extends MyPlugin
|
|||||||
|
|
||||||
public static function checkCustomContext(int $context): ?bool
|
public static function checkCustomContext(int $context): ?bool
|
||||||
{
|
{
|
||||||
// Limit to super admin
|
|
||||||
return match ($context) {
|
return match ($context) {
|
||||||
|
// Limit to super admin
|
||||||
self::MODULE => App::auth()->isSuperAdmin(),
|
self::MODULE => App::auth()->isSuperAdmin(),
|
||||||
default => null,
|
default => null,
|
||||||
};
|
};
|
||||||
|
@ -5,39 +5,75 @@ declare(strict_types=1);
|
|||||||
namespace Dotclear\Plugin\pacKman;
|
namespace Dotclear\Plugin\pacKman;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman settings class.
|
* @brief pacKman settings class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
*/
|
*/
|
||||||
class Settings
|
class Settings
|
||||||
{
|
{
|
||||||
// Remove comments from files
|
/**
|
||||||
|
* Remove comments from files.
|
||||||
|
*
|
||||||
|
* @var bool $pack_nocomment
|
||||||
|
*/
|
||||||
public readonly bool $pack_nocomment;
|
public readonly bool $pack_nocomment;
|
||||||
|
|
||||||
// Remove comments from files
|
/**
|
||||||
|
* Remove comments from files.
|
||||||
|
*
|
||||||
|
* @var bool $pack_fixnewline
|
||||||
|
*/
|
||||||
public readonly bool $pack_fixnewline;
|
public readonly bool $pack_fixnewline;
|
||||||
|
|
||||||
// Overwrite existing package
|
/**
|
||||||
|
* Overwrite existing package.
|
||||||
|
*
|
||||||
|
* @var bool $pack_overwrite
|
||||||
|
*/
|
||||||
public readonly bool $pack_overwrite;
|
public readonly bool $pack_overwrite;
|
||||||
|
|
||||||
// Name of package
|
/**
|
||||||
|
* Name of package.
|
||||||
|
*
|
||||||
|
* @var string $pack_filename
|
||||||
|
*/
|
||||||
public readonly string $pack_filename;
|
public readonly string $pack_filename;
|
||||||
|
|
||||||
// Name of second package
|
/**
|
||||||
|
* Name of second package.
|
||||||
|
*
|
||||||
|
* @var string $secondpack_filename
|
||||||
|
*/
|
||||||
public readonly string $secondpack_filename;
|
public readonly string $secondpack_filename;
|
||||||
|
|
||||||
// Path to package repository
|
/**
|
||||||
|
* Path to package repository.
|
||||||
|
*
|
||||||
|
* @var string $pack_repository
|
||||||
|
*/
|
||||||
public readonly string $pack_repository;
|
public readonly string $pack_repository;
|
||||||
|
|
||||||
// Seperate themes and plugins repository
|
/**
|
||||||
|
* Seperate themes and plugins repository.
|
||||||
|
*
|
||||||
|
* @var bool $pack_typedrepo
|
||||||
|
*/
|
||||||
public readonly bool $pack_typedrepo;
|
public readonly bool $pack_typedrepo;
|
||||||
|
|
||||||
// Extra files to exclude from package
|
/**
|
||||||
|
* Extra files to exclude from package.
|
||||||
|
*
|
||||||
|
* @var string $pack_excludefiles
|
||||||
|
*/
|
||||||
public readonly string $pack_excludefiles;
|
public readonly string $pack_excludefiles;
|
||||||
|
|
||||||
// Hide distributed modules from lists
|
/**
|
||||||
|
* Hide distributed modules from lists.
|
||||||
|
*
|
||||||
|
* @var bool $hide_distrib
|
||||||
|
*/
|
||||||
public readonly bool $hide_distrib;
|
public readonly bool $hide_distrib;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,8 +8,8 @@ use Dotclear\Core\Process;
|
|||||||
use Dotclear\Plugin\Uninstaller\Uninstaller;
|
use Dotclear\Plugin\Uninstaller\Uninstaller;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman Uninstaller class.
|
* @brief pacKman Uninstaller class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
@ -25,8 +25,8 @@ use Dotclear\Module\ModuleDefine;
|
|||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman utils class.
|
* @brief pacKman utils class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* @author Jean-Christian Denis
|
* @author Jean-Christian Denis
|
||||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
@ -98,7 +98,7 @@ class Utils
|
|||||||
/**
|
/**
|
||||||
* Get modules list form.
|
* Get modules list form.
|
||||||
*
|
*
|
||||||
* @param array<int,ModuleDefine> $modules The modules
|
* @param array<int|string, mixed> $modules The modules
|
||||||
* @param string $type The modules type
|
* @param string $type The modules type
|
||||||
* @param string $title The list title
|
* @param string $title The list title
|
||||||
*
|
*
|
||||||
@ -116,6 +116,9 @@ class Utils
|
|||||||
$tbody = [];
|
$tbody = [];
|
||||||
self::sort($modules);
|
self::sort($modules);
|
||||||
foreach ($modules as $module) {
|
foreach ($modules as $module) {
|
||||||
|
if (!is_a($module, ModuleDefine::class)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
$tbody[] = (new Para(null, 'tr'))
|
$tbody[] = (new Para(null, 'tr'))
|
||||||
->class('line')
|
->class('line')
|
||||||
->items([
|
->items([
|
||||||
|
@ -5,8 +5,8 @@ declare(strict_types=1);
|
|||||||
namespace Dotclear\Plugin\pacKman;
|
namespace Dotclear\Plugin\pacKman;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief pacKman zip class.
|
* @brief pacKman zip class.
|
||||||
* @ingroup pacKman
|
* @ingroup pacKman
|
||||||
*
|
*
|
||||||
* This class extends dotclear zip class
|
* This class extends dotclear zip class
|
||||||
* to tweak writeFile method.
|
* to tweak writeFile method.
|
||||||
|
Loading…
Reference in New Issue
Block a user