From 21580cf4fac6c01027e998ee5ed776b7bb263a7e Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Mon, 16 Nov 2020 18:39:32 +0100
Subject: [PATCH] =?UTF-8?q?Protection=20des=20donn=C3=A9es=20de=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/blog/blog.php               | 86 ++++++++++++++++++------------
 module/blog/view/config/config.php | 85 ++++++++++++++++++-----------
 2 files changed, 107 insertions(+), 64 deletions(-)

diff --git a/module/blog/blog.php b/module/blog/blog.php
index 7ea5da21..1573db45 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -230,41 +230,59 @@ class blog extends common {
 	 * Configuration
 	 */
 	public function config() {
-		// Ids des articles par ordre de publication
-		$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0)]), 'publishedOn', 'SORT_DESC'));
-		// Pagination
-		$pagination = helper::pagination($articleIds, $this->getUrl(),$this->getData(['config','itemsperPage']));
-		// Liste des pages
-		self::$pages = $pagination['pages'];
-		// Articles en fonction de la pagination
-		for($i = $pagination['first']; $i < $pagination['last']; $i++) {
-			// Met en forme le tableau
-			$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-				? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))
-				: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])));
-			$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-			? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))
-			: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])));
-			self::$articles[] = [
-				$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'title']),
-				$date .' à '. $heure,
-				self::$states[$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'state'])],
-				template::button('blogConfigEdit' . $articleIds[$i], [
-					'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
-					'value' => template::ico('pencil')
-				]),
-				template::button('blogConfigDelete' . $articleIds[$i], [
-					'class' => 'blogConfigDelete buttonRed',
-					'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
-					'value' => template::ico('cancel')
-				])
-			];
+		// Soumission du formulaire
+		if($this->isPost()) {
+			$this->setData(['module', $this->getUrl(0), 'config',[
+				'feeds' 	 => $this->getInput('blogConfigShowFeeds',helper::FILTER_BOOLEAN),
+				'feedsLabel' => $this->getInput('blogConfigFeedslabel',helper::FILTER_STRING_SHORT)
+				]]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
+				'notification' => 'Modifications enregistrées',
+				'state' => true
+			]);
+		} else {
+			// Extraire la clé config mot clé réservé
+			$articles = $this->getData(['module', $this->getUrl(0)]);
+			unset($articles['config']);
+			// Ids des articles par ordre de publication
+			$articleIds = array_keys(helper::arrayCollumn($articles, 'publishedOn', 'SORT_DESC'));
+			// Supprimer le bloc config
+			// Pagination
+			$pagination = helper::pagination($articleIds, $this->getUrl(),$this->getData(['config','itemsperPage']));
+			// Liste des pages
+			self::$pages = $pagination['pages'];
+			// Articles en fonction de la pagination
+			for($i = $pagination['first']; $i < $pagination['last']; $i++) {
+				// Met en forme le tableau
+				$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))
+					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])));
+				$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+				? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))
+				: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])));
+				self::$articles[] = [
+					$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'title']),
+					$date .' à '. $heure,
+					self::$states[$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'state'])],
+					template::button('blogConfigEdit' . $articleIds[$i], [
+						'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
+						'value' => template::ico('pencil')
+					]),
+					template::button('blogConfigDelete' . $articleIds[$i], [
+						'class' => 'blogConfigDelete buttonRed',
+						'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
+						'value' => template::ico('cancel')
+					])
+				];
+			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'title' => 'Configuration du module',
+				'view' => 'config'
+			]);
 		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Configuration du module',
-			'view' => 'config'
-		]);
 	}
 
 	/**
diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php
index a8d472dd..a044b793 100644
--- a/module/blog/view/config/config.php
+++ b/module/blog/view/config/config.php
@@ -1,32 +1,57 @@
-<div class="row">
-	<div class="col2">
-		<?php echo template::button('blogConfigBack', [
-			'class' => 'buttonGrey',
-			'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
-			'ico' => 'left',
-			'value' => 'Retour'
-		]); ?>
+<?php echo template::formOpen('blogConfig'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('blogConfigBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+				'ico' => 'left',
+				'value' => 'Retour'
+			]); ?>
+		</div>
+		<div class="col3 offset3">
+			<?php echo template::button('blogConfigComment', [
+				'href' => helper::baseUrl() . $this->getUrl(0) . '/comment',
+				'value' => 'Gérer les commentaires'
+			]); ?>
+		</div>
+		<div class="col2">
+			<?php echo template::button('blogConfigAdd', [
+				'href' => helper::baseUrl() . $this->getUrl(0) . '/add',
+				'ico' => 'plus',
+				'value' => 'Article'
+			]); ?>
+		</div>
+		<div class="col2">
+			<?php echo template::submit('blogConfigSubmit'); ?>
+		</div>
 	</div>
-	<div class="col3 offset5">
-		<?php echo template::button('blogConfigComment', [
-			'href' => helper::baseUrl() . $this->getUrl(0) . '/comment',
-			'value' => 'Gérer les commentaires'
-		]); ?>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Paramètres du module</h4>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::checkbox('blogConfigShowFeeds', true, 'Afficher les flux RSS', [
+							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
+						]); ?>
+					</div>
+					<div class="col6">
+						<?php echo template::text('blogConfigFeedslabel', [
+							'label' => 'Etiquette',
+							'value' => empty($this->getData(['module', $this->getUrl(0), 'config','feedsLabel'])) ? 'Syndication RSS' : $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
-	<div class="col2">
-		<?php echo template::button('blogConfigAdd', [
-			'href' => helper::baseUrl() . $this->getUrl(0) . '/add',
-			'ico' => 'plus',
-			'value' => 'Article'
-		]); ?>
-	</div>
-</div>
-<?php if($module::$articles): ?>
-	<?php echo template::table([4, 4, 2, 1, 1], $module::$articles, ['Titre', 'Date de publication', 'État', '', '']); ?>
-	<?php echo $module::$pages; ?>
-<?php else: ?>
-	<?php echo template::speech('Aucun article.'); ?>
-<?php endif; ?>
-<div class="moduleVersion">Version n°
-	<?php echo $module::BLOG_VERSION; ?>
-</div>
\ No newline at end of file
+	<?php if($module::$articles): ?>
+		<?php echo template::table([4, 4, 2, 1, 1], $module::$articles, ['Titre', 'Date de publication', 'État', '', '']); ?>
+		<?php echo $module::$pages; ?>
+	<?php else: ?>
+		<?php echo template::speech('Aucun article.'); ?>
+	<?php endif; ?>
+	<?php echo template::formClose(); ?>
+	<div class="moduleVersion">Version n°
+		<?php echo $module::BLOG_VERSION; ?>
+	</div>
\ No newline at end of file