From a0ffcca22a55fc0621184837dfd2fdd895727809 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Sat, 20 Jan 2024 21:07:28 +0100
Subject: [PATCH] =?UTF-8?q?1410=20Ajoute=20=20l'affichage=20du=20s=C3=A9le?=
 =?UTF-8?q?cteur=20d'espace=20aux=20membres=20et=20ouvre=20les=20condition?=
 =?UTF-8?q?s=20d'acc=C3=A8s=20aux=20espaces=20ouverts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/layout.class.php | 38 +++++++++++++++++++------------------
 core/core.php               | 27 +++++++++++++++++++++-----
 core/layout/common.css      |  6 +++---
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index eb441cc..429b748 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -490,6 +490,26 @@ class layout extends common
 
         // Menu extra
         $itemsRight = $this->formatMenu(true);
+
+        /**
+         * Commandes pour les membres simples
+         * Affichage du sélecteur d'espaces
+         */ 
+        if (
+            //$this->getUser('group') === self::GROUP_MEMBER
+            // && 
+            $this->getData(['theme', 'menu', 'selectSpace']) === true
+        ) {
+            if ($this->getCoursesByUser($this->getUser('id'), $this->getUser('group'))) {
+                $itemsRight .= '<li><select id="barSelectCourse" >';
+                $itemsRight .= '<option name="' . helper::translate('Accueil') . '" value="' . helper::baseUrl(true) . 'course/swap/home" ' . ('home' === self::$siteContent ? 'selected' : '') . '>' . helper::translate('Accueil') . '</option>';
+                foreach ($this->getCoursesByUser($this->getUser('id'), $this->getUser('group')) as $courseId => $value) {
+                    $itemsRight .= '<option name="' . $this->getData(['course', $courseId, 'title']) . '" value="' . helper::baseUrl(true) . 'course/swap/' . $courseId . '" ' . ($courseId === self::$siteContent ? 'selected' : '') . '>' . $this->getData(['course', $courseId, 'title']) . '</option>';
+                }
+                $itemsRight .= '</select></li>';
+            }
+        }
+
         // Lien de connexion
         if (
             ($this->getData(['theme', 'menu', 'loginLink'])
@@ -504,24 +524,6 @@ class layout extends common
                 ]) .
                 '</li>';
         }
-
-        /**
-         * Commandes pour les membres simples
-         * Affichage du sélecteur d'espaces
-         */ 
-        if (
-            $this->getUser('group') === self::GROUP_MEMBER
-            && $this->getData(['theme', 'menu', 'selectSpace']) === true
-        ) {
-            if ($this->getCoursesByUser($this->getUser('id'), $this->getUser('group'))) {
-                $itemsRight .= '<li><select id="barSelectCourse" >';
-                $itemsRight .= '<option name="' . helper::translate('Accueil') . '" value="' . helper::baseUrl(true) . 'course/swap/home" ' . ('home' === self::$siteContent ? 'selected' : '') . '>' . helper::translate('Accueil') . '</option>';
-                foreach ($this->getCoursesByUser($this->getUser('id'), $this->getUser('group')) as $courseId => $value) {
-                    $itemsRight .= '<option name="' . $this->getData(['course', $courseId, 'title']) . '" value="' . helper::baseUrl(true) . 'course/swap/' . $courseId . '" ' . ($courseId === self::$siteContent ? 'selected' : '') . '>' . $this->getData(['course', $courseId, 'title']) . '</option>';
-                }
-                $itemsRight .= '</select></li>';
-            }
-        }
         /**
          * Commandes pour les membres simples
          * Affichage des boutons  gestionnaire de fichiers et mon compte
diff --git a/core/core.php b/core/core.php
index 0df83a3..c5fe1ad 100644
--- a/core/core.php
+++ b/core/core.php
@@ -50,7 +50,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.4.09';
+	const ZWII_VERSION = '1.4.10';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
@@ -1404,7 +1404,7 @@ class common
 	public function saveLog($message = '')
 	{
 		// Journalisation
-		$dataLog = helper::dateUTF8('%Y%m%d', time(), self::$siteContent) . ';' . helper::dateUTF8('%H:%M', time(), self::$siteContent). ';';
+		$dataLog = helper::dateUTF8('%Y%m%d', time(), self::$siteContent) . ';' . helper::dateUTF8('%H:%M', time(), self::$siteContent) . ';';
 		$dataLog .= helper::getIp($this->getData(['config', 'connect', 'anonymousIp'])) . ';';
 		$dataLog .= empty($this->getUser('id')) ? 'visitor;' : $this->getUser('id') . ';';
 		$dataLog .= $message ? $this->getUrl() . ';' . $message : $this->getUrl();
@@ -1427,19 +1427,36 @@ class common
 		$c = helper::arraycolumn($c, 'title', 'SORT_ASC');
 		switch ($userStatus) {
 			case self::GROUP_ADMIN:
+				// Affiche tout
 				return $c;
 			case self::GROUP_EDITOR:
 				foreach ($c as $courseId => $value) {
-					if ($this->getData(['course', $courseId, 'author']) !== $userId) {
+					$students = $this->getData(['enrolment', $courseId]);
+					// Affiche les espaces gérés par l'éditeur, les espaces où il participe et les espaces ouverts
+					if (
+						isset($students[$userId]) === false ||
+						$this->getData(['course', $courseId, 'author']) !== $userId ||
+						$this->getData(['course', $courseId, 'access']) !== self::COURSE_ENROLMENT_GUEST
+					) {
 						unset($c[$courseId]);
 					}
 				}
 				return $c;
 			case self::GROUP_MEMBER:
+				foreach ($c as $courseId => $value) {
+					// Affiche les espaces où le membre participe  et les espaces ouverts
+					$students = $this->getData(['enrolment', $courseId]);
+					if (
+						isset($students[$userId]) === false ||
+						$this->getData(['course', $courseId, 'access']) !== self::COURSE_ENROLMENT_GUEST
+					) {
+						unset($c[$courseId]);
+					}
+				}
 			case self::GROUP_VISITOR:
 				foreach ($c as $courseId => $value) {
-					$students = $this->getData(['enrolment', $courseId]);
-					if (isset($students[$userId]) === false) {
+					// Affiche les espaces ouverts
+					if ($this->getData(['course', $courseId, 'access']) !== self::COURSE_ENROLMENT_GUEST) {
 						unset($c[$courseId]);
 					}
 				}
diff --git a/core/layout/common.css b/core/layout/common.css
index 09e6ae3..f9cfbe0 100644
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -607,14 +607,14 @@ nav li ul li {
 nav li ul #barSelectCourse {
     text-align: left;
 }
+
 nav #barSelectCourse {
     width: 150px;
     border: 0;
     color: #111112;
     font-size: 1em;
-    background-color: rgba(255, 255, 255, 1);
-    padding: 8px;
-    margin-top: 5px;
+    background-color: rgba(255, 255, 255, 1);   
+    line-height: 45px;
 }
 
 /*