From 36ed07266758e5e905c6ce81c151356367234828 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 7 Apr 2021 17:57:38 +0200
Subject: [PATCH 01/11] core modules autnomes update

---
 core/core.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core.php b/core/core.php
index 10a48b71..4d594cac 100755
--- a/core/core.php
+++ b/core/core.php
@@ -1608,6 +1608,7 @@ class common {
 				){
 					if(class_exists($parent)) {
 						$module = new $moduleId;
+						$module->update($parent);
 						$module->initCSS($parent);
 					}
 				}

From 9240883e59a30ad160fe9d9d666284cf9d128bd3 Mon Sep 17 00:00:00 2001
From: F Tempez <ftempez@gmail.com>
Date: Thu, 8 Apr 2021 09:44:13 +0200
Subject: [PATCH 02/11] fix gallery from 10502

---
 core/core.php              |  2 +-
 module/gallery/gallery.php | 51 ++++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/core/core.php b/core/core.php
index 10a48b71..f2e4546c 100755
--- a/core/core.php
+++ b/core/core.php
@@ -1608,7 +1608,7 @@ class common {
 				){
 					if(class_exists($parent)) {
 						$module = new $moduleId;
-						$module->initCSS($parent);
+						$module->update($parent);
 					}
 				}
 			}
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 4bce7c20..ce00c9b8 100755
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -149,26 +149,32 @@ 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
-			$data = $this->getData(['module', $this->getUrl(0)]);
-			$this->deleteData(['module', $this->getUrl(0)]);
-			$this->setData(['module', $this->getUrl(0), 'content', $data]);
-			// Effacer les fichiers CSS de l'ancienne version
-			if (file_exists('module/gallery/view/index/index.css')) {
-				unlink('module/gallery/view/index/index.css');
-			}
-			if (file_exists('module/gallery/view/gallery/gallery.css')) {
-				unlink('module/gallery/view/gallery/gallery.css');
-			}
-			// Stockage des données du thème de la gallery
-			$data = $this->getData(['theme','gallery']);
-			$this->deleteData(['theme','gallery']);
-			$this->setData(['module', $this->getUrl(0), 'config', $data]);
-			// Nouvelle version
-			$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.0']);
+		// Mise à jour d'une version inférieure, la gallerye existe
+		if ($this->getData(['module', $this->getUrl(0)]) ) {
+			if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '3.0', '<') ) {
+				// Changement de l'arborescence dans module.json
+				$data = $this->getData(['module', $this->getUrl(0)]);
+				$this->deleteData(['module', $this->getUrl(0)]);
+				$this->setData(['module', $this->getUrl(0), 'content', $data]);
+				// Effacer les fichiers CSS de l'ancienne version
+				if (file_exists('module/gallery/view/index/index.css')) {
+					unlink('module/gallery/view/index/index.css');
+				}
+				if (file_exists('module/gallery/view/gallery/gallery.css')) {
+					unlink('module/gallery/view/gallery/gallery.css');
+				}
+				// Stockage des données du thème de la gallery
+				$data = $this->getData(['theme','gallery']);
+				$this->deleteData(['theme','gallery']);
+				$this->setData(['module', $this->getUrl(0), 'config', $data]);
+				// Nouvelle version
+				$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.0']);
+			}	
+		} else {
+			//la galerie n'existe pas, initialiser le CSS
+			$this->initCss($this->getUrl(0));
 		}
+
 	}
 
 	/**
@@ -291,9 +297,6 @@ class gallery extends common {
 	 */
 	public function config() {
 
-		// Initialisation du thème d'un nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Mise à jour des données de module
 		$this->update();
 
@@ -576,10 +579,10 @@ class gallery extends common {
 	 * Accueil (deux affichages en un pour éviter une url à rallonge)
 	 */
 	public function index() {
-		// Initialisation du thème du nouveau module
-		$this->initCss($this->getUrl(0));
+
 		// Mise à jour des données de module
 		$this->update();
+
 		// Images d'une galerie
 		if($this->getUrl(1)) {
 			// La galerie n'existe pas

From 490d39a9ba89b551a9a8357cb1a0afaee1610c88 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 8 Apr 2021 11:33:35 +0200
Subject: [PATCH 03/11] uodate news ok

---
 module/news/news.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/news/news.php b/module/news/news.php
index b87ee9c5..65b13fb9 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -165,9 +165,6 @@ class news extends common {
 	 */
 	public function config() {
 
-		// Initialisation du thème du nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Mise à jour des données de module
 		$this->update();
 
@@ -338,9 +335,6 @@ class news extends common {
 	 */
 	public function index() {
 
-		// Initialisation du thème du nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Mise à jour des données de module
 		$this->update();
 		// Affichage d'un article
@@ -428,11 +422,16 @@ class news extends common {
 	 * Appelée par les fonctions index et config
 	 */
 	private function update() {
+
+		// Initialisation du thème du nouveau module
+		$this->initCss($this->getUrl(0));
+
 		// Version 3.0
 		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '3.0', '<') ) {
 			$this->setData(['module', $this->getUrl(0), 'config', 'itemsperPage', 16]);
 			$this->setData(['module', $this->getUrl(0), 'config', 'itemsperCol', 6]);
 			$this->setData(['module', $this->getUrl(0), 'config', 'versionData','3.0']);
+
 		}
 	}
 
@@ -443,10 +442,13 @@ class news extends common {
 		// Variable commune
 		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
 
+		// Absence des données CSS
 		if ( $this->getData(['module', $moduleId, 'config', 'itemsHeight']) === null ) {
 
 			$this->setData(['module', $moduleId, 'config', 'itemsHeight', '200px']);
-
+		}
+		// Absence de la feuille de style
+		if (!file_exists(self::DATADIRECTORY . $moduleId . '.css') ) {
 			// Générer la feuille de CSS
 			$style = '.newsContent {height: 200px;}';
 
@@ -459,9 +461,7 @@ class news extends common {
 			$success = file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
 
 			// Nom de la feuille de style
-			$this->setData(['module', $moduleId, 'config', 'style', self::DATADIRECTORY .$moduleId]);
-			// Fin feuille de style
-
+			$this->setData(['module', $moduleId, 'config', 'style', self::DATADIRECTORY . $moduleId . '.css']);
 		}
 	}
 }

From 6084179d1dfb31a1d3518d7fab27583b0cb04e30 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 8 Apr 2021 11:45:06 +0200
Subject: [PATCH 04/11] update search ok

---
 module/search/ressource/defaultdata.php |  4 +--
 module/search/search.php                | 37 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/module/search/ressource/defaultdata.php b/module/search/ressource/defaultdata.php
index bd10fb70..873d0d15 100755
--- a/module/search/ressource/defaultdata.php
+++ b/module/search/ressource/defaultdata.php
@@ -5,8 +5,6 @@ class init extends search {
         'resultHideContent'  => false,
         'placeHolder'        => 'Un ou plusieurs mots-clés séparés par un espace ou par +',
         'submitText'         => 'Rechercher',
-        'keywordColor'      => 'rgba(229, 229, 1, 1)',
-        'versionData'       => '2.0',
-        'style'             => ''
+        'versionData'       => '2.0'
     ];
 }
\ No newline at end of file
diff --git a/module/search/search.php b/module/search/search.php
index ae57e49c..585bc637 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -52,6 +52,9 @@ class search extends common {
 	 */
 	private function update() {
 
+		// Initialisation d'un nouveau module
+		$this->initCss($this->getUrl(0));
+
 		// Version 2.0
 		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '2.0', '<') ) {
 
@@ -79,21 +82,29 @@ class search extends common {
 	 * Appelée par les fonctions index et config
 	 */
 	private function initCss($moduleId){
-		// Création des valeurs de réglage par défaut
-		if ( !is_array($this->getData(['module',$moduleId, 'config']) ) ) {
-			require_once('module/search/ressource/defaultdata.php');
+		// Variable commune
+		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
 
-			// Sauver les données par défaut
-			init::$defaultData['style'] = self::DATADIRECTORY . $moduleId . '.css';
-			$this->setData(['module', $moduleId, 'config', init::$defaultData]);
+		// Absence des données CSS
+		if ( $this->getData(['module', $moduleId, 'config', 'keywordColor']) === null ) {
 
-			$style = '.searchItem {background:' . $this->getData(['module', $moduleId, 'config', 'keywordColor']). ';}';
+			$this->setData(['module', $moduleId, 'config', 'keywordColor', 'rgba(229, 229, 1, 1)']);
+		}
+		// Absence de la feuille de style
+		if (!file_exists(self::DATADIRECTORY . $moduleId . '.css') ) {
+			// Générer la feuille de CSS
+			$style = '.searchItem {background: rgba(229, 229, 1, 1);}';
 
 			// Dossier de l'instance
-			if (!is_dir(self::DATADIRECTORY )) {
-				mkdir (self::DATADIRECTORY , 0777, true);
+			if (!is_dir(self::DATADIRECTORY)) {
+				mkdir (self::DATADIRECTORY, 0777, true);
 			}
-			$success = file_put_contents(self::DATADIRECTORY . $moduleId . '.css' , $style );
+
+			// Sauver la feuille de style
+			$success = file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
+
+			// Nom de la feuille de style
+			$this->setData(['module', $moduleId, 'config', 'style', self::DATADIRECTORY . $moduleId . '.css']);
 		}
 	}
 
@@ -101,9 +112,6 @@ class search extends common {
 	// Configuration vide
 	public function config() {
 
-		// Initialisation d'un nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Mise à jour des données de module
 		$this->update();
 
@@ -151,9 +159,6 @@ class search extends common {
 
 	public function index() {
 
-		// Initialisation d'un nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Mise à jour des données de module
 		$this->update();
 

From 0f3cdfe3c6236f2af708246e76fbee1b4f0c34c2 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 8 Apr 2021 19:29:40 +0200
Subject: [PATCH 05/11] search en test

---
 core/core.php                           |  2 +-
 module/search/ressource/defaultdata.php |  5 +-
 module/search/search.php                | 83 +++++++++++++++----------
 module/search/view/config/config.php    |  2 +-
 4 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/core/core.php b/core/core.php
index f2e4546c..8cbbc2ea 100755
--- a/core/core.php
+++ b/core/core.php
@@ -1587,7 +1587,7 @@ class common {
 		}
 
 		// Version 10.6.00
-		if ($this->getData(['core', 'dataVersion']) < 10600) {
+		if ($this->getData(['core', 'dataVersion']) < 106) {
 
 			// Mise à jour des données des modules autonomes
 
diff --git a/module/search/ressource/defaultdata.php b/module/search/ressource/defaultdata.php
index 873d0d15..74f7a636 100755
--- a/module/search/ressource/defaultdata.php
+++ b/module/search/ressource/defaultdata.php
@@ -5,6 +5,9 @@ class init extends search {
         'resultHideContent'  => false,
         'placeHolder'        => 'Un ou plusieurs mots-clés séparés par un espace ou par +',
         'submitText'         => 'Rechercher',
-        'versionData'       => '2.0'
+        'versionData'        => '2.0'
+    ];
+    public static $defaultTheme = [
+        'keywordColor'       => 'rgba(229, 229, 1, 1)'
     ];
 }
\ No newline at end of file
diff --git a/module/search/search.php b/module/search/search.php
index 585bc637..8759b812 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -51,24 +51,34 @@ class search extends common {
 	 * Appelée par les fonctions index et config
 	 */
 	private function update() {
-
-		// Initialisation d'un nouveau module
-		$this->initCss($this->getUrl(0));
-
+		return;
 		// Version 2.0
+		// Déplacement des données de l'instance
 		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '2.0', '<') ) {
-
-			// Données de l'instance
 			$data = $this->getData(['module', $this->getUrl(0)]);
+			// Feuille de style
+			$fileCSS = self::DATADIRECTORY  . $this->getUrl(0) . '.css' ;
 			$this->setData(['module', $this->getUrl(0), 'config', [
 				'submitText' => $this->getData(['module', $this->getUrl(0), 'submitText']),
 				'placeHolder' => $this->getData(['module', $this->getUrl(0), 'placeHolder']),
 				'resultHideContent' => $this->getData(['module', $this->getUrl(0), 'resultHideContent']),
 				'previewLength' => $this->getData(['module', $this->getUrl(0), 'previewLength']),
-				'keywordColor' => $this->getData(['module', $this->getUrl(0), 'keywordColor']),
-				'style' => self::DATADIRECTORY . $this->getUrl(0) . '.css',
 				'versionData' => '2.0'
 			]]);
+			$this->setData(['module', $this->getUrl(0), 'theme', [
+				'keywordColor' => $this->getData(['module', $this->getUrl(0), 'keywordColor']),
+				'style' => $fileCSS
+			]]);
+
+			// Dossier de l'instance
+			if (!is_dir(self::DATADIRECTORY)) {
+				mkdir (self::DATADIRECTORY, 0777, true);
+			}
+			// Générer la feuille de CSS
+			$style = '.searchItem {background: ' . $this->getData(['module', $this->getUrl(0), 'theme', 'keywordColor']) . ';}';
+			// Sauver la feuille de style
+			$success = file_put_contents( $fileCSS, $style);
+			// Nettoyage des données précédentes
 			$this->deleteData(['module', $this->getUrl(0), 'submitText']);
 			$this->deleteData(['module', $this->getUrl(0), 'placeHolder']);
 			$this->deleteData(['module', $this->getUrl(0), 'resultHideContent']);
@@ -78,47 +88,49 @@ class search extends common {
 	}
 
 	/**
-	 * Initialisation du thème du module
-	 * Appelée par les fonctions index et config
+	 * Initialisation du module
 	 */
-	private function initCss($moduleId){
+	private function init($moduleId){
 		// Variable commune
 		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
 
-		// Absence des données CSS
-		if ( $this->getData(['module', $moduleId, 'config', 'keywordColor']) === null ) {
+		// Données du module 
+		require_once('module/search/ressource/defaultdata.php');
+		$this->setData(['module', $moduleId, 'config',init::$defaultData ]);
+		// Données de thème
+		$this->setData(['module', $moduleId, 'theme',init::$defaultTheme ]);
+		// Feuille de style
+		// Générer la feuille de CSS
+		$style = '.searchItem {background: rgba(229, 229, 1, 1);}';
 
-			$this->setData(['module', $moduleId, 'config', 'keywordColor', 'rgba(229, 229, 1, 1)']);
+		// Dossier de l'instance
+		if (!is_dir(self::DATADIRECTORY)) {
+			mkdir (self::DATADIRECTORY, 0777, true);
 		}
-		// Absence de la feuille de style
-		if (!file_exists(self::DATADIRECTORY . $moduleId . '.css') ) {
-			// Générer la feuille de CSS
-			$style = '.searchItem {background: rgba(229, 229, 1, 1);}';
 
-			// Dossier de l'instance
-			if (!is_dir(self::DATADIRECTORY)) {
-				mkdir (self::DATADIRECTORY, 0777, true);
-			}
+		// Sauver la feuille de style
+		file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
 
-			// Sauver la feuille de style
-			$success = file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
-
-			// Nom de la feuille de style
-			$this->setData(['module', $moduleId, 'config', 'style', self::DATADIRECTORY . $moduleId . '.css']);
-		}
+		// Stocker le nom de la feuille de style
+		$this->setData(['module', $moduleId, 'theme', 'style', self::DATADIRECTORY . $moduleId . '.css']);
 	}
 
 
 	// Configuration vide
 	public function config() {
 
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
 		// Mise à jour des données de module
 		$this->update();
 
 		if($this->isPost())  {
 
 			// Générer la feuille de CSS
-			$style = '.searchItem {background:' . $this->getInput('searchKeywordColor') . ';}';
+			$style = '.keywordColor {background:' . $this->getInput('searchKeywordColor') . ';}';
 			// Dossier de l'instance
 			if (!is_dir(self::DATADIRECTORY)) {
 				mkdir (self::DATADIRECTORY , 0777, true);
@@ -133,9 +145,11 @@ class search extends common {
 				'placeHolder' => $this->getInput('searchPlaceHolder'),
 				'resultHideContent' => $this->getInput('searchResultHideContent',helper::FILTER_BOOLEAN),
 				'previewLength' => $this->getInput('searchPreviewLength',helper::FILTER_INT),
+				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
+			]]);
+			$this->setData(['module', $this->getUrl(0), 'theme',[
 				'keywordColor' => $this->getInput('searchKeywordColor'),
 				'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '.css' : '',
-				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
 			]]);
 
 
@@ -159,6 +173,11 @@ class search extends common {
 
 	public function index() {
 
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
 		// Mise à jour des données de module
 		$this->update();
 
@@ -312,7 +331,7 @@ class search extends common {
 				'view' => 'index',
 				'showBarEditButton' => true,
 				'showPageContent' => !$this->getData(['module', $this->getUrl(0), 'config', 'resultHideContent']),
-				'style' => $this->getData(['module', $this->getUrl(0), 'config', 'style'])
+				'style' => $this->getData(['module', $this->getUrl(0), 'theme', 'style'])
 			]);
 		} else {
 			// Valeurs en sortie, affichage du formulaire
@@ -361,7 +380,7 @@ class search extends common {
 				// Découper l'aperçu
 				$t = substr($contenu, $d ,$this->getData(['module',$this->getUrl(0), 'config', 'previewLength']));
 				// Applique une mise en évidence
-				$t = preg_replace($keywords, '<span class= "searchItem">\1</span>',$t);
+				$t = preg_replace($keywords, '<span class= "keywordColor">\1</span>',$t);
 				// Sauver résultat
 				$resultat .= '<p class="searchResult">'.$t.'...</p>';
 				$resultat .= '<p class="searchTitle">' . count($matches[0]) . (count($matches[0]) === 1 ? ' correspondance<p>' : ' correspondances<p>');
diff --git a/module/search/view/config/config.php b/module/search/view/config/config.php
index 06d22285..68b6ab8f 100755
--- a/module/search/view/config/config.php
+++ b/module/search/view/config/config.php
@@ -59,7 +59,7 @@
 							'class' => 'colorPicker',
 							'help' =>  'Le curseur horizontal règle le niveau de transparence, le placer tout à la gauche pour un surlignement invisible.',
 							'label' => 'Surlignement',
-							'value' => $this->getData(['module', $this->getUrl(0), 'config', 'keywordColor'])
+							'value' => $this->getData(['module', $this->getUrl(0), 'theme', 'keywordColor'])
 						]); ?>
 					</div>
 				</div>

From 1f37f1ca91d94221ba96da316420320ad27df138 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 9 Apr 2021 08:48:48 +0200
Subject: [PATCH 06/11] Search OK !!!

---
 module/search/search.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/module/search/search.php b/module/search/search.php
index 8759b812..9a5fad73 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -51,10 +51,9 @@ class search extends common {
 	 * Appelée par les fonctions index et config
 	 */
 	private function update() {
-		return;
-		// Version 2.0
-		// Déplacement des données de l'instance
-		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '2.0', '<') ) {
+
+		// Déplacement des données d'une version ultérieure
+		if ($this->getData(['module', $this->getUrl(0), 'previewLength']) ) {
 			$data = $this->getData(['module', $this->getUrl(0)]);
 			// Feuille de style
 			$fileCSS = self::DATADIRECTORY  . $this->getUrl(0) . '.css' ;
@@ -75,7 +74,7 @@ class search extends common {
 				mkdir (self::DATADIRECTORY, 0777, true);
 			}
 			// Générer la feuille de CSS
-			$style = '.searchItem {background: ' . $this->getData(['module', $this->getUrl(0), 'theme', 'keywordColor']) . ';}';
+			$style = '.keywordColor {background: ' . $this->getData(['module', $this->getUrl(0), 'theme', 'keywordColor']) . ';}';
 			// Sauver la feuille de style
 			$success = file_put_contents( $fileCSS, $style);
 			// Nettoyage des données précédentes
@@ -84,6 +83,8 @@ class search extends common {
 			$this->deleteData(['module', $this->getUrl(0), 'resultHideContent']);
 			$this->deleteData(['module', $this->getUrl(0), 'previewLength']);
 			$this->deleteData(['module', $this->getUrl(0), 'keywordColor']);
+
+			$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '2.0']);
 		}
 	}
 
@@ -99,9 +100,9 @@ class search extends common {
 		$this->setData(['module', $moduleId, 'config',init::$defaultData ]);
 		// Données de thème
 		$this->setData(['module', $moduleId, 'theme',init::$defaultTheme ]);
-		// Feuille de style
+
 		// Générer la feuille de CSS
-		$style = '.searchItem {background: rgba(229, 229, 1, 1);}';
+		$style = '.keywordColor {background: ' . $this->getData([ 'module', $moduleId, 'theme', 'keywordColor'  ]) . ';}';
 
 		// Dossier de l'instance
 		if (!is_dir(self::DATADIRECTORY)) {
@@ -119,14 +120,14 @@ class search extends common {
 	// Configuration vide
 	public function config() {
 
+		// Mise à jour des données de module
+		$this->update();
+
 		// Initialisation d'un nouveau module
 		if ($this->getData(['module', $this->getUrl(0)]) === null) {
 			$this->init($this->getUrl(0));
 		}
 
-		// Mise à jour des données de module
-		$this->update();
-
 		if($this->isPost())  {
 
 			// Générer la feuille de CSS
@@ -173,14 +174,14 @@ class search extends common {
 
 	public function index() {
 
+		// Mise à jour des données de module
+		$this->update();
+
 		// Initialisation d'un nouveau module
 		if ($this->getData(['module', $this->getUrl(0)]) === null) {
 			$this->init($this->getUrl(0));
 		}
 
-		// Mise à jour des données de module
-		$this->update();
-
 		if($this->isPost())  {
 			//Initialisations variables
 			$success = true;

From 1f32a6e7cc5be17d6f5c9cd24246c238ba9422d6 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 9 Apr 2021 11:34:16 +0200
Subject: [PATCH 07/11] News tester update

---
 module/news/news.php                  | 68 +++++++++++++++------------
 module/news/ressource/defaultdata.php | 13 +++++
 module/news/view/config/config.php    |  2 +-
 3 files changed, 52 insertions(+), 31 deletions(-)
 create mode 100644 module/news/ressource/defaultdata.php

diff --git a/module/news/news.php b/module/news/news.php
index 65b13fb9..e5ef6a8f 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -168,6 +168,11 @@ class news extends common {
 		// Mise à jour des données de module
 		$this->update();
 
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
 		// Soumission du formulaire
 		if($this->isPost()) {
 
@@ -179,17 +184,21 @@ class news extends common {
 			}
 
 			$success = file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '.css' , $style );
+
 			// Fin feuille de style
 
+			$this->setData(['module', $this->getUrl(0), 'theme',[
+				'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '.css' : '',
+				'itemsHeight' => $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT)
+			]]);
+
 			$this->setData(['module', $this->getUrl(0), 'config',[
 				'feeds' 	 => $this->getInput('newsConfigShowFeeds',helper::FILTER_BOOLEAN),
 				'feedsLabel' => $this->getInput('newsConfigFeedslabel',helper::FILTER_STRING_SHORT),
 				'itemsperPage' => $this->getInput('newsConfigItemsperPage', helper::FILTER_INT,true),
 				'itemsperCol' => $this->getInput('newsConfigItemsperCol', helper::FILTER_INT,true),
-				'itemsHeight' => $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT),
-				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']),
-				'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '.css' : ''
-				]]);
+				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
+			]]);
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
@@ -337,6 +346,13 @@ class news extends common {
 
 		// Mise à jour des données de module
 		$this->update();
+
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
+
 		// Affichage d'un article
 		if(
 			$this->getUrl(1)
@@ -423,45 +439,37 @@ class news extends common {
 	 */
 	private function update() {
 
-		// Initialisation du thème du nouveau module
-		$this->initCss($this->getUrl(0));
-
 		// Version 3.0
-		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '3.0', '<') ) {
-			$this->setData(['module', $this->getUrl(0), 'config', 'itemsperPage', 16]);
-			$this->setData(['module', $this->getUrl(0), 'config', 'itemsperCol', 6]);
-			$this->setData(['module', $this->getUrl(0), 'config', 'versionData','3.0']);
-
+		if ($this->getData(['module', $this->getUrl(0), 'config']) === NULL ) {
+			// Données config et theme absentes du précédent module
+			$this->init($this->getUrl(0));
 		}
 	}
 
 	/**
 	 * Initialisation du thème d'un nouveau module
 	 */
-	private function initCSS($moduleId) {
+	private function init($moduleId) {
 		// Variable commune
 		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
 
-		// Absence des données CSS
-		if ( $this->getData(['module', $moduleId, 'config', 'itemsHeight']) === null ) {
+		// Données du module 
+		require_once('module/news/ressource/defaultdata.php');
+		$this->setData(['module', $moduleId, 'config',init::$defaultData ]);
+		// Données de thème
+		$this->setData(['module', $moduleId, 'theme',init::$defaultTheme ]);
 
-			$this->setData(['module', $moduleId, 'config', 'itemsHeight', '200px']);
+		// Générer la feuille de CSS
+		$style = '.newsContent {height: ' . $this->getData([ 'module', $moduleId, 'theme', 'itemsHeight' ]) .';}';
+		// Dossier de l'instance
+		if (!is_dir(self::DATADIRECTORY)) {
+			mkdir (self::DATADIRECTORY, 0777, true);
 		}
-		// Absence de la feuille de style
-		if (!file_exists(self::DATADIRECTORY . $moduleId . '.css') ) {
-			// Générer la feuille de CSS
-			$style = '.newsContent {height: 200px;}';
 
-			// Dossier de l'instance
-			if (!is_dir(self::DATADIRECTORY)) {
-				mkdir (self::DATADIRECTORY, 0777, true);
-			}
+		// Sauver la feuille de style
+		file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
 
-			// Sauver la feuille de style
-			$success = file_put_contents(self::DATADIRECTORY .$moduleId . '.css' , $style );
-
-			// Nom de la feuille de style
-			$this->setData(['module', $moduleId, 'config', 'style', self::DATADIRECTORY . $moduleId . '.css']);
-		}
+		// Stocker le nom de la feuille de style
+		$this->setData(['module', $moduleId, 'theme', 'style', self::DATADIRECTORY . $moduleId . '.css']);
 	}
 }
diff --git a/module/news/ressource/defaultdata.php b/module/news/ressource/defaultdata.php
new file mode 100644
index 00000000..25eb86e3
--- /dev/null
+++ b/module/news/ressource/defaultdata.php
@@ -0,0 +1,13 @@
+<?php
+class init extends search {
+    public static $defaultData = [
+        'feeds'              => false,
+        'feedsLabel'         => '',
+        'itemsperPage'       => 16,
+        'itemsperCol'        => 6,
+        'versionData'        => '3.0'
+    ];
+    public static $defaultTheme = [
+        'itemsHeight'        => '200px',
+    ];
+}
\ No newline at end of file
diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php
index b9cee0bd..8597e346 100755
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@@ -55,7 +55,7 @@
 					<div class="col4">
 						<?php echo template::select('newsConfigItemsHeight', $module::$ItemsHeight, [
 							'label' => 'Hauteur',
-							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsHeight'])
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsHeight'])
 						]); ?>
 					</div>
 				</div>

From 5e481ca3d70bd4370c043e70ec952a2fa5a7857c Mon Sep 17 00:00:00 2001
From: F Tempez <ftempez@gmail.com>
Date: Fri, 9 Apr 2021 13:29:11 +0200
Subject: [PATCH 08/11] News OK + blur option

---
 module/news/news.php                  | 33 +++++++++++++++++++--------
 module/news/ressource/defaultdata.php |  5 ++--
 module/news/view/config/config.php    | 19 +++++++++------
 module/news/view/index/index.css      | 21 ++++++++---------
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/module/news/news.php b/module/news/news.php
index e5ef6a8f..a49b8afa 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -44,7 +44,7 @@ class news extends common {
 	public static $users = [];
 
 	// Nombre d'objets par page
-	public static $ItemsList = [
+	public static $itemsList = [
 		4 => '4 articles',
 		8 => '8 articles',
 		12 => '12 articles',
@@ -52,7 +52,7 @@ class news extends common {
 		22 => '22  articles'
 	];
 	// Nombre de colone par page
-	public static $Columns = [
+	public static $columns = [
 		12 => '1 Colonne',
 		6 => '2 Colonnes',
 		4 => '3 Colonnes',
@@ -60,10 +60,18 @@ class news extends common {
 	];
 	public static $nbrCol = 1;
 
-	public static $ItemsHeight = [
-		'200px' 	=> 'Petit',
-		'300px' 	=> 'Moyen',
-		'400px' 	=> 'Grand'
+	public static $itemsHeight = [
+		'200px' 	=> 'Petite',
+		'300px' 	=> 'Moyenne',
+		'400px' 	=> 'Grande',
+		'auto'		=> 'Article complet'
+	];
+
+	public static $itemsBlur = [
+		'100%'		=> 'Aucun',
+		'90%' 		=> 'Petit',
+		'80%' 		=> 'Moyen',
+		'70%' 		=> 'Grand',
 	];
 
 	// Signature de l'article
@@ -176,8 +184,11 @@ class news extends common {
 		// Soumission du formulaire
 		if($this->isPost()) {
 
-			// Générer la feuille de CSS
+			// Générer la feuille de CSS 
 			$style = '.newsContent {height:' . $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT) . ';}';
+			$style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) . ',#FFF );';
+			$style .= '	background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}';
+			
 			// Dossier de l'instance
 			if (!is_dir(self::DATADIRECTORY)) {
 				mkdir (self::DATADIRECTORY, 0777, true);
@@ -189,7 +200,8 @@ class news extends common {
 
 			$this->setData(['module', $this->getUrl(0), 'theme',[
 				'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '.css' : '',
-				'itemsHeight' => $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT)
+				'itemsHeight' => $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT),
+				'itemsBlur' => $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT)
 			]]);
 
 			$this->setData(['module', $this->getUrl(0), 'config',[
@@ -405,7 +417,7 @@ class news extends common {
 				'showBarEditButton' => true,
 				'showPageContent' => true,
 				'view' => 'index',
-				'style' => $this->getData(['module', $this->getUrl(0),'config', 'style'])
+				'style' => $this->getData(['module', $this->getUrl(0),'theme', 'style'])
 			]);
 
 		}
@@ -461,6 +473,9 @@ class news extends common {
 
 		// Générer la feuille de CSS
 		$style = '.newsContent {height: ' . $this->getData([ 'module', $moduleId, 'theme', 'itemsHeight' ]) .';}';
+		$style .= '.newsBlur {background: linear-gradient(#333 ' .  $this->getData([ 'module', $moduleId, 'theme', 'itemsBlur' ]) . ',#FFF );';
+		$style .= '	background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}';
+		
 		// Dossier de l'instance
 		if (!is_dir(self::DATADIRECTORY)) {
 			mkdir (self::DATADIRECTORY, 0777, true);
diff --git a/module/news/ressource/defaultdata.php b/module/news/ressource/defaultdata.php
index 25eb86e3..cf2d5649 100644
--- a/module/news/ressource/defaultdata.php
+++ b/module/news/ressource/defaultdata.php
@@ -3,11 +3,12 @@ class init extends search {
     public static $defaultData = [
         'feeds'              => false,
         'feedsLabel'         => '',
-        'itemsperPage'       => 16,
-        'itemsperCol'        => 6,
+        'itemsperPage'       => 8,
+        'itemsperCol'        => 12,
         'versionData'        => '3.0'
     ];
     public static $defaultTheme = [
         'itemsHeight'        => '200px',
+        'itemsBlur'         => '0%'
     ];
 }
\ No newline at end of file
diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php
index 8597e346..114beb98 100755
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@@ -37,27 +37,32 @@
 						]); ?>
 					</div>
 				</div>
-				<!-- Block ajouté pour le sélecteur -->	
 				<div class="row">
-					<div class="col4">
-						<?php echo template::select('newsConfigItemsperCol', $module::$Columns, [
+					<div class="col3">
+						<?php echo template::select('newsConfigItemsperCol', $module::$columns, [
 							'label' => 'Pagination',
 							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol']),
 							'help' => 'Nombre de colonnes par page'
 						]); ?>
 					</div>
-					<div class="col4">
-						<?php echo template::select('newsConfigItemsperPage', $module::$ItemsList, [
+					<div class="col3">
+						<?php echo template::select('newsConfigItemsperPage', $module::$itemsList, [
 							'label' => 'Articles par page',
 							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
 						]); ?>
 					</div>
-					<div class="col4">
-						<?php echo template::select('newsConfigItemsHeight', $module::$ItemsHeight, [
+					<div class="col3">
+						<?php echo template::select('newsConfigItemsHeight', $module::$itemsHeight, [
 							'label' => 'Hauteur',
 							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsHeight'])
 						]); ?>
 					</div>
+					<div class="col3">
+						<?php echo template::select('newsConfigItemsBlur', $module::$itemsBlur, [
+							'label' => 'Effet flou',
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsBlur'])
+						]); ?>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css
index 01708395..04b5023c 100755
--- a/module/news/view/index/index.css
+++ b/module/news/view/index/index.css
@@ -23,22 +23,19 @@
 }*/
 .newsContent {
 	overflow: hidden; /* les dépassements seront masqués */
-	position: relative;
-}
-
-.newsBlur {
-	background: linear-gradient(#333 70%,#FFF );
-	background-clip: text;
-  	-webkit-background-clip: text;
-  	-webkit-text-fill-color: transparent;
-}
-
-
-.newsContent {
+	position: relative;	
 	clear: left;
 	margin-left: 10px;
 	margin-bottom: 5px;
 }
+/*
+.newsBlur {
+	background: linear-gradient(#333 90%,#FFF );
+	background-clip: text;
+  	-webkit-background-clip: text;
+  	-webkit-text-fill-color: transparent;
+}*/
+
 
 .newsSignature {
 	margin-right: 10px;

From 080a601c3faa72dd1db4bd143b76986a4abfb0bc Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 9 Apr 2021 14:42:21 +0200
Subject: [PATCH 09/11] News option blur ok

---
 module/news/news.php               | 6 +++---
 module/news/view/config/config.php | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/news/news.php b/module/news/news.php
index a49b8afa..4af1cb48 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -69,9 +69,9 @@ class news extends common {
 
 	public static $itemsBlur = [
 		'100%'		=> 'Aucun',
-		'90%' 		=> 'Petit',
-		'80%' 		=> 'Moyen',
-		'70%' 		=> 'Grand',
+		'90%' 		=> 'Faible',
+		'75%' 		=> 'Modéré',
+		'60%' 		=> 'Important',
 	];
 
 	// Signature de l'article
diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php
index 114beb98..a86fc1e4 100755
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@@ -54,13 +54,15 @@
 					<div class="col3">
 						<?php echo template::select('newsConfigItemsHeight', $module::$itemsHeight, [
 							'label' => 'Hauteur',
-							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsHeight'])
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsHeight']),
+							'help' => 'Limite la hauteur de l\'article, cette option est utile lorsque la pagination en colonnes est activée.'
 						]); ?>
 					</div>
 					<div class="col3">
 						<?php echo template::select('newsConfigItemsBlur', $module::$itemsBlur, [
 							'label' => 'Effet flou',
-							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsBlur'])
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'itemsBlur']),
+							'help' => 'Effet appliqué en bas de l\'article afin d\'éviter une coupure brutale quand la hauteur de l\'article n\'est pas définie sur Article Complet'
 						]); ?>
 					</div>
 				</div>

From 1c1a97c22a50cae024857c769c6d89f53e373fb3 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 9 Apr 2021 16:42:13 +0200
Subject: [PATCH 10/11] Gallery WIP

---
 core/core.php                            |   2 +-
 module/gallery/gallery.php               | 154 ++++++++++++-----------
 module/gallery/ressource/defaultdata.php |   8 +-
 module/gallery/view/edit/edit.php        |   8 +-
 module/gallery/view/gallery/gallery.php  |   2 +-
 module/gallery/view/theme/theme.php      |  28 ++---
 6 files changed, 106 insertions(+), 96 deletions(-)

diff --git a/core/core.php b/core/core.php
index 8cbbc2ea..4d73dc93f 100755
--- a/core/core.php
+++ b/core/core.php
@@ -1608,7 +1608,7 @@ class common {
 				){
 					if(class_exists($parent)) {
 						$module = new $moduleId;
-						$module->update($parent);
+					//	$module->update($parent);
 					}
 				}
 			}
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index ce00c9b8..2346ba3c 100755
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -149,61 +149,51 @@ class gallery extends common {
 	 */
 	private function update() {
 
-		// Mise à jour d'une version inférieure, la gallerye existe
-		if ($this->getData(['module', $this->getUrl(0)]) ) {
-			if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '3.0', '<') ) {
-				// Changement de l'arborescence dans module.json
-				$data = $this->getData(['module', $this->getUrl(0)]);
-				$this->deleteData(['module', $this->getUrl(0)]);
-				$this->setData(['module', $this->getUrl(0), 'content', $data]);
-				// Effacer les fichiers CSS de l'ancienne version
-				if (file_exists('module/gallery/view/index/index.css')) {
-					unlink('module/gallery/view/index/index.css');
-				}
-				if (file_exists('module/gallery/view/gallery/gallery.css')) {
-					unlink('module/gallery/view/gallery/gallery.css');
-				}
-				// Stockage des données du thème de la gallery
+		// Mise à jour d'une version inférieure, la gallery existe mais pas content
+		if ($this->getData(['module', $this->getUrl(0)]) &&
+			$this->getData(['module', $this->getUrl(0), 'content']) === NULL  ) {
+
+			// Changement de l'arborescence dans module.json
+			$data = $this->getData(['module', $this->getUrl(0)]);
+			$this->deleteData(['module', $this->getUrl(0)]);
+			$this->setData(['module', $this->getUrl(0), 'content', $data]);
+
+			// Effacer les fichiers CSS de l'ancienne version
+			if (file_exists('module/gallery/view/index/index.css')) {
+				unlink('module/gallery/view/index/index.css');
+			}
+			if (file_exists('module/gallery/view/gallery/gallery.css')) {
+				unlink('module/gallery/view/gallery/gallery.css');
+			}
+			// Stockage des données du thème de la gallery existant
+			if (is_array($this->getData(['theme','gallery']))) {
 				$data = $this->getData(['theme','gallery']);
 				$this->deleteData(['theme','gallery']);
-				$this->setData(['module', $this->getUrl(0), 'config', $data]);
-				// Nouvelle version
-				$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.0']);
-			}	
-		} else {
-			//la galerie n'existe pas, initialiser le CSS
-			$this->initCss($this->getUrl(0));
+				$this->setData(['module', $this->getUrl(0), 'theme', $data]);
+				// Nom de la feuille de style
+				$this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY  . $moduleId . '.css']);
+			} else {
+				// Theme par défaut
+				$this->init($this->geturl(0));
+			}
+			// Nouvelle version
+			$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.0']);
 		}
-
 	}
 
 	/**
-	 * Initialisation du thème d'un nouveau module
+	 * Initialisation séparément les éléments absents
+	 * Thème
+	 * Config
+	 * Content
 	 */
-	private function initCSS($moduleId) {
+	private function init($moduleId) {
 		// Variable commune
 		$fileCSS = self::DATADIRECTORY  . $moduleId . '.css' ;
-		// Check la présence de la config
-		if ( $this->getData(['module', $moduleId, 'config']) === null ) {
+		// Check la présence du thème
+		if ( $this->getData(['module', $moduleId, 'theme']) === null ) {
 			require_once('module/gallery/ressource/defaultdata.php');
-			$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']
-			]]);
+			$this->setData(['module', $moduleId, 'theme', theme::$defaultTheme]);
 		}
 		// Check la présence de la feuille de style
 		if ( !file_exists(self::DATADIRECTORY  . $moduleId . '.css')) {
@@ -212,30 +202,40 @@ class gallery extends common {
 				mkdir (self::DATADIRECTORY, 0777, true);
 			}
 			// Nom de la feuille de style
-			$this->setData(['module', $moduleId, 'config', 'style', $fileCSS]);
+			$this->setData(['module', $moduleId, 'theme', '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', $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 );
+			$content = str_replace('#thumbAlign#',$this->getData(['module', $moduleId, 'theme', 'thumbAlign']),$content );
+			$content = str_replace('#thumbWidth#',$this->getData(['module', $moduleId, 'theme', 'thumbWidth']),$content );
+			$content = str_replace('#thumbHeight#',$this->getData(['module', $moduleId, 'theme', 'thumbHeight']),$content );
+			$content = str_replace('#thumbMargin#',$this->getData(['module', $moduleId, 'theme', 'thumbMargin']),$content );
+			$content = str_replace('#thumbBorder#',$this->getData(['module', $moduleId, 'theme', 'thumbBorder']),$content );
+			$content = str_replace('#thumbBorderColor#',$this->getData(['module', $moduleId, 'theme', 'thumbBorderColor']),$content );
+			$content = str_replace('#thumbOpacity#',$this->getData(['module', $moduleId, 'theme', 'thumbOpacity']),$content );
+			$content = str_replace('#thumbShadows#',$this->getData(['module', $moduleId, 'theme', 'thumbShadows']),$content );
+			$content = str_replace('#thumbShadowsColor#',$this->getData(['module', $moduleId, 'theme', 'thumbShadowsColor']),$content );
+			$content = str_replace('#thumbRadius#',$this->getData(['module', $moduleId, 'theme', 'thumbRadius']),$content );
+			$content = str_replace('#legendAlign#',$this->getData(['module', $moduleId, 'theme', 'legendAlign']),$content );
+			$content = str_replace('#legendHeight#',$this->getData(['module', $moduleId, 'theme', 'legendHeight']),$content );
+			$content = str_replace('#legendTextColor#',$this->getData(['module', $moduleId, 'theme', 'legendTextColor']),$content );
+			$content = str_replace('#legendBgColor#',$this->getData(['module', $moduleId, 'theme', 'legendBgColor']),$content );
 			// Ecriture de la feuille de style
 			file_put_contents(self::DATADIRECTORY . $moduleId . '.css' , $content . $themeCss);
 		}
+		// Check Config
+		if ( $this->getData(['module', $moduleId, 'config']) === null ) {
+			require_once('module/gallery/ressource/defaultdata.php');
+			$this->setData(['module', $moduleId, 'config', theme::$defaultData]);
+		}
+
+		// Contenu vide de la galerie
+		if (!is_array($this->getData(['module', $this->getUrl(0), 'content'])) ) {
+			$this->setData(['module', $this->getUrl(0), 'content', array() ]);
+		}
 	}
 
 
@@ -250,16 +250,16 @@ class gallery extends common {
 			for($i=0;$i<count($data);$i++) {
 				$this->setData(['module', $this->getUrl(0), 'content', $data[$i], [
 					'config' => [
-						'name' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','name']),
-						'directory' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','directory']),
-						'homePicture' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','homePicture']),
-						'sort' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','sort']),
+						'name' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'config','name']),
+						'directory' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'config','directory']),
+						'homePicture' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'config','homePicture']),
+						'sort' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'config','sort']),
 						'position'=> $i,
-						'fullScreen' => $this->getData(['module',$this->getUrl(0),$data[$i],'config','fullScreen'])
+						'fullScreen' => $this->getData(['module',$this->getUrl(0), 'content',$data[$i],'config','fullScreen'])
 
 					],
-					'legend' => $this->getData(['module',$this->getUrl(0),$data[$i],'legend']),
-					'positions' => $this->getData(['module',$this->getUrl(0),$data[$i],'positions'])
+					'legend' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'legend']),
+					'positions' => $this->getData(['module',$this->getUrl(0), 'content', $data[$i],'positions'])
 				]]);
 			}
 		}
@@ -300,6 +300,11 @@ class gallery extends common {
 		// Mise à jour des données de module
 		$this->update();
 
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
 		//Affichage de la galerie triée
 		$g = $this->getData(['module', $this->getUrl(0), 'content']);
 		$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
@@ -583,6 +588,11 @@ class gallery extends common {
 		// Mise à jour des données de module
 		$this->update();
 
+		// Initialisation d'un nouveau module
+		if ($this->getData(['module', $this->getUrl(0)]) === null) {
+			$this->init($this->getUrl(0));
+		}
+
 		// Images d'une galerie
 		if($this->getUrl(1)) {
 			// La galerie n'existe pas
@@ -641,7 +651,7 @@ class gallery extends common {
 						'showBarEditButton' => true,
 						'title' => $this->getData(['module', $this->getUrl(0), 'content', $this->getUrl(1), 'config', 'name']),
 						'view' => 'gallery',
-						'style' => $this->getData(['module', $this->getUrl(0), 'config', 'style'])
+						'style' => $this->getData(['module', $this->getUrl(0), 'theme', 'style'])
 					]);
 				}
 				// Pas d'image dans la galerie
@@ -704,7 +714,7 @@ class gallery extends common {
 				'showBarEditButton' => true,
 				'showPageContent' => true,
 				'view' => 'index',
-				'style' => $this->getData(['module', $this->getUrl(0), 'config', 'style'])
+				'style' => $this->getData(['module', $this->getUrl(0), 'theme', 'style'])
 			]);
 		}
 	}
@@ -730,7 +740,7 @@ class gallery extends common {
 			}
 			$fileCSS = self::DATADIRECTORY . $this->getUrl(0) . '.css' ;
 			// Fin feuille de style
-			$this->getData(['module', $this->getUrl(0), 'config', [
+			$this->getData(['module', $this->getUrl(0), 'theme', [
 					'thumbAlign' 	    => $this->getinput('galleryThemeThumbAlign'),
 					'thumbWidth' 	    => $this->getinput('galleryThemeThumbWidth'),
 					'thumbHeight'	    => $this->getinput('galleryThemeThumbHeight'),
@@ -746,9 +756,7 @@ class gallery extends common {
 					'legendTextColor'   => $this->getinput('galleryThemeLegendTextColor'),
 					'legendBgColor'	    => $this->getinput('galleryThemeLegendBgColor'),
 					'style'				=> $fileCSS,
-					'version'			=> $this->getData(['module', $this->getUrl(0), 'config', 'version'])
-				]
-			]);
+			]]);
 			// Création des fichiers CSS
 			$content = file_get_contents('module/gallery/ressource/vartheme.css');
 			$themeCss = file_get_contents('module/gallery/ressource/theme.css');
diff --git a/module/gallery/ressource/defaultdata.php b/module/gallery/ressource/defaultdata.php
index 22777389..737999c3 100755
--- a/module/gallery/ressource/defaultdata.php
+++ b/module/gallery/ressource/defaultdata.php
@@ -1,6 +1,6 @@
 <?php
 class theme extends gallery {
-	public static $defaultData = [
+	public static $defaultTheme = [
             'thumbAlign' 	   => 'center',
             'thumbWidth' 	   => '18em',
             'thumbHeight'	   => '15em',
@@ -14,7 +14,9 @@ class theme extends gallery {
             'legendHeight'	   => '.375em',
             'legendAlign'	   => 'center',
             'legendTextColor'  => 'rgba(255, 255, 255, 1)',
-            'legendBgColor'	   => 'rgba(0, 0, 0, .6)',
-            'versionData'      =>  '3.0'
+            'legendBgColor'	   => 'rgba(0, 0, 0, .6)'
+    ];
+    public static $defaultData = [
+            'versionData'      => '3.0'
     ];
 }
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index c8f74f42..df001bf7 100755
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@@ -38,22 +38,22 @@
 							'selected' => $this->getData(['module', $this->getUrl(0), 'content', $this->getUrl(2), 'config', 'sort']),
 							'label' => 'Tri des images',
 							'help' => 'Tri manuel : déplacez le images dans le tableau ci-dessous. L\'ordre est sauvegardé automatiquement.'
-						]); ?>	
+						]); ?>
 					</div>
 				<div clas="row">
 					<div class="col12">
                         <?php echo template::checkbox('galleryEditFullscreen', true, 'Mode plein écran automatique' , [
 								'checked' => $this->getData(['module', $this->getUrl(0), 'content', $this->getUrl(2), 'config', 'fullScreen']),
 								'help' => 'A l\'ouverture de la galerie, la première image est affichée en plein écran.'
-                            ]); ?>  
-					</div>		
+                            ]); ?>
+					</div>
 				</div>
 				<div class="row">
 					<div class="col12">
 						<?php if($module::$pictures): ?>
 							<?php echo template::table([1, 4, 1, 5, 1], $module::$pictures, ['','Image', 'Couverture','Légende',''],['id' => 'galleryTable'], $module::$picturesId ); ?>
 							<?php echo template::hidden('galleryEditFormResponse'); ?>
-							<?php echo template::hidden('galleryEditFormGalleryName',['value' => $this->getUrl(2)]); ?>						
+							<?php echo template::hidden('galleryEditFormGalleryName',['value' => $this->getUrl(2)]); ?>
 						<?php else: ?>
 							<?php echo template::speech('Aucune image.'); ?>
 						<?php endif; ?>
diff --git a/module/gallery/view/gallery/gallery.php b/module/gallery/view/gallery/gallery.php
index b7a68a99..9e617583 100755
--- a/module/gallery/view/gallery/gallery.php
+++ b/module/gallery/view/gallery/gallery.php
@@ -13,7 +13,7 @@
 	<div class="colPicture">
 		<a
 			href="<?php echo helper::baseUrl(false) . $picture; ?>"
-			<?php if ( $picture === $this->getdata(['module',$this->getUrl(0),$this->getUrl(1),'config','homePicture']) )  {
+			<?php if ( $picture === $this->getdata(['module',$this->getUrl(0),'content',$this->getUrl(1),'config','homePicture']) )  {
 							echo 'id="homePicture"'; }	?>
 			class="galleryGalleryPicture"
 			style="background-image:url('<?php echo helper::baseUrl(false) . $module::$thumbs[$picture]; ?>')"
diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php
index 5110b148..91abfa84 100755
--- a/module/gallery/view/theme/theme.php
+++ b/module/gallery/view/theme/theme.php
@@ -25,25 +25,25 @@
                     <div class="col3">
                         <?php echo template::select('galleryThemeThumbWidth', $module::$galleryThemeSizeWidth, [
                             'label' => 'Largeur',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbWidth'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbWidth'])
                         ]); ?>
                     </div>
                     <div class="col3">
                         <?php echo template::select('galleryThemeThumbHeight', $module::$galleryThemeSizeHeight, [
                             'label' => 'Hauteur',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbHeight'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbHeight'])
                         ]); ?>
                     </div>
                     <div class="col4">
                         <?php echo template::select('galleryThemeThumbAlign', $module::$galleryThemeFlexAlign, [
 							'label' => 'Alignement',
-							'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbAlign'])
+							'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbAlign'])
 						]); ?>
                     </div>
                     <div class="col2">
                         <?php echo template::select('galleryThemeThumbMargin', $module::$galleryThemeMargin, [
                             'label' => 'Marge',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbMargin'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbMargin'])
                         ]); ?>
                     </div>
                 </div>
@@ -51,7 +51,7 @@
                     <div class="col4">
                         <?php echo template::select('galleryThemeThumbBorder', $module::$galleryThemeBorder, [
                             'label' => 'Bordure',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbBorder'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbBorder'])
                         ]); ?>
                     </div>
                     <div class="col4">
@@ -59,13 +59,13 @@
                             'class' => 'colorPicker',
                             'help' => 'Le curseur horizontal règle le niveau de transparence.',
                             'label' => 'Couleur de la bordure',
-                            'value' => $this->getData(['module', $this->getUrl(0), 'config','thumbBorderColor'])
+                            'value' => $this->getData(['module', $this->getUrl(0), 'theme','thumbBorderColor'])
                         ]); ?>
                     </div>
                     <div class="col4">
                         <?php echo template::select('galleryThemeThumbRadius', $module::$galleryThemeRadius, [
                             'label' => 'Arrondi des angles',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbRadius'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbRadius'])
                         ]); ?>
                     </div>
                 </div>
@@ -73,7 +73,7 @@
                     <div class="col4">
                         <?php echo template::select('galleryThemeThumbShadows', $module::$galleryThemeShadows, [
                             'label' => 'Ombre',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbShadows'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbShadows'])
                         ]); ?>
                     </div>
                     <div class="col4">
@@ -81,13 +81,13 @@
                             'class' => 'colorPicker',
                             'help' => 'Le curseur horizontal règle le niveau de transparence.',
                             'label' => 'Couleur de l\'ombre',
-                            'value' => $this->getData(['module', $this->getUrl(0), 'config','thumbShadowsColor'])
+                            'value' => $this->getData(['module', $this->getUrl(0), 'theme','thumbShadowsColor'])
                         ]); ?>
                     </div>
                     <div class="col4">
                         <?php echo template::select('galleryThemeThumbOpacity', $module::$galleryThemeOpacity, [
                             'label' => 'Opacité au survol',
-                            'selected' => $this->getData(['module', $this->getUrl(0), 'config','thumbOpacity'])
+                            'selected' => $this->getData(['module', $this->getUrl(0), 'theme','thumbOpacity'])
                         ]); ?>
                     </div>
                 </div>
@@ -108,7 +108,7 @@
                         'class' => 'colorPicker',
                         'help' => 'Le curseur horizontal règle le niveau de transparence.',
                         'label' => 'Texte',
-                        'value' => $this->getData(['module', $this->getUrl(0), 'config','legendTextColor'])
+                        'value' => $this->getData(['module', $this->getUrl(0), 'theme','legendTextColor'])
                     ]); ?>
                 </div>
                 <div class="col3">
@@ -116,19 +116,19 @@
                         'class' => 'colorPicker',
                         'help' => 'Le curseur horizontal règle le niveau de transparence.',
                         'label' => 'Fond',
-                        'value' => $this->getData(['module', $this->getUrl(0), 'config','legendBgColor'])
+                        'value' => $this->getData(['module', $this->getUrl(0), 'theme','legendBgColor'])
                     ]); ?>
                 </div>
                 <div class="col3">
                     <?php echo template::select('galleryThemeLegendHeight', $module::$galleryThemeLegendHeight, [
                         'label' => 'Hauteur',
-                        'selected' => $this->getData(['module', $this->getUrl(0), 'config','legendHeight'])
+                        'selected' => $this->getData(['module', $this->getUrl(0), 'theme','legendHeight'])
                     ]); ?>
                 </div>
                 <div class="col3">
                     <?php echo template::select('galleryThemeLegendAlign', $module::$galleryThemeAlign, [
                         'label' => 'Alignement',
-                        'selected' => $this->getData(['module', $this->getUrl(0), 'config','legendAlign'])
+                        'selected' => $this->getData(['module', $this->getUrl(0), 'theme','legendAlign'])
                     ]); ?>
                 </div>
             </div>

From 39a449d92ad301f1681c0a64206dce703629e110 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 11 Apr 2021 09:08:22 +0200
Subject: [PATCH 11/11] activation core auto update modules

---
 core/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core.php b/core/core.php
index 4d73dc93f..8cbbc2ea 100755
--- a/core/core.php
+++ b/core/core.php
@@ -1608,7 +1608,7 @@ class common {
 				){
 					if(class_exists($parent)) {
 						$module = new $moduleId;
-					//	$module->update($parent);
+						$module->update($parent);
 					}
 				}
 			}