From b58113a8ef27a2cf2b8357ea072605f388b48d77 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 27 Apr 2021 09:25:54 +0200
Subject: [PATCH] Sitemap articles par date

---
 core/module/sitemap/view/index/index.css | 18 +++++++++++-
 core/module/sitemap/view/index/index.php | 37 ++++++++++++++++++------
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/core/module/sitemap/view/index/index.css b/core/module/sitemap/view/index/index.css
index d7c543b0..05c72d6a 100755
--- a/core/module/sitemap/view/index/index.css
+++ b/core/module/sitemap/view/index/index.css
@@ -1 +1,17 @@
-/* Vide */
\ No newline at end of file
+/**
+ * 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-2021, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+ ul {
+     list-style-type: circle;
+ }
\ No newline at end of file
diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php
index 6ae5361c..e52b486c 100755
--- a/core/module/sitemap/view/index/index.php
+++ b/core/module/sitemap/view/index/index.php
@@ -23,13 +23,22 @@
 
 						<!-- articles d'une sous-page blog-->
 						<ul>
-						<?php if ($this->getData(['page', $childId, 'moduleId']) === 'blog') { ?>
-
-							<?php
-								foreach($this->getData(['module',$childId]) as $articleId => $article): ?>
-								<?php if($this->getData(['module',$childId,'posts',$articleId,'state']) === true) {?>
+						<?php if ($this->getData(['page', $childId, 'moduleId']) === 'blog'  &&
+				   			!empty($this->getData(['module', $childId, 'posts' ])) ) { ?>
+						<?php 
+								// Ids des articles par ordre de publication
+								$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC');
+								$articleIdsStates = helper::arrayCollumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC');
+								$articleIds = [];
+								foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
+									if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) {
+										$articleIds[] = $articleId;
+									}
+								}
+								foreach($articleIds as $articleId => $article): ?>
+								<?php if($this->getData(['module',$childId,'posts',$article,'state']) === true) {?>
 									<li>
-										<a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a>
+										<a href="<?php echo helper::baseUrl() . $childId . '/' . $article;?>"><?php echo $this->getData(['module',$childId,'posts',$article,'title']); ?></a>
 									</li>
 								<?php } ?>
 								<?php endforeach;
@@ -41,10 +50,20 @@
 
 				<?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog'  &&
 				   			!empty($this->getData(['module',$parentId, 'posts' ])) ) { ?>
-					<?php foreach($this->getData(['module',$parentId, 'posts' ]) as $articleId => $article): ?>
-						<?php if($this->getData(['module',$parentId,'posts',$articleId,'state']) === true ): ?>
+					<?php
+						// Ids des articles par ordre de publication
+						$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC');
+						$articleIdsStates = helper::arrayCollumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC');
+						$articleIds = [];
+						foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
+							if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) {
+								$articleIds[] = $articleId;
+							}
+						}
+						foreach($articleIds as $articleId => $article): ?>
+						<?php if($this->getData(['module',$parentId,'posts',$article,'state']) === true ): ?>
 							<li>
-								<a href="<?php echo helper::baseUrl() .	$parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a>
+								<a href="<?php echo helper::baseUrl() .	$parent. '/' . $article;?>"><?php echo $this->getData(['module',$parentId,'posts',$article,'title']); ?></a>
 							</li>
 						<?php endif; ?>
 					<?php endforeach;