From a55c2b9de4f6b42b7a9b13847dc695c51c8503b9 Mon Sep 17 00:00:00 2001
From: SylvainLelievre <lelievre.sylvain@gmail.com>
Date: Mon, 26 Apr 2021 13:59:21 +0200
Subject: [PATCH] Chemin des feuilles de style
 .../class_du_module/pages/instance/theme.css

---
 core/module/page/page.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/module/page/page.php b/core/module/page/page.php
index b8d361b2..7438c5b4 100755
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -262,8 +262,8 @@ class page extends common {
 			// Effacer le dossier du module
 			$moduleId = $this->getData(['page',$url[0],'moduleId']);
 			$modulesData = helper::getModules();
-			if (is_dir($modulesData[$moduleId]['dataDirectory'].$url[0])) {
-				$this->removeDir( $modulesData[$moduleId]['dataDirectory'].$url[0] );
+			if (is_dir($modulesData[$moduleId]['dataDirectory'].'pages/'.$url[0])) {
+				$this->removeDir( $modulesData[$moduleId]['dataDirectory'].'pages/'.$url[0] );
 			}
 			// Effacer la page
 			$this->deleteData(['page', $url[0]]);
@@ -322,13 +322,13 @@ class page extends common {
 						// Renommer le dossier du module
 						$moduleId = $this->getData(['page',$this->getUrl(2),'moduleId']);
 						$modulesData = helper::getModules();
-						if (is_dir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2))) {
+						if (is_dir($modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2))) {
 							// Placer la feuille de style dans un dossier au nom de la nouvelle instance
-							mkdir( $modulesData[$moduleId]['dataDirectory'].$pageId );
-							copy( $modulesData[$moduleId]['dataDirectory'].$this->getUrl(2), $modulesData[$moduleId]['dataDirectory'].$pageId);
-							$this->removeDir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2));
+							mkdir( $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId );
+							copy( $modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2), $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId);
+							$this->removeDir($modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2));
 							// Mettre à jour le nom de la feuille de style
-							$this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].$pageId]);
+							$this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId]);
 						}
 					}
 					// Si la page correspond à la page d'accueil, change l'id dans la configuration du site