release 4.1.0

Gvx- · Aug 23, 2023 · cfcd45b · cfcd45b
1 parent 9bea273
commit cfcd45b
Show file tree

Hide file tree

Showing 15 changed files with 172 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Version 4.1.0 (2023-08-23)
+--------------------------
+
+* Déplacement dans le menu Blog
+* Modernisation code config.php
+* Modernisation code manage.php
+* Correctif régression définition des permissions d’édition de scripts
+* Correctifs divers
+
 Version 4.0.0 (2023-08-17)
 --------------------------
 

diff --git a/dcScript/CHANGELOG.md b/dcScript/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Version 4.1.0 (2023-08-23)
+--------------------------
+
+* Déplacement dans le menu Blog
+* Modernisation code config.php
+* Modernisation code manage.php
+* Correctif régression définition des permissions d’édition de scripts
+* Correctifs divers
+
 Version 4.0.0 (2023-08-17)
 --------------------------
 

diff --git a/dcScript/README.md b/dcScript/README.md
@@ -5,11 +5,15 @@ English
 -------
 ### First installation
 
-To use the plugin you must first configure it (Plugins management -> Configure plugin)
+To use the plugin you must first configure it (As superadmin: Plugins management -> Configure plugin)
+
+For edit scripts, enable permissions (Edit public scripts)
 
 Français
 --------
 
 ### Première installation
 
-Pour utiliser le plugin il faut commencer par le configurer (gestion des plugins -> configurer le plugin)
+Pour utiliser le plugin il faut commencer par le configurer (En superadmin: gestion des plugins -> configurer le plugin)
+
+Pour éditer les scripts, il faut donner les droits appropriés (Editer les scripts public)
diff --git a/dcScript/_define.php b/dcScript/_define.php
@@ -11,9 +11,9 @@
 
 $this->registerModule(
 	/* Name */			'dcScript',
-	/* Description*/	'Add script for DC',
+	/* Description*/	'Add public script for DC',
 	/* Author */		'Gvx',
-	/* Version */		'4.0.0',
+	/* Version */		'4.1.0',
 	[
 		/* standard plugin options dotclear */
 		'permissions' 				=>	dcCore::app()->auth->makePermissions([initDcScript::EDIT]),

diff --git a/dcScript/css/index.css → dcScript/css/Manage.css b/dcScript/css/index.css → dcScript/css/Manage.css
diff --git a/dcScript/dcstore.xml b/dcScript/dcstore.xml
@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="dcScript">
     <name>dcScript</name>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
     <author>Gvx</author>
-    <desc>Add script for DC</desc>
-    <file>https://github.com/Gvx-/dcScript/releases/download/v4.0.0/plugin-dcScript.zip</file>
+    <desc>Add public script for DC</desc>
+    <file>https://github.com/Gvx-/dcScript/releases/download/v4.1.0/plugin-dcScript.zip</file>
     <da:dcmin>2.27</da:dcmin>
     <da:details>https://github.com/Gvx-/dcScript</da:details>
     <da:support>http://forum.dotclear.org/viewtopic.php?pid=335785#p335785</da:support>

diff --git a/dcScript/js/index.js → dcScript/js/Manage.js b/dcScript/js/index.js → dcScript/js/Manage.js
diff --git a/dcScript/js/index_warning.js b/dcScript/js/index_warning.js
diff --git a/dcScript/locales/fr/main.lang.php b/dcScript/locales/fr/main.lang.php
@@ -11,6 +11,8 @@
 
 use Dotclear\Helper\L10n;
 
+L10n::$locales['Add public script for DC'] = 'Ajout de script public pour Dotclear';
+L10n::$locales['Edit public scripts'] = 'Editer les scripts public';
 L10n::$locales['Unable to save the configuration'] = 'Impossible de sauver la configuration';
 L10n::$locales['Enable %s on this blog'] = 'Activer %s pour ce blog';
 L10n::$locales['Enable the plugin on this blog.'] = 'Activer le plugin pour ce blog';
@@ -19,8 +21,8 @@
 L10n::$locales['Enable public header code.'] = 'Activer le code du header public';
 L10n::$locales['Enable footer code'] = 'Activer le code du footer';
 L10n::$locales['Enable public footer code.'] = 'Activer le code du footer public';
-L10n::$locales['Extension Backup Files'] = 'Extension des fichiers de sauvegarde';
-L10n::$locales['Default extension backup files.'] = 'Extension par defaut des fichiers de sauvegarde';
+L10n::$locales['Extension Backup Files'] = 'Extension des fichiers de sauvegardes';
+L10n::$locales['Default extension backup files.'] = 'Extension par defaut des fichiers de sauvegardes';
 L10n::$locales['Enable plugin'] = 'Activer le plugin';
 L10n::$locales['Header code'] = 'Code du header';
 L10n::$locales['Footer code'] = 'Code du footer';
@@ -32,5 +34,11 @@
 L10n::$locales['Plugin'] = 'Plugin';
 L10n::$locales['Enabled'] = 'Activé';
 L10n::$locales['Disabled'] = 'Désactivé';
+L10n::$locales['Save header script'] = 'Enregistrer le script d\'entete';
+L10n::$locales['Undo header changes'] = 'Annuler les modifications de l\'entete';
+L10n::$locales['Export header script'] = 'Exporter le script d\'entete';
+L10n::$locales['Save footer script'] = 'Enregistrer le script du pied de page';
+L10n::$locales['Undo footer changes'] = 'Annuler les modifications du pied de page';
+L10n::$locales['Export footer script'] = 'Exporter le script du pied de page';
 L10n::$locales['Save the configuration'] = 'Sauver la configuration';
 L10n::$locales['Undo changes'] = 'Annuler les changements';
diff --git a/dcScript/locales/fr/main.po b/dcScript/locales/fr/main.po
@@ -1,15 +1,21 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: dcScript 4.0.0-dev-r0024\n"
+"Project-Id-Version: dcScript 4.1.0-dev-r0010\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2023-08-14T14:15:53+00:00\n"
+"PO-Revision-Date: 2023-08-23T06:12:23+00:00\n"
 "Last-Translator: Gilles\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Add public script for DC"
+msgstr "Ajout de script public pour Dotclear"
+
+msgid "Edit public scripts"
+msgstr "Editer les scripts public"
+
 msgid "Unable to save the configuration"
 msgstr "Impossible de sauver la configuration"
 
@@ -35,10 +41,10 @@ msgid "Enable public footer code."
 msgstr "Activer le code du footer public"
 
 msgid "Extension Backup Files"
-msgstr "Extension des fichiers de sauvegarde"
+msgstr "Extension des fichiers de sauvegardes"
 
 msgid "Default extension backup files."
-msgstr "Extension par defaut des fichiers de sauvegarde"
+msgstr "Extension par defaut des fichiers de sauvegardes"
 
 msgid "Enable plugin"
 msgstr "Activer le plugin"
@@ -73,6 +79,24 @@ msgstr "Activé"
 msgid "Disabled"
 msgstr "Désactivé"
 
+msgid "Save header script"
+msgstr "Enregistrer le script d'entete"
+
+msgid "Undo header changes"
+msgstr "Annuler les modifications de l'entete"
+
+msgid "Export header script"
+msgstr "Exporter le script d'entete"
+
+msgid "Save footer script"
+msgstr "Enregistrer le script du pied de page"
+
+msgid "Undo footer changes"
+msgstr "Annuler les modifications du pied de page"
+
+msgid "Export footer script"
+msgstr "Exporter le script du pied de page"
+
 msgid "Save the configuration"
 msgstr "Sauver la configuration"
 

diff --git a/dcScript/src/Backend.php b/dcScript/src/Backend.php
@@ -13,19 +13,28 @@
 
 namespace Dotclear\Plugin\dcScript;
 
+use dcCore;
 use Dotclear\Core\Backend\Menus;
 use Dotclear\Core\Process;
+use initDcScript;
 
 class Backend extends Process {
+
     public static function init(): bool {
+		__('Add public script for DC');		// for L10n
+
         return self::status(My::checkContext(My::BACKEND));
     }
 
     public static function process(): bool {
-        if (self::status()) {
-            My::addBackendMenuItem(Menus::MENU_SYSTEM);
-        }
+        if (!self::status()) { return false; }
 
+		// Ajout des permissions
+		dcCore::app()->auth->setPermissionType(initDcScript::EDIT, __('Edit public scripts'));
+
+		// Ajout du menu
+		My::addBackendMenuItem(Menus::MENU_BLOG);
+
         return self::status();
     }
 }
diff --git a/dcScript/src/Config.php b/dcScript/src/Config.php
@@ -19,7 +19,16 @@
 use Dotclear\Helper\Html\Html;
 use Dotclear\Helper\L10n;
 use Exception;
-use form;
+use Dotclear\Helper\Html\Form\{
+    Checkbox,
+    Div,
+    Fieldset,
+	Input,
+    Label,
+    Legend,
+	Note,
+    Para
+};
 
 class Config extends Process {
 
@@ -40,7 +49,7 @@ public static function process(): bool {
 
             Notices::addSuccessNotice(__('Configuration successfully updated'));
 
-            dcCore::app()->admin->url->redirect('admin.plugins', ['module' => My::id(), 'conf' => 1, 'chk' => 1, 'redir' => dcCore::app()->admin->__get('list')->getRedir()]);
+			My::redirect(['conf' => 1, 'redir' => dcCore::app()->admin->__get('list')->getRedir()]);
 
         } catch(exception $e) {
             //dcCore::app()->error->add($e->getMessage());
@@ -53,49 +62,43 @@ public static function process(): bool {
     public static function render(): void {
         if (!self::status()) { return; }
 
-		echo My::jsLoad('config').My::cssLoad('config', 'all').Page::jsConfirmClose('module_config');
+		echo Page::jsConfirmClose('module_config');
 
-		echo
-			'<div class="fieldset clear">
-				<h3>'.__('Activation').'</h3>
-				<p>
-					'.form::checkbox('enabled','1', (string)My::settings()?->get('enabled')).
-					'<label class="classic" for="enabled">'.sprintf(__('Enable %s on this blog'), Html::escapeHTML((string)__(My::name()))).'</label>
-				</p>
-				<p class="form-note">'.__('Enable the plugin on this blog.').'</p>
-			</div>
-			<div id="options">
-				<div class="fieldset">
-					<h3>'.__('Active codes').'</h3>
-					<div class="two-cols clear">
-						<div class="col">
-							<p>
-								'.form::checkbox('header_code_enabled', '1', (string)My::settings()?->get('header_code_enabled'))
-								.'<label class="classic" for="header_code_enabled">'.__('Enable header code').'</label>
-							</p>
-							<p class="form-note">'.__('Enable public header code.').'</p>
-						</div>
-						<div class="col">
-							<p>
-								'.form::checkbox('footer_code_enabled', '1', (string)My::settings()?->get('footer_code_enabled'))
-								.'<label class="classic" for="footer_code_enabled">'.__('Enable footer code').'</label>
-							</p>
-							<p class="form-note">'.__('Enable public footer code.').'</p>
-						</div>
-					</div>
-					<div class="clear"></div>
-				</div>
-				<div class="fieldset clear">
-					<h3>'.__('Options').'</h3>
-					<p>
-						<label class="classic" for="backup">'.__('Extension Backup Files').' : </label>
-						'.form::field('backup', 25, 255, (string)My::settings()?->get('backup_ext'), 'classic').'
-					</p>
-					<p class="form-note">'.__('Default extension backup files.').'</p>
-				</div>
-			</div>';
-		# helpBlock
-		Page::helpBlock(My::id().'-config');
+        echo
+        (new Div())->items([
+            (new Fieldset())->class('fieldset')->legend(new Legend(__('Activation')))->fields([
+                (new Para())->items([
+                    (new Checkbox('enabled', (bool) My::settings()?->get('enabled')))->value('1'),
+                    (new Label(sprintf(__('Enable %s on this blog'), Html::escapeHTML((string)__(My::name()))), Label::OUTSIDE_LABEL_AFTER))->class('classic')->for('enabled')
+                ]),
+				(new Note())->text(__('Enable the plugin on this blog.'))->class('form-note')
+            ]),
+            (new Fieldset())->class('fieldset two-cols')->legend(new Legend(__('Active codes')))->fields([
+				(new Div())->class('col')->items([
+					(new Para())->items([
+						(new Checkbox('header_code_enabled', (bool) My::settings()?->get('header_code_enabled')))->value('1'),
+						(new Label(__('Enable header code'), Label::OUTSIDE_LABEL_AFTER))->class('classic')->for('header_code_enabled')
+					]),
+					(new Note())->text(__('Enable public header code.'))->class('form-note')
+				]),
+				(new Div())->class('col')->items([
+					(new Para())->items([
+						(new Checkbox('footer_code_enabled', (bool) My::settings()?->get('footer_code_enabled')))->value('1'),
+						(new Label(__('Enable footer code'), Label::OUTSIDE_LABEL_AFTER))->class('classic')->for('footer_code_enabled')
+					]),
+					(new Note())->text(__('Enable public footer code.'))->class('form-note')
+				])
+            ]),
+            (new Fieldset())->class('fieldset')->legend(new Legend(__('Options')))->fields([
+                (new Para())->items([
+                    (new Label(__('Extension Backup Files').' :', Label::OUTSIDE_LABEL_BEFORE))->class('classic')->for('backup'),
+					(new Input('backup'))->size(25)->maxlenght(255)->value(My::settings()?->get('backup_ext'))
+                ]),
+				(new Note())->text(__('Default extension backup files.'))->class('form-note')
+            ])
+        ])->render();
+
+		echo Page::helpBlock(My::id().'-config');
 
     }
 }