From e3744bf7d826cdf4dfed29e16b122cee2fe5b6cc Mon Sep 17 00:00:00 2001
From: F Tempez <ftempez@gmail.com>
Date: Wed, 7 Apr 2021 13:57:54 +0200
Subject: [PATCH] Bug module initcss manque style

---
 module/gallery/gallery.php | 64 ++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 1e453fe2..e9138cdb 100755
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -149,7 +149,6 @@ class gallery extends common {
 	 */
 	private function update() {
 
-
 		// Mise à jour d'une version inférieure
 		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '3.0', '<') ) {
 			// Changement de l'arborescence dans module.json
@@ -175,12 +174,30 @@ class gallery extends common {
 	/**
 	 * Initialisation du thème d'un nouveau module
 	 */
-	private function initCSS() {
-		if ( $this->getData(['module', $this->getUrl(0), 'config']) === null ) {
+	private function initCSS($moduleId) {
+		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
+		if ( $this->getData(['module', $moduleId, 'config']) === null ) {
 			require_once('module/gallery/ressource/defaultdata.php');
-			$this->setData(['module', $this->getUrl(0), 'config', theme::$defaultData]);
+			$this->setData(['module', $moduleId, 'config', [
+				'style' 		   => $fileCSS,
+				'thumbAlign' 	   => theme::$defaultData['thumbAlign'],
+				'thumbWidth' 	   => theme::$defaultData['thumbWidth'],
+				'thumbHeight'	   => theme::$defaultData['thumbHeight'],
+				'thumbMargin'	   => theme::$defaultData['thumbMargin'],
+				'thumbBorder'	   => theme::$defaultData['thumbBorder'],
+				'thumbOpacity'	   => theme::$defaultData['thumbOpacity'],
+				'thumbBorderColor' => theme::$defaultData['thumbBorderColor'],
+				'thumbRadius'      => theme::$defaultData['thumbRadius'],
+				'thumbShadows'     => theme::$defaultData['thumbShadows'],
+				'thumbShadowsColor'=> theme::$defaultData['thumbShadowsColor'],
+				'legendHeight'	   => theme::$defaultData['legendHeight'],
+				'legendAlign'	   => theme::$defaultData['legendAlign'],
+				'legendTextColor'  => theme::$defaultData['legendTextColor'],
+				'legendBgColor'	   => theme::$defaultData['legendBgColor'],
+				'versionData'      => theme::$defaultData['versionData']
+			]]);
 		}
-		if ( !file_exists(self::DATADIRECTORY  . $this->getUrl(0) . '.css')) {
+		if ( !file_exists(self::DATADIRECTORY  . $moduleId . '.css')) {
 			// Variables génériques
 
 			// Dossier de l'instance
@@ -189,30 +206,29 @@ class gallery extends common {
 			}
 
 			// Nom de la feuille de style
-			$fileCSS = self::DATADIRECTORY  . $this->getUrl(0) . '.css' ;
-			$this->setData(['module', $this->getUrl(0), 'config', 'style', $fileCSS]);
+			$this->setData(['module', $moduleId, 'config', 'style', $fileCSS]);
 
 			// Générer la feuille de CSS
 			$content = file_get_contents('module/gallery/ressource/vartheme.css');
 			$themeCss = file_get_contents('module/gallery/ressource/theme.css');
 
 			// Injection des variables
-			$content = str_replace('#thumbAlign#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbAlign']),$content );
-			$content = str_replace('#thumbWidth#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbWidth']),$content );
-			$content = str_replace('#thumbHeight#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbHeight']),$content );
-			$content = str_replace('#thumbMargin#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbMargin']),$content );
-			$content = str_replace('#thumbBorder#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbBorder']),$content );
-			$content = str_replace('#thumbBorderColor#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbBorderColor']),$content );
-			$content = str_replace('#thumbOpacity#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbOpacity']),$content );
-			$content = str_replace('#thumbShadows#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbShadows']),$content );
-			$content = str_replace('#thumbShadowsColor#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbShadowsColor']),$content );
-			$content = str_replace('#thumbRadius#',$this->getData(['module', $this->getUrl(0), 'config', 'thumbRadius']),$content );
-			$content = str_replace('#legendAlign#',$this->getData(['module', $this->getUrl(0), 'config', 'legendAlign']),$content );
-			$content = str_replace('#legendHeight#',$this->getData(['module', $this->getUrl(0), 'config', 'legendHeight']),$content );
-			$content = str_replace('#legendTextColor#',$this->getData(['module', $this->getUrl(0), 'config', 'legendTextColor']),$content );
-			$content = str_replace('#legendBgColor#',$this->getData(['module', $this->getUrl(0), 'config', 'legendBgColor']),$content );
+			$content = str_replace('#thumbAlign#',$this->getData(['module', $moduleId, 'config', 'thumbAlign']),$content );
+			$content = str_replace('#thumbWidth#',$this->getData(['module', $moduleId, 'config', 'thumbWidth']),$content );
+			$content = str_replace('#thumbHeight#',$this->getData(['module', $moduleId, 'config', 'thumbHeight']),$content );
+			$content = str_replace('#thumbMargin#',$this->getData(['module', $moduleId, 'config', 'thumbMargin']),$content );
+			$content = str_replace('#thumbBorder#',$this->getData(['module', $moduleId, 'config', 'thumbBorder']),$content );
+			$content = str_replace('#thumbBorderColor#',$this->getData(['module', $moduleId, 'config', 'thumbBorderColor']),$content );
+			$content = str_replace('#thumbOpacity#',$this->getData(['module', $moduleId, 'config', 'thumbOpacity']),$content );
+			$content = str_replace('#thumbShadows#',$this->getData(['module', $moduleId, 'config', 'thumbShadows']),$content );
+			$content = str_replace('#thumbShadowsColor#',$this->getData(['module', $moduleId, 'config', 'thumbShadowsColor']),$content );
+			$content = str_replace('#thumbRadius#',$this->getData(['module', $moduleId, 'config', 'thumbRadius']),$content );
+			$content = str_replace('#legendAlign#',$this->getData(['module', $moduleId, 'config', 'legendAlign']),$content );
+			$content = str_replace('#legendHeight#',$this->getData(['module', $moduleId, 'config', 'legendHeight']),$content );
+			$content = str_replace('#legendTextColor#',$this->getData(['module', $moduleId, 'config', 'legendTextColor']),$content );
+			$content = str_replace('#legendBgColor#',$this->getData(['module', $moduleId, 'config', 'legendBgColor']),$content );
 			// Ecriture de la feuille de style
-			file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '.css' , $content . $themeCss);
+			file_put_contents(self::DATADIRECTORY . $moduleId . '.css' , $content . $themeCss);
 		}
 	}
 
@@ -276,7 +292,7 @@ class gallery extends common {
 	public function config() {
 
 		// Initialisation du thème d'un nouveau module
-		$this->initCss();
+		$this->initCss($this->getUrl(0));
 
 		// Mise à jour des données de module
 		$this->update();
@@ -561,7 +577,7 @@ class gallery extends common {
 	 */
 	public function index() {
 		// Initialisation du thème du nouveau module
-		$this->initCss();
+		$this->initCss($this->getUrl(0));
 		// Mise à jour des données de module
 		$this->update();
 		// Images d'une galerie