From 02b5dd4848cc34f828dfe8d1b514a13a7d667cf8 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 10 Jun 2019 15:48:43 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.10]=20sitemap=20articles=20ferm=C3=A9s=20?=
 =?UTF-8?q?=C3=A0=20masquer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                            |  4 ++--
 core/module/sitemap/view/index/index.php | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/core.php b/core/core.php
index 5295cc84..81d781d0 100644
--- a/core/core.php
+++ b/core/core.php
@@ -32,7 +32,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '9.1.09';
+	const ZWII_VERSION = '9.1.10';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
@@ -658,7 +658,7 @@ class common {
 		$datetime->format(DateTime::ATOM); // Updated ISO8601
 		// sitemap index file name
 		$sitemap->sitemapIndexFileName = "sitemap-index.xml";
-		foreach($this->getHierarchy(null, true, null) as $parentPageId => $childrenPageIds) {
+		foreach($this->getHierarchy(null, null, null) as $parentPageId => $childrenPageIds) {
 			// Exclure les barres et les pages non publiques et les pages masquées
 			if ($this->getData(['page',$parentPageId,'group']) !== 0  || $this->getData(['page', $parentPageId, 'disable']) === true)  {
 				continue;
diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php
index 7f6c0351..5294d292 100755
--- a/core/module/sitemap/view/index/index.php
+++ b/core/module/sitemap/view/index/index.php
@@ -27,9 +27,11 @@
 							
 							<?php
 								foreach($this->getData(['module',$childId]) as $articleId => $article): ?>
-								<li>
-									<a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a>
-								</li>
+								<?php if($this->getData(['module',$childId,$articleId,'state']) === true) {?>								
+									<li>
+										<a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a>
+									</li>
+								<?php } ?>								
 								<?php endforeach;
 							} ?>
 						</ul>					
@@ -37,12 +39,14 @@
 				<?php endforeach; ?>
 				<!-- ou articles d'un blog-->
 
-				<?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog') { ?>
+				<?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog' ) { ?>
 				<?php
 					foreach($this->getData(['module',$parentId]) as $articleId => $article): ?>
-					<li>
-						<a href="<?php echo helper::baseUrl() .	$parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a>
-					</li>
+					<?php if($this->getData(['module',$parentId,$articleId,'state']) === true) {?>
+						<li>
+							<a href="<?php echo helper::baseUrl() .	$parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a>
+						</li>
+					<?php } ?>
 					<?php endforeach;
 				} ?>
 			</ul>