From 9740bb0291dd0bbcf0fd7b9befd6cf992348f745 Mon Sep 17 00:00:00 2001
From: Deltacms <contact@deltacms.fr>
Date: Fri, 30 Jun 2023 09:17:41 +0200
Subject: [PATCH] =?UTF-8?q?sitemap=20et=20menu=20lat=C3=A9ral?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                   |  6 ++----
 core/layout/mediaqueries.css    |  2 +-
 core/module/sitemap/sitemap.php | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/core.php b/core/core.php
index d34d8af..f4f3c5f 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1804,9 +1804,6 @@ class common {
 				// Mise en page de l'item
 				$itemsLeft .= '<li>';
 				$pageDesactived = false;
-				/*if ( ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD')) 
-					OR ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD')AND $this->getUser('group') < self::GROUP_EDITOR ))
-				{*/
 				if (  $this->getData(['page',$parentPageId,'disable']) === true && $groupUser < 2 ){
 					$pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false)  :  helper::baseUrl() . $this->getUrl(0);
 					$itemsLeft .= '<div id="'.$parentPageId.'" class="box" style="display:flex; justify-content:space-between;"><div><a class="A ' . $active . $parentPageId . ' disabled-link">';
@@ -2006,7 +2003,8 @@ class common {
 				$items .= '<li class="menuSideChild">';
 				if ( $this->getData(['page',$parentPageId,'disable']) === true
 					AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD')	) {
-						$items .= '<a href="'.$this->getUrl(1).'">';
+						$items .= '<a class="disabled-link">';
+						//$items .= '<a href="'.$this->getUrl(1).'">';	
 				} else {
 						$items .= '<a href="'. helper::baseUrl() . $parentPageId . '"' . $targetBlank .  $active .'>';
 				}
diff --git a/core/layout/mediaqueries.css b/core/layout/mediaqueries.css
index c8511d3..6abf321 100644
--- a/core/layout/mediaqueries.css
+++ b/core/layout/mediaqueries.css
@@ -195,7 +195,7 @@
 		display:inline;
 		margin: auto 30vw auto auto;
 	}
-	nav a.disabled-link{
+	a.disabled-link{
 		font-style:italic;
 	}
 	/*bandeau flex*/
diff --git a/core/module/sitemap/sitemap.php b/core/module/sitemap/sitemap.php
index fd17243..da1aa8a 100644
--- a/core/module/sitemap/sitemap.php
+++ b/core/module/sitemap/sitemap.php
@@ -44,8 +44,8 @@ class sitemap extends common
 				$totalChild += 1;
 				if( $this->getData(['page', $childKey, 'disable']) === true ) $disableChild +=1;
 			}
-			// Ne pas afficher les pages masquées dans le menu latéral ou les pages désactivées sans sous-page active pour les clients < éditeur
-			if ($this->getData(['page',$parentId,'hideMenuSide']) === true || ( $this->getData(['page',$parentId,'disable']) && (empty($childIds) ||  $disableChild === $totalChild) && $groupUser < 2 ) ) {
+			// Ne pas afficher les pages désactivées sans sous-page active pour les clients < éditeur
+			if ( $this->getData(['page',$parentId,'disable']) && (empty($childIds) ||  $disableChild === $totalChild) && $groupUser < 2 )  {
 				continue;
 			}
             $items .= ' <li>';
@@ -54,7 +54,12 @@ class sitemap extends common
                     $items .= '<a href="' . $pageUrl .'">'  .$this->getData(['page', $parentId, 'title']) . '</a>';
                 } else {
                     // page désactivée
-                    $items .= $this->getData(['page', $parentId, 'title']);
+					if ( $groupUser < 2 ){
+						$items .= '<a class="disabled-link">'  .$this->getData(['page', $parentId, 'title']) . '</a>';	
+					} else {
+						$pageUrl = ($parentId !== $this->getData(['locale', 'homePageId'])) ? helper::baseUrl() . $parentId : helper::baseUrl(false);
+						$items .= '<a href="' . $pageUrl .'">'  .$this->getData(['page', $parentId, 'title']) . '</a>';	
+					}
                 }
                 // ou articles d'un blog
                 
@@ -81,14 +86,15 @@ class sitemap extends common
                 } 
                 
                 foreach ($childIds as $childId) {
-					// Passer les sous-pages masquées ou désactivées si client < éditeur
-					if ($this->getData(['page',$childId,'hideMenuSide']) === true || ( $this->getData(['page',$childId,'disable']) === true && $groupUser < 2)) {
+					// Passer les sous-pages désactivées si client < éditeur
+					if ( $this->getData(['page',$childId,'disable']) === true && $groupUser < 2 ) {
 						continue;
 					}
 					$items .= '<ul>';
 					// Sous-page
 					$items .= ' <li>';              
-					if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) {
+					if ( ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) 
+						|| ( $this->getData(['page', $childId, 'disable']) === true && $groupUser >= 2)) {
 						$pageUrl = ($childId !== $this->getData(['locale', 'homePageId'])) ? helper::baseUrl() . $childId : helper::baseUrl(false) ;
 						$items .= '<a href="' . $pageUrl . '">' . $this->getData(['page', $childId, 'title']) . '</a>';
 					} else {