From 9a26cf73d6ed8d9c29ea74f5fc731a2bf34c88c9 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 18 Nov 2020 21:45:36 +0100
Subject: [PATCH] Merge 10307

---
 core/core.php                   | 19 ++++++--
 core/module/install/install.php |  6 +--
 module/blog/blog.php            | 83 +++++++++++++++++++++++++++------
 3 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/core/core.php b/core/core.php
index 0390a125..16fa96ae 100644
--- a/core/core.php
+++ b/core/core.php
@@ -425,6 +425,9 @@ class common {
 				case 7:
 					$tempData = $db->get($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6]);
 					break;
+				case 8:
+					$tempData = $db->get($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6].'.'.$keys[7]);
+					break;
 			}
 			return $tempData;
 		}
@@ -974,6 +977,10 @@ class common {
 				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5],$keys[6]);
 				$db->save();
 				break;
+			case 8:
+				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6],$keys[7] );
+				$db->save();
+				break;
 		}
 		return true;
 	}
@@ -1480,11 +1487,16 @@ class common {
 				}
 			}
 			// Parcourir pageList et rechercher les modules de blog
+			
 			foreach ($pageList as $parentKey => $parent) {
-				//La page a une galerie
+				//La page est un blog
 				if ($this->getData(['page',$parent,'moduleId']) === 'blog' ) {
-					$articleIds = array_keys(helper::arrayCollumn($this->getData(['module',$parent], 'posts'), 'publishedOn', 'SORT_DESC'));
+					//echo "<pre>".$parent;
+					$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $parent, 'posts']), 'publishedOn', 'SORT_DESC'));
+					//var_dump($articleIds);
 					foreach ($articleIds as $key => $article) {
+						//echo $article;
+						//echo "<p>";
 						// Droits les deux groupes
 						$this->setData(['module',  $parent, 'posts', $article,'editConsent', 3]);
 						// Limite de taille 500
@@ -1496,6 +1508,7 @@ class common {
 						// groupe de notification
 						$this->setData(['module',  $parent, 'posts', $article,'commentGroupNotification', 3 ]);
 					}
+
 					// Traitement des commentaires
 					if ( is_array($this->getData(['module',  $parent, 'posts', $article,'comment'])) ) {
 						foreach($this->getData(['module',  $parent, 'posts', $article,'comment']) as $commentId => $comment) {
@@ -2092,7 +2105,7 @@ class core extends common {
 
 		// Librairie googtrans ajouté dynamiquement
 		if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr'
-			 AND $this->getData(['translate','active']) === true 
+			 AND $this->getData(['translate','active']) === true
 			 AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) {
 				$this->addOutput([
 					'vendor' => array_merge($this->output['vendor'], ['i18n'])
diff --git a/core/module/install/install.php b/core/module/install/install.php
index bc573824..e9fef5a2 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -96,9 +96,9 @@ class install extends common {
 				if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === FALSE) {
 					$this->initData('page','fr',true);
 					$this->initData('module','fr',true);
-					$this->setData(['module', 'blog', 'mon-premier-article', 'userId', $userId]);
-					$this->setData(['module', 'blog', 'mon-deuxieme-article', 'userId', $userId]);
-					$this->setData(['module', 'blog', 'mon-troisieme-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-premier-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]);
+					$this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]);
 				}
 				// Stocker le dossier d'installation
 				$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
diff --git a/module/blog/blog.php b/module/blog/blog.php
index df0b24f8..45098b9f 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -89,6 +89,54 @@ class blog extends common {
 
 	const BLOG_VERSION = '3.2';
 
+		/**
+	 * Flux RSS
+	 */
+	public function rss() {
+		// Inclure les classes
+		include_once 'module/news/vendor/FeedWriter/Item.php';
+		include_once 'module/news/vendor/FeedWriter/Feed.php';
+		include_once 'module/news/vendor/FeedWriter/RSS2.php';
+		include_once 'module/news/vendor/FeedWriter/InvalidOperationException.php';
+
+		date_default_timezone_set('UTC');
+		$feeds = new \FeedWriter\RSS2();
+
+		// En-tête
+		$feeds->setTitle($this->getData (['page', $this->getUrl(0), 'posts','title']));
+		$feeds->setLink(helper::baseUrl() . $this->getUrl(0));
+		$feeds->setDescription(html_entity_decode(strip_tags($this->getData (['page', $this->getUrl(0), 'metaDescription']))));
+		$feeds->setChannelElement('language', 'fr-FR');
+		$feeds->setDate(time());
+		$feeds->addGenerator();
+		// Corps des articles
+		$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
+		$articleIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'state', 'SORT_DESC');
+		foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
+			if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) {
+				// Miniature
+				$parts = explode('/',$this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture']));
+				$thumb = str_replace ($parts[(count($parts)-1)],'mini_' . $parts[(count($parts)-1)], $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture']));
+				// Créer les articles du flux
+				$newsArticle = $feeds->createNewItem();
+				$newsArticle->addElementArray([
+					'title' => strip_tags($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'title']) ),
+					'link' => helper::baseUrl() .$this->getUrl(0) . '/' . $articleId,
+					'description' => html_entity_decode(strip_tags($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'content']))),
+					'addEnclosure' => helper::baseUrl() . self::FILE_DIR . $thumb
+				]);
+				$feeds->addItem($newsArticle);
+			}
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'display' => self::DISPLAY_RSS,
+			'content' => $feeds->generateFeed(),
+			'view' => 'rss'
+		]);
+	}
+
 	/**
 	 * Édition
 	 */
@@ -158,7 +206,7 @@ class blog extends common {
 	 * Liste des commentaires
 	 */
 	public function comment() {
-		$comments = $this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(2),'comment']);
+		$comments = $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2),'comment']);
 		self::$commentsDelete =	template::button('blogCommentDeleteAll', [
 					'class' => 'blogCommentDeleteAll buttonRed',
 					'href' => helper::baseUrl() . $this->getUrl(0) . '/commentDeleteAll/' . $this->getUrl(2).'/' . $_SESSION['csrf'] ,
@@ -319,7 +367,7 @@ class blog extends common {
 			]);
 		} else {
 			// Ids des articles par ordre de publication
-			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0)]), 'publishedOn', 'SORT_DESC'));
+			$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) {
@@ -333,7 +381,7 @@ class blog extends common {
 					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'])
+						AND $this->getUser('group') >=  $this->getData(['module',$this->getUrl(0), 'posts', $value,'editConsent'])
 					)
 					OR (
 						// Tout le monde
@@ -351,28 +399,28 @@ class blog extends common {
 			// 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');
+				$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']));
+					$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'])));
+					? 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'])],
+					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 ?  'buttonBlue' : 'buttonGrey' ,
@@ -390,6 +438,11 @@ class blog extends common {
 					])
 				];
 			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'title' => 'Configuration du module',
+				'view' => 'config'
+			]);
 		}
 	}
 
@@ -552,7 +605,7 @@ class blog extends common {
 						'content' => $content,
 						'createdOn' => time(),
 						'userId' => $this->getInput('blogArticleUserId'),
-						'approval' => !$this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'commentApproved']) // true commentaire publié false en attente de publication
+						'approval' => !$this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentApproved']) // true commentaire publié false en attente de publication
 					]]);
 					// Envoi d'une notification aux administrateurs
 					// Init tableau
@@ -592,7 +645,7 @@ class blog extends common {
 
 				}
 				// Ids des commentaires approuvés par ordre de publication
-				$commentsApproved = $this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'comment']);
+				$commentsApproved = $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'comment']);
 				if ($commentsApproved) {
 					foreach( $commentsApproved as $key => $value){
 						if($value['approval']===false) unset($commentsApproved[$key]);
@@ -666,8 +719,8 @@ class blog extends common {
 						self::$commentsSignature[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'comment', $commentIds[$i],'author']);
 					}
 					// Données du commentaire si approuvé
-					if ($this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'comment', $commentIds[$i],'approval']) === true ) {
-						self::$comments[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(1), 'comment', $commentIds[$i]]);
+					if ($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'comment', $commentIds[$i],'approval']) === true ) {
+						self::$comments[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'comment', $commentIds[$i]]);
 					}
 				}
 				// Valeurs en sortie