From 97374fafb4b6869cdd0c84a46598c4f26755ce1d Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Sun, 25 Apr 2021 08:56:28 +0200 Subject: [PATCH] =?UTF-8?q?Page.php,=20mise=20=C3=A0=20jour=20et=20effacem?= =?UTF-8?q?ent=20du=20dossier=20au=20nom=20du=20module=20et=20de=20l'insta?= =?UTF-8?q?nce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/page/page.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/module/page/page.php b/core/module/page/page.php index 744e5eda..b8d361b2 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'])) { - $this->removeDir( $modulesData[$moduleId]['dataDirectory'] ); + if (is_dir($modulesData[$moduleId]['dataDirectory'].$url[0])) { + $this->removeDir( $modulesData[$moduleId]['dataDirectory'].$url[0] ); } // Effacer la page $this->deleteData(['page', $url[0]]); @@ -322,12 +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'])) { - // Renommer la feuille de style - rename( $modulesData[$moduleId]['dataDirectory'],str_replace($this->geturl(2),$pageId, $modulesData[$moduleId]['dataDirectory'])); - $this->removeDir($modulesData[$moduleId]['dataDirectory']); - // Mettre à jour le nom de la feuille de site - $this->setData(['module',$pageId,'theme','style',str_replace($this->geturl(2),$pageId, $modulesData[$moduleId]['dataDirectory'])]); + if (is_dir($modulesData[$moduleId]['dataDirectory'].$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)); + // Mettre à jour le nom de la feuille de style + $this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].$pageId]); } } // Si la page correspond à la page d'accueil, change l'id dans la configuration du site