Compare commits
No commits in common. "6a11d1aff6b0bab929d5fd6a3f802f4d2236aa3d" and "b360dc199f1b0c58fa158e354a98819c44d07235" have entirely different histories.
6a11d1aff6
...
b360dc199f
|
@ -1,10 +1,3 @@
|
|||
pacKman 2023.11.04
|
||||
===========================================================
|
||||
* Require Dotclear 2.28
|
||||
* Require PHP 8.1+
|
||||
* Fix typo
|
||||
* Code review
|
||||
|
||||
pacKman 2023.10.19
|
||||
===========================================================
|
||||
* Require Dotclear 2.28
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# README
|
||||
|
||||
[![Release](https://img.shields.io/badge/release-2023.11.04-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/pacKman/releases)
|
||||
![Date](https://img.shields.io/badge/date-2023.11.04-c44d58.svg)
|
||||
[![Release](https://img.shields.io/badge/release-2023.10.19-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/pacKman/releases)
|
||||
![Date](https://img.shields.io/badge/date-2023.10.19-c44d58.svg)
|
||||
[![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
|
||||
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/pacKman)
|
||||
[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/pacKman/src/branch/master/LICENSE)
|
||||
|
|
13
_define.php
13
_define.php
|
@ -17,13 +17,12 @@ $this->registerModule(
|
|||
'Packages repository',
|
||||
'Manage your Dotclear packages',
|
||||
'Jean-Christian Denis',
|
||||
'2023.11.04',
|
||||
'2023.10.19',
|
||||
[
|
||||
'requires' => [['core', '2.28']],
|
||||
'permissions' => 'My',
|
||||
'type' => 'plugin',
|
||||
'support' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
|
||||
'details' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
|
||||
'repository' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
|
||||
'requires' => [['core', '2.28']],
|
||||
'type' => 'plugin',
|
||||
'support' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
|
||||
'details' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
|
||||
'repository' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',
|
||||
]
|
||||
);
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
<modules xmlns:da="http://dotaddict.org/da/">
|
||||
<module id="pacKman">
|
||||
<name>Packages repository</name>
|
||||
<version>2023.11.04</version>
|
||||
<version>2023.10.19</version>
|
||||
<author>Jean-Christian Denis</author>
|
||||
<desc>Manage your Dotclear packages</desc>
|
||||
<file>https://git.dotclear.watch/JcDenis/pacKman/releases/download/v2023.11.04/plugin-pacKman.zip</file>
|
||||
<file>https://git.dotclear.watch/JcDenis/pacKman/releases/download/v2023.10.19/plugin-pacKman.zip</file>
|
||||
<da:dcmin>2.28</da:dcmin>
|
||||
<da:details>https://git.dotclear.watch/JcDenis/pacKman/src/branch/master/README.md</da:details>
|
||||
<da:support>https://git.dotclear.watch/JcDenis/pacKman/issues</da:support>
|
||||
|
|
|
@ -9,8 +9,8 @@ use Dotclear\Core\Process;
|
|||
use Dotclear\Core\Backend\Favorites;
|
||||
|
||||
/**
|
||||
* @brief pacKman backend class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman backend class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
|
|
@ -21,8 +21,8 @@ use Dotclear\Helper\Html\Form\{
|
|||
use Exception;
|
||||
|
||||
/**
|
||||
* @brief pacKman configuration class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman configuration class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
@ -111,7 +111,7 @@ class Config extends Process
|
|||
// pack_repository
|
||||
(new Para())->items([
|
||||
(new Label($check_repo . __('Path to repository:')))->for('pack_repository'),
|
||||
(new Input('pack_repository'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_repository),
|
||||
(new Input('pack_repository'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_repository),
|
||||
]),
|
||||
(new Note())->class('form-note')->text(
|
||||
sprintf(
|
||||
|
@ -131,13 +131,13 @@ class Config extends Process
|
|||
// pack_filename
|
||||
(new Para())->items([
|
||||
(new Label($check_first . __('Name of exported package:')))->for('pack_filename'),
|
||||
(new Input('pack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_filename),
|
||||
(new Input('pack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_filename),
|
||||
]),
|
||||
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%'))->class('form-note'),
|
||||
// secondpack_filename
|
||||
(new Para())->items([
|
||||
(new Label($check_second . __('Name of second exported package:')))->for('secondpack_filename'),
|
||||
(new Input('secondpack_filename'))->class('maximal')->size(65)->maxlength(255)->value($s->secondpack_filename),
|
||||
(new Input('secondpack_filename'))->class('maximal')->size(65)->maxlenght(255)->value($s->secondpack_filename),
|
||||
]),
|
||||
(new Note())->text(sprintf(__('Preconization: %s'), '%type%-%id%-%version%'))->class('form-note'),
|
||||
// pack_overwrite
|
||||
|
@ -150,7 +150,7 @@ class Config extends Process
|
|||
// pack_excludefiles
|
||||
(new Para())->items([
|
||||
(new Label(__('Extra files to exclude from package:')))->for('pack_excludefiles'),
|
||||
(new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlength(255)->value($s->pack_excludefiles),
|
||||
(new Input('pack_excludefiles'))->class('maximal')->size(65)->maxlenght(255)->value($s->pack_excludefiles),
|
||||
]),
|
||||
(new Note())->text(sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz'))->class('form-note'),
|
||||
// pack_nocomment
|
||||
|
|
|
@ -12,8 +12,8 @@ use Dotclear\Module\ModuleDefine;
|
|||
use Exception;
|
||||
|
||||
/**
|
||||
* @brief pacKman main class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman main class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
|
|
@ -9,8 +9,8 @@ use Dotclear\Core\Process;
|
|||
use Exception;
|
||||
|
||||
/**
|
||||
* @brief pacKman install class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman install class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
|
|
@ -19,8 +19,8 @@ use Dotclear\Helper\Network\Http;
|
|||
use Exception;
|
||||
|
||||
/**
|
||||
* @brief pacKman manage page class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman manage page class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
|
11
src/My.php
11
src/My.php
|
@ -8,8 +8,8 @@ use Dotclear\App;
|
|||
use Dotclear\Module\MyPlugin;
|
||||
|
||||
/**
|
||||
* @brief pacKman My plugin helper.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman My plugin helper.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
@ -36,10 +36,7 @@ class My extends MyPlugin
|
|||
|
||||
public static function checkCustomContext(int $context): ?bool
|
||||
{
|
||||
return match ($context) {
|
||||
// Limit to super admin
|
||||
self::MODULE => App::auth()->isSuperAdmin(),
|
||||
default => null,
|
||||
};
|
||||
// Only backend and super admin
|
||||
return $context === self::INSTALL ? null : App::task()->checkContext('BACKEND') && App::auth()->isSuperAdmin();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,75 +5,39 @@ declare(strict_types=1);
|
|||
namespace Dotclear\Plugin\pacKman;
|
||||
|
||||
/**
|
||||
* @brief pacKman settings class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman settings class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
class Settings
|
||||
{
|
||||
/**
|
||||
* Remove comments from files.
|
||||
*
|
||||
* @var bool $pack_nocomment
|
||||
*/
|
||||
// Remove comments from files
|
||||
public readonly bool $pack_nocomment;
|
||||
|
||||
/**
|
||||
* Remove comments from files.
|
||||
*
|
||||
* @var bool $pack_fixnewline
|
||||
*/
|
||||
// Remove comments from files
|
||||
public readonly bool $pack_fixnewline;
|
||||
|
||||
/**
|
||||
* Overwrite existing package.
|
||||
*
|
||||
* @var bool $pack_overwrite
|
||||
*/
|
||||
// Overwrite existing package
|
||||
public readonly bool $pack_overwrite;
|
||||
|
||||
/**
|
||||
* Name of package.
|
||||
*
|
||||
* @var string $pack_filename
|
||||
*/
|
||||
// Name of package
|
||||
public readonly string $pack_filename;
|
||||
|
||||
/**
|
||||
* Name of second package.
|
||||
*
|
||||
* @var string $secondpack_filename
|
||||
*/
|
||||
// Name of second package
|
||||
public readonly string $secondpack_filename;
|
||||
|
||||
/**
|
||||
* Path to package repository.
|
||||
*
|
||||
* @var string $pack_repository
|
||||
*/
|
||||
// Path to package repository
|
||||
public readonly string $pack_repository;
|
||||
|
||||
/**
|
||||
* Seperate themes and plugins repository.
|
||||
*
|
||||
* @var bool $pack_typedrepo
|
||||
*/
|
||||
// Seperate themes and plugins repository
|
||||
public readonly bool $pack_typedrepo;
|
||||
|
||||
/**
|
||||
* Extra files to exclude from package.
|
||||
*
|
||||
* @var string $pack_excludefiles
|
||||
*/
|
||||
// Extra files to exclude from package
|
||||
public readonly string $pack_excludefiles;
|
||||
|
||||
/**
|
||||
* Hide distributed modules from lists.
|
||||
*
|
||||
* @var bool $hide_distrib
|
||||
*/
|
||||
// Hide distributed modules from lists
|
||||
public readonly bool $hide_distrib;
|
||||
|
||||
/**
|
||||
|
|
|
@ -8,8 +8,8 @@ use Dotclear\Core\Process;
|
|||
use Dotclear\Plugin\Uninstaller\Uninstaller;
|
||||
|
||||
/**
|
||||
* @brief pacKman Uninstaller class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman Uninstaller class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
|
|
@ -25,8 +25,8 @@ use Dotclear\Module\ModuleDefine;
|
|||
use Exception;
|
||||
|
||||
/**
|
||||
* @brief pacKman utils class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman utils class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* @author Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
@ -98,7 +98,7 @@ class Utils
|
|||
/**
|
||||
* Get modules list form.
|
||||
*
|
||||
* @param array<int|string, mixed> $modules The modules
|
||||
* @param array<int,ModuleDefine> $modules The modules
|
||||
* @param string $type The modules type
|
||||
* @param string $title The list title
|
||||
*
|
||||
|
@ -116,9 +116,6 @@ class Utils
|
|||
$tbody = [];
|
||||
self::sort($modules);
|
||||
foreach ($modules as $module) {
|
||||
if (!is_a($module, ModuleDefine::class)) {
|
||||
continue;
|
||||
}
|
||||
$tbody[] = (new Para(null, 'tr'))
|
||||
->class('line')
|
||||
->items([
|
||||
|
|
|
@ -5,8 +5,8 @@ declare(strict_types=1);
|
|||
namespace Dotclear\Plugin\pacKman;
|
||||
|
||||
/**
|
||||
* @brief pacKman zip class.
|
||||
* @ingroup pacKman
|
||||
* @brief pacKman zip class.
|
||||
* @ingroup pacKman
|
||||
*
|
||||
* This class extends dotclear zip class
|
||||
* to tweak writeFile method.
|
||||
|
|
Loading…
Reference in New Issue