From 2c0f96ee05f7495abf336a7d42200a914467f3da Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 1 Apr 2020 13:43:15 +0200
Subject: [PATCH] =?UTF-8?q?Gallery=202.0=20:=20formulaire=20non=20s=C3=A9p?=
 =?UTF-8?q?ar=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/gallery/gallery.php               | 131 ++++++++++-------------
 module/gallery/view/add/add.css          |  21 ----
 module/gallery/view/add/add.js.php       |  53 ---------
 module/gallery/view/add/add.php          |  48 ---------
 module/gallery/view/config/config.js.php |  65 +++++++++--
 module/gallery/view/config/config.php    |  91 +++++++++++-----
 6 files changed, 174 insertions(+), 235 deletions(-)
 delete mode 100644 module/gallery/view/add/add.css
 delete mode 100644 module/gallery/view/add/add.js.php
 delete mode 100644 module/gallery/view/add/add.php

diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 20396f69..7f4e10ab 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -16,11 +16,11 @@ class gallery extends common {
 
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
-		'add' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'dirs' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,		
-		'index' => self::GROUP_VISITOR
+		'edit' => self::GROUP_MODERATOR,
+		'filter' => self::GROUP_MODERATOR,
+		'index' => self::GROUP_VISITOR		
 	];
 
 	public static $sort = [
@@ -41,30 +41,34 @@ class gallery extends common {
 
 	const GALLERY_VERSION = '2.0';	
 
+
+
+	public function filter() {
+	// Traitement du tri
+		$data = explode('&',($this->getInput('galleryConfigFilterResponse')));
+		$data = str_replace('galleryTable%5B%5D=','',$data);
+		for($i=0;$i<count($data);$i++) {
+			$this->setData(['module', $this->getUrl(0), $data[$i], [
+				'config' => [
+					'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
+					'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
+					'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
+					'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
+					'position' => $i + 1 
+				],
+				'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
+			]]);
+		}		
+		$this->saveData();
+		// Valeurs en sortie
+		// Recharge la page
+		header('Refresh: 0;url='. helper::baseUrl() . $this->getUrl() );	
+	}
+
 	/**
 	 * Configuration
 	 */
 	public function config() {
-		// Traiement du tri
-		// Soumission du formulaire
-		if(	$this->isPost() &&
-			$this->getInput('galleryConfigResponse') !== NULL )  {
-			$data = explode('&',($this->getInput('galleryConfigResponse')));
-			$data = str_replace('galleryTable%5B%5D=','',$data);
-			for($i=0;$i<count($data);$i++) {
-				$this->setData(['module', $this->getUrl(0), $data[$i], [
-					'config' => [
-						'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
-						'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
-						'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
-						'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
-						'position' => $i + 1 
-					],
-					'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend'])
-				]]);
-			}		
-			$this->saveData();	
-		}
 		// Tri des galeries 
 		$g = $this->getData(['module', $this->getUrl(0)]);
 		$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
@@ -87,11 +91,8 @@ class gallery extends common {
 					$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . ' (dossier introuvable)</span>';
 				}
 				// Met en forme le tableau
-				self::$galleries[] = [			
-					template::button($galleryId, [
-						'value' => template::ico('sort'),
-						'class' => 'disabled'
-					]),
+				self::$galleries[] = [	
+					template::ico('sort'),				
 					$gallery['config']['name'],
 					$gallery['config']['directory'],
 					template::button('galleryConfigEdit' . $galleryId , [
@@ -107,7 +108,31 @@ class gallery extends common {
 				// Tableau des id des galleries pour le drag and drop
 				self::$galleriesId[] = $galleryId;
 			}
-		}	
+		}
+		// Soumission du formulaire
+
+		if($this->isPost()) {
+			if ($this->getInput('galleryConfigFilterResponse')) {
+				self::filter();
+			} else {
+				$galleryId = helper::increment($this->getInput('galleryConfigName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
+				$this->setData(['module', $this->getUrl(0), $galleryId, [
+					'config' => [
+						'name' => $this->getInput('galleryConfigName'),
+						'directory' => $this->getInput('galleryConfigDirectory', helper::FILTER_STRING_SHORT, true),
+						'sort' => $this->getInput('galleryConfigSort'),
+						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
+					],
+					'legend' => []
+				]]);
+				// Valeurs en sortie
+				$this->addOutput([
+					'redirect' => helper::baseUrl() . $this->getUrl(),
+					'notification' => 'Modifications enregistrées',
+					'state' => true
+				]);
+			}
+		}
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Configuration du module',
@@ -118,42 +143,6 @@ class gallery extends common {
 		]);
 	}
 
-	/**
-	 * Ajouter une galerie
-	 * 
-	 */
-	public function add() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$success = false;
-			if (!empty($this->getInput('galleryAddName')) ) {				
-				$galleryId = helper::increment($this->getInput('galleryAddName', helper::FILTER_ID, true), (array) $this->getData(['module', $this->getUrl(0)]));
-				$this->setData(['module', $this->getUrl(0), $galleryId, [
-					'config' => [
-						'name' => $this->getInput('galleryAddName',helper::FILTER_STRING_SHORT, true),
-						'directory' => $this->getInput('galleryAddDirectory', helper::FILTER_STRING_SHORT, true),
-						'sort' => $this->getInput('galleryAddSort'),
-						'order' => count($this->getData(['module',$this->getUrl(0)])) + 1
-					],
-					'legend' => []
-				]]);
-				$success = true; 
-			}
-			// Valeurs en sortie
-			$this->addOutput([
-				'redirect' =>  $success ? helper::baseUrl() . $this->getUrl(0)  . '/config' : helper::baseUrl() . $this->getUrl(0)  . '/add',
-				'notification' => $success ? 'Modifications enregistrées' : 'Le nom de la galerie est obligatoire',
-				'state' => $success  
-			]);
-		} else {
-			// valeurs en sortie
-			$this->addOutput([
-				'title' => 'Ajouter une galerie',
-				'view' => 'add'
-			]);
-		}
-	}
-
 	/**
 	 * Suppression
 	 */
@@ -357,16 +346,8 @@ class gallery extends common {
 
 		}
 		// Liste des galeries
-		else {
-			// Tri des galeries 
-			$g = $this->getData(['module', $this->getUrl(0)]);
-			$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
-			asort($p,SORT_NUMERIC);		
-			$galleries = [];
-			foreach ($p as $positionId => $item) {
-				$galleries [$positionId] = $g[$positionId];			
-			}	
-			foreach((array) $galleries as $galleryId => $gallery) {
+		else {		
+			foreach((array) $this->getData(['module', $this->getUrl(0)]) as $galleryId => $gallery) {
 				if(is_dir($gallery['config']['directory'])) {
 					$iterator = new DirectoryIterator($gallery['config']['directory']);
 					foreach($iterator as $fileInfos) {
diff --git a/module/gallery/view/add/add.css b/module/gallery/view/add/add.css
deleted file mode 100644
index b8d5a798..00000000
--- a/module/gallery/view/add/add.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2020, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.com/
- */
-
-
-@import url("core/layout/admin.css");
-
-.galleryConfigError {
-	color: #F3674A;
-	font-weight: bold;
-}
\ No newline at end of file
diff --git a/module/gallery/view/add/add.js.php b/module/gallery/view/add/add.js.php
deleted file mode 100644
index 1f0d8235..00000000
--- a/module/gallery/view/add/add.js.php
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2020, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.com/
- */
-
-/**
- * Liste des dossiers
- */
-var oldResult = [];
-var directoryDOM = $("#galleryAddDirectory");
-var directoryOldDOM = $("#galleryAddDirectoryOld");
-function dirs() {
-	$.ajax({
-		type: "POST",
-		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
-		success: function(result) {
-			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
-				directoryDOM.empty();
-				for(var i = 0; i < result.length; i++) {
-					directoryDOM.append(function(i) {
-						var option = $("<option>").val(result[i]).text(result[i]);
-						if(directoryOldDOM.val() === result[i]) {
-							option.prop("selected", true);
-						}
-						return option;
-					}(i))
-				}
-				oldResult = result;
-			}
-		}
-	});
-}
-dirs();
-// Actualise la liste des dossiers toutes les trois secondes
-setInterval(function() {
-	dirs();
-}, 3000);
-
-/**
- * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
- */
-directoryDOM.on("change", function() {
-	directoryOldDOM.val($(this).val());
-});
diff --git a/module/gallery/view/add/add.php b/module/gallery/view/add/add.php
deleted file mode 100644
index d641b777..00000000
--- a/module/gallery/view/add/add.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php echo template::formOpen('galleryAddForm'); ?>
-	<?php echo template::formOpen('galleryAddOrder'); ?>
-	<div class="row">
-		<div class="col2">
-			<?php echo template::button('galleryAddBack', [
-				'class' => 'buttonGrey',
-				'href' => helper::baseUrl() .  $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
-			]); ?>
-		</div>
-		<div class="col2 offset8">
-			<?php echo template::submit('galleryAddSubmit'); ?>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Nouvelle galerie</h4>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::text('galleryAddName', [
-							'label' => 'Nom de la galerie'
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::hidden('galleryAddDirectoryOld', [
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-						<?php echo template::select('galleryAddDirectory', [], [
-							'label' => 'Dossier cible',
-							'noDirty' => true // Désactivé à cause des modifications en ajax
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('galleryAddSort', $module::$sort, [
-							'label' => 'Tri des images',
-							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
-						]); ?>	
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-    <?php echo template::formClose(); ?>
-<div class="moduleVersion">Version n°
-	<?php echo $module::GALLERY_VERSION; ?>
-</div>
\ No newline at end of file
diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php
index af89322b..1957247c 100644
--- a/module/gallery/view/config/config.js.php
+++ b/module/gallery/view/config/config.js.php
@@ -12,6 +12,24 @@
  * @link http://zwiicms.com/
  */
 
+/**
+ * Tri dynamique de la galerie
+ */
+$( document ).ready(function() {
+	$("#galleryTable").tableDnD({		
+		onDrop: function(table, row) {
+			$("#galleryConfigFilterResponse").val($.tableDnD.serialize());
+		},
+		serializeRegexp:  "[^\_]*$"
+	});
+});
+
+// Activer le bouton de tri uniquement après un tri
+$("#galleryTable").mouseup(function(e) {
+	e.preventDefault();
+	$(":input[type='submit']").prop('disabled', false);
+});
+
 /**
  * Confirmation de suppression
  */
@@ -23,15 +41,44 @@ $(".galleryConfigDelete").on("click", function() {
 });
 
 
-/**
- * Tri dynamique de la galerie
- */
-$( document ).ready(function() {
 
-	$("#galleryTable").tableDnD({		
-		onDrop: function(table, row) {
-			$("#galleryConfigResponse").val($.tableDnD.serialize());
-		},
-		serializeRegexp:  "[^\_]*$"
+/**
+ * Liste des dossiers
+ */
+var oldResult = [];
+var directoryDOM = $("#galleryConfigDirectory");
+var directoryOldDOM = $("#galleryConfigDirectoryOld");
+function dirs() {
+	$.ajax({
+		type: "POST",
+		url: "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/dirs",
+		success: function(result) {
+			if($(result).not(oldResult).length !== 0 || $(oldResult).not(result).length !== 0) {
+				directoryDOM.empty();
+				for(var i = 0; i < result.length; i++) {
+					directoryDOM.append(function(i) {
+						var option = $("<option>").val(result[i]).text(result[i]);
+						if(directoryOldDOM.val() === result[i]) {
+							option.prop("selected", true);
+						}
+						return option;
+					}(i))
+				}
+				oldResult = result;
+			}
+		}
 	});
+}
+dirs();
+// Actualise la liste des dossiers toutes les trois secondes
+setInterval(function() {
+	dirs();
+}, 3000);
+
+/**
+ * Stock le dossier choisi pour le re-sélectionner en cas d'actualisation ajax de la liste des dossiers
+ */
+directoryDOM.on("change", function() {
+	directoryOldDOM.val($(this).val());
 });
+
diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 867918bd..0d3a7a4b 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -1,34 +1,67 @@
-<?php echo template::formOpen('galleryConfigOrder'); ?>
-<div class="row">
-	<div class="col2">
-		<?php echo template::button('galleryConfigBack', [
-			'class' => 'buttonGrey',
-			'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
-			'ico' => 'left',
-			'value' => 'Retour'
-		]); ?>
-	</div>
-	<div class="col2 offset6">
-		<?php echo template::button('galleryConfigAdd', [
-			'class' => 'button',
-			'href' => helper::baseUrl() . $this->getUrl(0) .'/add',
-			'ico' => 'plus',
-			'value' => 'Galerie'
-		]); ?>
-	</div>
-	<div class="col2">
-		<?php echo template::submit('galleryConfigSubmit', [
-				'ico' => '',
-				'value' => "Trier"
+<?php echo template::formOpen('galleryConfigForm'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('galleryConfigBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+				'ico' => 'left',
+				'value' => 'Retour'
 			]); ?>
+		</div>
 	</div>
-	<div class="col12">
-		<?php if($module::$galleries): ?>
-			<?php echo template::table([1, 4, 5, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
-			<?php echo template::hidden('galleryConfigResponse'); ?>
-		<?php else: ?>
-			<?php echo template::speech('Aucune galerie.'); ?>
-		<?php endif; ?>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Nouvelle galerie</h4>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::text('galleryConfigName', [
+							'label' => 'Nom'
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::hidden('galleryConfigDirectoryOld', [
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+						<?php echo template::select('galleryConfigDirectory', [], [
+							'label' => 'Dossier cible',
+							'noDirty' => true // Désactivé à cause des modifications en ajax
+						]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::select('galleryConfigSort', $module::$sort, [
+							'label' => 'Tri des images',
+							'help' => 'Les images sont triées par nom de fichier grâce à la méthode naturelle qui donne de meilleurs résultats lorsque les images sont numérotées.'
+						]); ?>	
+					</div>
+					<div class="col1 verticalAlignBottom">
+						<?php echo template::submit('galleryConfigSubmit', [
+							'ico' => '',
+							'value' => template::ico('plus')
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php echo template::formClose(); ?>	
+<?php echo template::formOpen('galleryConfigFilterForm'); ?>
+	<?php if($module::$galleries): ?>
+	<?php echo template::table([1,4, 6, 1, 1], $module::$galleries, ['','Nom', 'Dossier cible', '', ''], ['id' => 'galleryTable'],$module::$galleriesId); ?>
+	<?php echo template::hidden('galleryConfigFilterResponse'); ?>
+	<?php echo template::hidden('galleryConfigFilterSubmit',[
+				'value' => false
+			]); ?>
+	<?php else: ?>
+		<?php echo template::speech('Aucune galerie.'); ?>
+	<?php endif; ?>
+	<div class="row">
+		<div class="col2 offset10">
+			<?php echo template::submit('galleryConfigFilterSubmit', [
+				'value' => 'Trier',
+				'disabled' => true
+			]); ?>
+		</div>
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°