From 7d328124f47a5f3d12db6c3ef15f6a92463714f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Mon, 17 Jan 2022 19:32:06 +0100
Subject: [PATCH] Blog 6.0

---
 module/blog/blog.php               | 172 ++++++++++++++++-------------
 module/blog/changes.md             |   2 +
 module/blog/view/config/config.php |  34 +-----
 module/blog/view/layout/layout.css |  18 +++
 module/blog/view/layout/layout.php |  47 ++++++++
 5 files changed, 165 insertions(+), 108 deletions(-)
 create mode 100644 module/blog/changes.md
 create mode 100644 module/blog/view/layout/layout.css
 create mode 100644 module/blog/view/layout/layout.php

diff --git a/module/blog/blog.php b/module/blog/blog.php
index 333a93dc..08222009 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -15,7 +15,7 @@
 
 class blog extends common {
 
-	const VERSION = '5.1';
+	const VERSION = '6.0';
 	const REALNAME = 'Blog';
 	const DELETE = true;
 	const UPDATE = '0.0';
@@ -32,6 +32,7 @@ class blog extends common {
 		'commentDelete' => self::GROUP_MODERATOR,
 		'commentDeleteAll' => self::GROUP_MODERATOR,
 		'config' => self::GROUP_MODERATOR,
+		'layout' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'edit' => self::GROUP_MODERATOR,
 		'index' => self::GROUP_VISITOR,
@@ -100,6 +101,9 @@ class blog extends common {
 		self::EDIT_OWNER       => 'Propriétaire'
 	];
 
+	// Nombre d'articles dans la page de config:
+	public static $itemsperPage = 8;
+
 
 	public static $users = [];
 
@@ -398,103 +402,113 @@ 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), 'posts']), 'publishedOn', 'SORT_DESC'));
+		// Gestion des droits d'accès
+		$filterData=[];
+		foreach ($articleIds as $key => $value) {
+			if (
+				(  // Propriétaire
+					$this->getData(['module',  $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_OWNER
+					AND ( $this->getData(['module',  $this->getUrl(0), 'posts', $value,'userId']) === $this->getUser('id')
+					OR $this->getUser('group') === self::GROUP_ADMIN )
+				)
+
+				OR (
+					// Groupe
+					$this->getData(['module',  $this->getUrl(0), 'posts',  $value,'editConsent']) !== self::EDIT_OWNER
+					AND $this->getUser('group') >=  $this->getData(['module',$this->getUrl(0), 'posts', $value,'editConsent'])
+				)
+				OR (
+					// Tout le monde
+					$this->getData(['module',  $this->getUrl(0), 'posts',  $value,'editConsent']) === self::EDIT_ALL
+				)
+			) {
+				$filterData[] = $value;
+			}
+		}
+		$articleIds = $filterData;
+		// Pagination
+		$pagination = helper::pagination($articleIds, $this->getUrl(),self::$itemsperPage);
+		// Liste des pages
+		self::$pages = $pagination['pages'];
+		// Articles en fonction de la pagination
+		for($i = $pagination['first']; $i < $pagination['last']; $i++) {
+			// Nombre de commentaires à approuver et approuvés
+			$approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts',  $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
+			if ( is_array($approvals) ) {
+				$a = array_values($approvals);
+				$toApprove = count(array_keys($a,false));
+				$approved = count(array_keys($a,true));
+			} else {
+				$toApprove = 0;
+				$approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
+			}
+			// Met en forme le tableau
+			$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+				? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+				: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+			$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+			? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+			: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+			self::$articles[] = [
+				'<a href="' . helper::baseurl() . $this->getUrl(0) . '/' . $articleIds[$i] . '" target="_blank" >' .
+				$this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'title']) .
+				'</a>',
+				$date .' à '. $heure,
+				self::$states[$this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'state'])],
+				// Bouton pour afficher les commentaires de l'article
+				template::button('blogConfigComment' . $articleIds[$i], [
+					'class' => ($toApprove || $approved ) > 0 ?  '' : 'buttonGrey' ,
+					'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $articleIds[$i] : '',
+					'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved
+				]),
+				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'
+		]);
+	}
+
+	public function layout() {
 		// Mise à jour des données de module
 		$this->update();
 		// 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),
-				'itemsperPage' => $this->getInput('blogConfigItemsperPage', helper::FILTER_INT,true),
+				'feeds' 	 => $this->getInput('blogLayoutShowFeeds',helper::FILTER_BOOLEAN),
+				'feedsLabel' => $this->getInput('blogLayoutFeedslabel',helper::FILTER_STRING_SHORT),
+				'itemsperPage' => $this->getInput('blogLayoutItemsperPage', helper::FILTER_INT,true),
 				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
 				]]);
 			// Valeurs en sortie
 			$this->addOutput([
-				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
+				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/layout',
 				'notification' => 'Modifications enregistrées',
 				'state' => true
 			]);
 		} else {
-			// Ids des articles par ordre de publication
-			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
-			// Gestion des droits d'accès
-			$filterData=[];
-			foreach ($articleIds as $key => $value) {
-				if (
-					(  // Propriétaire
-						$this->getData(['module',  $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_OWNER
-						AND ( $this->getData(['module',  $this->getUrl(0), 'posts', $value,'userId']) === $this->getUser('id')
-						OR $this->getUser('group') === self::GROUP_ADMIN )
-					)
-
-					OR (
-						// Groupe
-						$this->getData(['module',  $this->getUrl(0), 'posts',  $value,'editConsent']) !== self::EDIT_OWNER
-						AND $this->getUser('group') >=  $this->getData(['module',$this->getUrl(0), 'posts', $value,'editConsent'])
-					)
-					OR (
-						// Tout le monde
-						$this->getData(['module',  $this->getUrl(0), 'posts',  $value,'editConsent']) === self::EDIT_ALL
-					)
-				) {
-					$filterData[] = $value;
-				}
-			}
-			$articleIds = $filterData;
-			// Pagination
-			$pagination = helper::pagination($articleIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']));
-			// Liste des pages
-			self::$pages = $pagination['pages'];
-			// Articles en fonction de la pagination
-			for($i = $pagination['first']; $i < $pagination['last']; $i++) {
-				// Nombre de commentaires à approuver et approuvés
-				$approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts',  $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
-				if ( is_array($approvals) ) {
-					$a = array_values($approvals);
-					$toApprove = count(array_keys($a,false));
-					$approved = count(array_keys($a,true));
-				} else {
-					$toApprove = 0;
-					$approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
-				}
-				// Met en forme le tableau
-				$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
-				$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-				? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-				: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
-				self::$articles[] = [
-					'<a href="' . helper::baseurl() . $this->getUrl(0) . '/' . $articleIds[$i] . '" target="_blank" >' .
-					$this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'title']) .
-					'</a>',
-					$date .' à '. $heure,
-					self::$states[$this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'state'])],
-					// Bouton pour afficher les commentaires de l'article
-					template::button('blogConfigComment' . $articleIds[$i], [
-						'class' => ($toApprove || $approved ) > 0 ?  '' : 'buttonGrey' ,
-						'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $articleIds[$i] : '',
-						'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved
-					]),
-					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'
+				'title' => 'Mise en page',
+				'view' => 'layout'
 			]);
 		}
 	}
 
+
 	/**
 	 * Suppression
 	 */
diff --git a/module/blog/changes.md b/module/blog/changes.md
new file mode 100644
index 00000000..6a7d7be0
--- /dev/null
+++ b/module/blog/changes.md
@@ -0,0 +1,2 @@
+# version 6
+    - mise à la norme avec le module news : le formulaire est sorti de l'écran principal
\ No newline at end of file
diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php
index 736151c9..0430fdb2 100644
--- a/module/blog/view/config/config.php
+++ b/module/blog/view/config/config.php
@@ -16,35 +16,11 @@
 			]); ?>
 		</div>
 		<div class="col2">
-			<?php echo template::submit('blogConfigSubmit'); ?>
-		</div>
-	</div>
-	<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, 'Lien du flux RSS', [
-							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
-						]); ?>
-					</div>
-					<div class="col6">
-						<?php echo template::text('blogConfigFeedslabel', [
-							'label' => 'Texte de l\'étiquette',
-							'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
-						]); ?>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col6 offset6">
-						<?php echo template::select('blogConfigItemsperPage', $module::$ItemsList, [
-							'label' => 'Articles par page',
-							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
-						]); ?>
-					</div>
-				</div>
-			</div>
+			<?php echo template::button('blogConfigLayout', [
+				'href' => helper::baseUrl() . $this->getUrl(0) . '/layout',
+				'ico' => 'brush',
+				'value' => 'Mise en page'
+			]); ?>
 		</div>
 	</div>
 <?php echo template::formClose(); ?>
diff --git a/module/blog/view/layout/layout.css b/module/blog/view/layout/layout.css
new file mode 100644
index 00000000..52709ea6
--- /dev/null
+++ b/module/blog/view/layout/layout.css
@@ -0,0 +1,18 @@
+/**
+ * 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-2022, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+
+/** NE PAS EFFACER
+* admin.css
+*/
\ No newline at end of file
diff --git a/module/blog/view/layout/layout.php b/module/blog/view/layout/layout.php
new file mode 100644
index 00000000..f845302b
--- /dev/null
+++ b/module/blog/view/layout/layout.php
@@ -0,0 +1,47 @@
+<?php echo template::formOpen('blogLayout'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('blogLayoutBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
+				'ico' => 'left',
+				'value' => 'Retour'
+			]); ?>
+		</div>
+		<div class="col2 offset8">
+			<?php echo template::submit('blogLayoutSubmit'); ?>
+		</div>
+	</div>
+	<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('blogLayoutShowFeeds', true, 'Lien du flux RSS', [
+							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
+						]); ?>
+					</div>
+					<div class="col6">
+						<?php echo template::text('blogLayoutFeedslabel', [
+							'label' => 'Texte de l\'étiquette',
+							'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
+						]); ?>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col6 offset6">
+						<?php echo template::select('blogLayoutItemsperPage', $module::$ItemsList, [
+							'label' => 'Articles par page',
+							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php echo template::formClose(); ?>
+<div class="moduleVersion">Version n°
+	<?php echo $module::VERSION; ?>
+</div>
+