From de7caa49c1412c886d6a0f8d215bfc5e22398ad1 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Fri, 25 Sep 2020 16:19:07 +0200
Subject: [PATCH] =?UTF-8?q?pb=20de=20menu=20fixe=20apr=C3=A8s=20auto=20log?=
 =?UTF-8?q?out?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php        |  3 +++
 core/layout/main.php | 29 +++++++++++------------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/core/core.php b/core/core.php
index c0e17e56..ecba26d1 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1698,6 +1698,9 @@ class core extends common {
 		) {
 			$user = new user;
 			$user->logout();
+			// Recharge la classe
+			$core = new core;
+			$core->router();
 		}
 		// Mode maintenance
 		if(
diff --git a/core/layout/main.php b/core/layout/main.php
index 6a151d2a..64538a94 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -26,23 +26,17 @@
 		<?php $layout->showNotification(); ?>
 		<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
 			<!-- Menu dans le fond du site avant la bannière -->
-			<nav
-			<?php
-			// Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté
-			//
-			if($this->getData(['theme', 'menu', 'position']) === 'top' &&
-				$this->getData(['theme', 'menu', 'fixed']) === true) {
-					if ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD'))
-					{
-						echo 'id="navfixedconnected"';
+				<!-- Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté -->
+				<?php
+				if ( $this->getData(['theme', 'menu', 'position']) === 'top'
+					AND $this->getData(['theme', 'menu', 'fixed']) === true
+					AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') ) {
+						echo '<nav id="navfixedconnected" >';
+					} else {
+						echo '<nav id="navfixedlogout" >';
 					}
-					else
-					{
-						echo 'id="navfixedlogout"';
-					}
-				}
-			?>
-			>
+				?>
+				<!-- Menu Burger -->
 				<div id="toggle">
 				<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
 					<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
@@ -51,8 +45,7 @@
 				<div id="menu" class="
 				<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}
 				?>">
-
-					<?php $layout->showMenu(); ?>
+				<?php $layout->showMenu(); ?>
 				</div> <!--fin menu -->
 			</nav>
 		<?php endif; ?>