From 6deda024c85daec9cae9f5bcd4c51b9d1a5445ab Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Mar 2022 10:47:15 +0100
Subject: [PATCH 01/26] init

---
 core/module/page/view/edit/edit.js.php | 40 ++++++++++++++------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index e344bd80..023a1a5e 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -239,9 +239,10 @@ $( document ).ready(function() {
 	 */
 		 if ($("#pageEditExtraPosition").val() == 1 ) {
 			var positionDOM = $("#pageEditPosition");
-			var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
-			buildPagesList(true);
-			$("#pageEditPosition").val(positionInitial);
+			positionDOM.empty().append(
+				$("<option>").val(0).text("Ne pas afficher"),
+				$("<option>").val(1).text("Au début")
+			);
 		}
 
 });
@@ -522,9 +523,14 @@ pageTypeMenuDOM.on("change", function() {
 
 $("#pageEditExtraPosition").on("change", function() {
 	if ($("#pageEditExtraPosition").val() == 1 ) {
-		buildPagesList(true);
+
+		var positionDOM = $("#pageEditPosition");
+		positionDOM.empty().append(
+			$("<option>").val(0).text("Ne pas afficher"),
+			$("<option>").val(1).text("Au début")
+		);
 	} else {
-		buildPagesList(false);
+		getPages();
 		//$("#pageEditParentPageId").trigger("change");
 	}
 });
@@ -540,14 +546,14 @@ $("#pageEditModuleConfig").on("click", function() {
  * Affiche les pages en fonction de la page parent dans le choix de la position
  */
 $("#pageEditParentPageId").on("change", function() {
-	buildPagesList(false);
+	getPages();
 }).trigger("change");
 
 /**
  * Construit un select contenant la liste des pages du site.
  */
 
-function buildPagesList(extraPosition) {
+function getPages() {
 	var hierarchy = <?php echo json_encode($this->getHierarchy()); ?>;
 	var pages = <?php echo json_encode($this->getData(['page'])); ?>;
 	var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
@@ -561,11 +567,12 @@ function buildPagesList(extraPosition) {
 	var positionSelected = 0;
 	var positionPrevious = 1;
 
-	// Aucune page parent sélectionnée
+	// Aucune page parent selectionnée
 	if(parentSelected === "") {
 		// Liste des pages sans parents
 		for(var key in hierarchy) {
-			if(hierarchy.hasOwnProperty(key) ) {
+			if(hierarchy.hasOwnProperty(key) &&
+				extraPosition == pages[key].extraPosition ) {
 				// Sélectionne la page avant s'il s'agit de la page courante
 				if(key === "<?php echo $this->getUrl(2); ?>") {
 					positionSelected = positionPrevious;
@@ -573,14 +580,11 @@ function buildPagesList(extraPosition) {
 				// Sinon ajoute la page à la liste
 				else {
 					// Enregistre la position de cette page afin de la sélectionner si la prochaine page de la liste est la page courante
-					if (extraPosition == pages[key].extraPosition ) {
-						positionPrevious++;
-						// Ajout à la liste
-						positionDOM.append(
-							$("<option>").val(positionPrevious).html("Après \"" + (pages[key].title) + "\"")
-						);
-					}
-
+					positionPrevious++;
+					// Ajout à la liste
+					positionDOM.append(
+						$("<option>").val(positionPrevious).html("Après \"" + (pages[key].title) + "\"")
+					);
 				}
 			}
 		}
@@ -588,7 +592,7 @@ function buildPagesList(extraPosition) {
 			positionSelected = 0;
 		}
 	}
-	// Une page parent est sélectionnée
+	// Un page parent est sélectionnée
 	else {
 		// Liste des pages enfants de la page parent
 		for(var i = 0; i < hierarchy[parentSelected].length; i++) {

From 9a469dc71cf9e2a16ac54b2d3e56e0244db7085e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 5 Mar 2022 15:49:03 +0100
Subject: [PATCH 02/26] =?UTF-8?q?websafe=20Manque=20pr=C3=A9visualisation?=
 =?UTF-8?q?=20dans=20la=20liste=20de=20fontes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                              |  4 ++
 README.md                               |  2 +-
 core/class/template.class.php           |  2 +-
 core/core.php                           | 65 +++++++++++++++++++------
 core/module/theme/theme.php             |  6 ++-
 core/module/theme/view/site/site.js.php |  1 -
 6 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4f9f6e82..f72b5c41 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
 # Changelog
 
 
+## Version 11.4.00
+### Amélioration :
+    - prise en charge des fontes Web Safe : Georgia, Times, Arial, Trebuchet, Lucida, Tahoma, Verdana, Courier et Monaco.
+
 ## Version 11.3.04
 ### Correction :
     - Duplication d'id dans le menu.
diff --git a/README.md b/README.md
index 9bdc898f..eb9e8330 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ZwiiCMS 11.3.04
+# ZwiiCMS 11.4.00
 
 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
 
diff --git a/core/class/template.class.php b/core/class/template.class.php
index d246b719..b412e3ea 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -649,7 +649,7 @@ class template {
                     '<option value="%s"%s style="font-family: %s;">%s</option>',
                     $value,
                     $attributes['selected'] == $value ? ' selected' : '', // Double == pour ignorer le type de variable car $_POST change les types en string
-                    core::$fonts[$value],
+                    $text,
                     $text
                 ) : sprintf(
                     '<option value="%s"%s>%s</option>',
diff --git a/core/core.php b/core/core.php
index dc38e1a5..08a9e3ae 100644
--- a/core/core.php
+++ b/core/core.php
@@ -185,37 +185,41 @@ class common {
 
 	// Fontes
 	public static $fonts = [
-		'abril-fatface' => 'Abril Fatface',
 		'arimo' => 'Arimo',
 		'arvo' => 'Arvo',
-		'berkshire-swash' => 'Berkshire Swash',
 		'dancing-script' => 'Dancing Script',
 		'droid-sans-2' => 'Droid Sans',
 		'droid-serif-2' => 'Droid Serif',
-		'fira-sans' => 'Fira Sans',
-		'genera' => 'Genera',
-		'inconsolata-2' => 'Inconsolata',
 		'indie-flower' => 'Indie Flower',
-		'josefin-sans-std' => 'Josefin Sans',
 		'liberation-sans' => 'Liberation Sans',
 		'liberation-serif' => 'Liberation Serif',
 		'lobster-2' => 'Lobster',
 		'lora' => 'Lora',
 		'lato' => 'Lato',
-		'montserrat-ace' => 'Montserrat Ace',
 		'old-standard-tt-3' => 'Old Standard TT',
 		'open-sans' => 'Open Sans',
 		'oswald-4' => 'Oswald',
 		'pt-mono' => 'PT Mono',
 		'pt-serif' => 'PT Serif',
-		'raleway-5' => 'Raleway',
 		'rancho' => 'Rancho',
 		'roboto' => 'Roboto',
-		'signika' => 'Signika',
 		'ubuntu' => 'Ubuntu',
 		'vollkorn' => 'Vollkorn'
 	];
 
+	public static $fontsWebSafe = [
+		'georgia' => 'Georgia, DejaVu Serif, Norasi, serif;',
+		'times' => 'Times, Times New Roman, Liberation Serif, FreeSerif, serif;',
+		'arial' => 'Arial, Helvetica, Liberation Sans, FreeSans, sans-serif;',
+		'trebuchet' => 'Trebuchet MS, Arial, Helvetica, sans-serif;',
+		'lucida' => 'Lucida Sans, Lucida Grande, Lucida Sans Unicode, Luxi Sans, sans-serif;',
+		'tahoma' => 'Tahoma, Geneva, Kalimati, sans-serif;',
+		'verdana' => 'Verdana, DejaVu Sans, Bitstream Vera Sans, Geneva, sans-serif;',
+		'impact' => 'Impact, Arial Black, sans-serif;',
+		'courrier' => 'Courier, Courier New, FreeMono, Liberation Mono, monospace;',
+		'monaco' => 'Monaco, DejaVu Sans Mono, Lucida Console, Andale Mono, monospace;'
+	];
+
 	/**
 	 * Constructeur commun
 	 */
@@ -2277,16 +2281,26 @@ class core extends common {
 			}
 		}
 
+		/**
+		 * Traitement des polices de caractères
+		 */
+
+		// Fusionne la liste des fontes avec les webSafe
+		foreach (self::$fontsWebSafe as $fontId => $fontValue) {
+			$fontName = explode (',', $fontValue);
+			self::$fonts [$fontId] = $fontName[0];
+		}
 		// Importe les polices personnalisées
 		$fontsImported = $this->getData(['fonts', 'imported']);
 		if (is_array($fontsImported) &&
 			!empty ($fontsImported)
 		) {
-			// Fusionner les fonts avec les fontes installées
+			// Fusionner avec les fontes installées
 			self::$fonts = array_merge(self::$fonts, $fontsImported);
-			// Tri Alphabétique
-			asort(self::$fonts);
+
 		}
+		// Tri Alphabétique
+		asort(self::$fonts);
 
 		// Crée le fichier de personnalisation avancée
 		if(file_exists(self::DATA_DIR.'custom.css') === false) {
@@ -2311,7 +2325,9 @@ class core extends common {
 
 			/**
 			 * Import des polices de caractères
-			 * A partir du CDN ou dans le dossier site/file/source/fonts
+			 * A partir du CDN
+			 * ou dans le dossier site/file/source/fonts
+			 * ou pas du tout si fonte webSafe
 			 */
 			$fonts = [ $this->getData(['theme', 'text',  'font']),
 						  $this->getData(['theme', 'title', 'font']),
@@ -2321,12 +2337,21 @@ class core extends common {
 			];
 			// Suppression des polices identiques
 			$fonts = array_unique($fonts);
-			// Lire le fichier des fontes locales
-			$localFonts = $this->getData(['fonts', 'files']);
+
+			/**
+			 * Fontes Web Safe, ne sont pas chargées.
+			 */
+			foreach ($fonts as $fontId) {
+				if (array_key_exists($fontId, self::$fontsWebSafe) ) {
+					unset($fonts[$fontId]);
+				}
+			}
 
 			/**
 			* Chargement des polices en ligne dans un fichier séparé
 			*/
+			// Lire le fichier des fontes locales
+			$localFonts = $this->getData(['fonts', 'files']);
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if (!array_key_exists($fontId, $localFonts) ) {
@@ -2549,6 +2574,16 @@ class core extends common {
 			];
 			// Suppression des polices identiques
 			$fonts = array_unique($fonts);
+
+			/**
+			 * Fontes Web Safe, ne sont pas chargées.
+			 */
+			foreach ($fonts as $fontId) {
+				if (array_key_exists($fontId, self::$fontsWebSafe) ) {
+					unset($fonts[$fontId]);
+				}
+			}
+
 			// Lire le fichier des fontes locales
 			$localFonts = $this->getData(['fonts', 'files']);
 
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 5f988d5d..19a209c1 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -574,11 +574,13 @@ class theme extends common {
 				}
 			}
 			self::$fontsList [] = [
-				$fontName,
+				'<span style="font-family:' . $fontName . '">' . $fontName . '</span>' ,
 				$fontId,
 				$fontUsed[$fontId],
 				//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
-				array_key_exists($fontId, $fonts['files']) ?  $fonts['files'][$fontId] : 'CDN Fonts',
+				array_key_exists($fontId, $fonts['files']) ?
+							 $fonts['files'][$fontId] : 
+							 (array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
 				array_key_exists($fontId, $fonts['imported']) || array_key_exists($fontId, $fonts['files'])
 					? 	template::button('themeFontDelete' . $fontId, [
 							'class' => 'themeFontDelete buttonRed',
diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php
index 3ff25012..c9b01d34 100644
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
@@ -37,7 +37,6 @@ $("input, select").on("change",function() {
 	var titleFontText = $("#themeTitleFont :selected").text();
 	var textFont = $("#themeTextFont :selected").val();
 	var textFontText = $("#themeTextFont :selected").text();
-	console.log(textFontText);
 	var css = "@import url('https://fonts.cdnfonts.com/css/" + titleFont +  "');";
 	var css = "@import url('https://fonts.cdnfonts.com/css/" + textFont + "');";
 	// Couleurs des boutons

From 5d63297205ca9d8591f554b3e77f3f39d5381d4c Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 7 Mar 2022 10:30:56 +0100
Subject: [PATCH 03/26] bug help largeur

---
 module/blog/view/edit/edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php
index 404467b8..14a3f653 100644
--- a/module/blog/view/edit/edit.php
+++ b/module/blog/view/edit/edit.php
@@ -20,7 +20,7 @@
 		<div class="col2">
 			<?php echo template::submit('blogEditSubmit', [
 				'value' => 'Publier',
-				'uniqueSubmission' => true,
+				'uniqueSubmission' => true
 			]); ?>
 		</div>
 	</div>
@@ -39,7 +39,7 @@
 				<div class="row">
 					<div class="col6">
 						<?php echo template::file('blogEditPicture', [
-							'help' => 'Taille optimale de l\'image de couverture : ' . ((int) substr($this->getData(['theme', 'site', 'width']), 0, -2) - (20 * 2)) . ' x 350 pixels.',
+							'help' => $this->getData(['theme', 'site', 'width']) !== '100%' ? 'Taille optimale de l\'image de couverture : ' . ((int) substr($this->getData(['theme', 'site', 'width']), 0, -2) - (20 * 2)) . ' x 350 pixels.' : '',
 							'label' => 'Image de couverture',
 							'type' => 1,
 							'value' => $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'picture'])

From 88a879325866690b7dfa787856674b1d48165918 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 7 Mar 2022 11:31:52 +0100
Subject: [PATCH 04/26] Fontes websafe + cdfonts en option

---
 core/core.php                                 | 44 ++++++-------------
 core/include/update.inc.php                   | 37 ++++++++++++++--
 core/module/install/ressource/defaultdata.php | 23 +++++++++-
 3 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/core/core.php b/core/core.php
index 08a9e3ae..d1e969b2 100644
--- a/core/core.php
+++ b/core/core.php
@@ -185,41 +185,25 @@ class common {
 
 	// Fontes
 	public static $fonts = [
-		'arimo' => 'Arimo',
-		'arvo' => 'Arvo',
-		'dancing-script' => 'Dancing Script',
-		'droid-sans-2' => 'Droid Sans',
-		'droid-serif-2' => 'Droid Serif',
-		'indie-flower' => 'Indie Flower',
-		'liberation-sans' => 'Liberation Sans',
-		'liberation-serif' => 'Liberation Serif',
-		'lobster-2' => 'Lobster',
-		'lora' => 'Lora',
-		'lato' => 'Lato',
-		'old-standard-tt-3' => 'Old Standard TT',
-		'open-sans' => 'Open Sans',
-		'oswald-4' => 'Oswald',
-		'pt-mono' => 'PT Mono',
-		'pt-serif' => 'PT Serif',
-		'rancho' => 'Rancho',
-		'roboto' => 'Roboto',
-		'ubuntu' => 'Ubuntu',
-		'vollkorn' => 'Vollkorn'
 	];
 
 	public static $fontsWebSafe = [
-		'georgia' => 'Georgia, DejaVu Serif, Norasi, serif;',
-		'times' => 'Times, Times New Roman, Liberation Serif, FreeSerif, serif;',
-		'arial' => 'Arial, Helvetica, Liberation Sans, FreeSans, sans-serif;',
-		'trebuchet' => 'Trebuchet MS, Arial, Helvetica, sans-serif;',
-		'lucida' => 'Lucida Sans, Lucida Grande, Lucida Sans Unicode, Luxi Sans, sans-serif;',
-		'tahoma' => 'Tahoma, Geneva, Kalimati, sans-serif;',
-		'verdana' => 'Verdana, DejaVu Sans, Bitstream Vera Sans, Geneva, sans-serif;',
-		'impact' => 'Impact, Arial Black, sans-serif;',
-		'courrier' => 'Courier, Courier New, FreeMono, Liberation Mono, monospace;',
-		'monaco' => 'Monaco, DejaVu Sans Mono, Lucida Console, Andale Mono, monospace;'
+		'arial' 			=> 'Arial, Helvetica, sans-serif;',
+		'arial-black' 		=> 'Arial Black, Gadget, sans-serif;',
+		'courrier' 			=> 'Courier, Liberation Mono, monospace;',
+		'courrier-new' 		=> 'Courier New, Courier, monospace',
+		'garamond' 			=> 'Garamond, serif',
+		'georgia' 			=> 'Georgia, serif;',
+		'impact' 			=> 'Impact, Charcoal, sans-serif;',
+		'lucida' 			=> 'Lucida Sans Unicode, Lucida Grande, sans-serif',
+		'tahoma'			=> 'Tahoma, Geneva, sans-serif;',
+		'times-new-roman' 	=> 'Times New Roman, Liberation Serif, serif;',
+		'trebuchet' 		=> 'Trebuchet MS, Arial, Helvetica, sans-serif;',
+		'tahoma' 			=> 'Tahoma, Geneva, sans-serif;',
+		'verdana' 			=> 'Verdana, Geneva, sans-serif;',
 	];
 
+
 	/**
 	 * Constructeur commun
 	 */
diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index ebe8a045..5500164a 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -714,7 +714,7 @@ if ($this->getData(['core', 'dataVersion']) < 11200) {
 
 	// Option de dévoilement du mdp
 	$this->setData(['config', 'connect', 'showPassword', true]);
-	
+
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 11200]);
 }
@@ -722,7 +722,7 @@ if ($this->getData(['core', 'dataVersion']) < 11200) {
 // Version 11.2.02
 if ($this->getData(['core', 'dataVersion']) < 11202) {
 
-	// Renommer les champs 
+	// Renommer les champs
 	$this->setData(['locale', 'cookies', 'mainLabel', 		$this->getData(['locale', 'cookies', 'cookiesZwiiText']) ]);
 	$this->setData(['locale', 'cookies', 'gaLabel', 		$this->getData(['locale', 'cookies', 'cookiesGaText']) ]);
 	$this->setData(['locale', 'cookies', 'titleLabel', 		$this->getData(['locale', 'cookies', 'cookiesTitleText']) ]);
@@ -784,7 +784,7 @@ if ($this->getData(['core', 'dataVersion']) < 11300) {
 	$this->setData(['theme', 'title', 'font',  $fonts[ $this->getData (['theme', 'title', 'font' ]) ] ]);
 	$this->setData(['admin', 'fontTitle',  $fonts[ $this->getData (['admin', 'fontTitle' ]) ] ]);
 	$this->setData(['admin', 'fontText',   $fonts[$this->getData (['admin','fontText' ]) ] ]);
-	
+
 	unlink(self::DATA_DIR . 'admin.css');
 	unlink(self::DATA_DIR . 'theme.css');
 
@@ -808,3 +808,34 @@ if ($this->getData(['core', 'dataVersion']) < 11303) {
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 11303]);
 }
+
+// Version 11.4.00
+if ($this->getData(['core', 'dataVersion']) < 11400) {
+
+	$fonts = [
+		'arimo' => 'Arimo',
+		'arvo' => 'Arvo',
+		'dancing-script' => 'Dancing Script',
+		'droid-sans-2' => 'Droid Sans',
+		'droid-serif-2' => 'Droid Serif',
+		'indie-flower' => 'Indie Flower',
+		'liberation-sans' => 'Liberation Sans',
+		'liberation-serif' => 'Liberation Serif',
+		'lobster-2' => 'Lobster',
+		'lora' => 'Lora',
+		'lato' => 'Lato',
+		'old-standard-tt-3' => 'Old Standard TT',
+		'open-sans' => 'Open Sans',
+		'oswald-4' => 'Oswald',
+		'pt-mono' => 'PT Mono',
+		'pt-serif' => 'PT Serif',
+		'rancho' => 'Rancho',
+		'roboto' => 'Roboto',
+		'ubuntu' => 'Ubuntu',
+		'vollkorn' => 'Vollkorn'
+	];
+	$this->setData(['fonts', 'imported', $fonts]);
+
+	// Mise à jour
+	$this->setData(['core', 'dataVersion', 11400]);
+}
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 197d69b5..8cf73dbd 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -87,7 +87,28 @@ class init extends common {
 		],
 		'fonts' => [
 			'files' => [],
-			'imported' => []
+			'imported'=> [
+				'arimo'=> 'Arimo',
+				'arvo'=> 'Arvo',
+				'dancing-script' => 'Dancing Script',
+				'droid-sans-2'=> 'Droid Sans',
+				'droid-serif-2'=> 'Droid Serif',
+				'indie-flower'=> 'Indie Flower',
+				'liberation-sans'=> 'Liberation Sans',
+				'liberation-serif'=> 'Liberation Serif',
+				'lobster-2'=> 'Lobster',
+				'lora'=> 'Lora',
+				'lato'=> 'Lato',
+				'old-standard-tt-3'=> 'Old Standard TT',
+				'open-sans'=> 'Open Sans',
+				'oswald-4'=> 'Oswald',
+				'pt-mono'=> 'PT Mono',
+				'pt-serif'=> 'PT Serif',
+				'rancho'=> 'Rancho',
+				'roboto'=> 'Roboto',
+				'ubuntu'=> 'Ubuntu',
+				'vollkorn'=> 'Vollkorn'
+			]
 		],
 		'page' => [
 			'accueil' => [

From 06251825cc231d6225bbb324b1bcbf1071abae89 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 7 Mar 2022 14:09:09 +0100
Subject: [PATCH 05/26] =?UTF-8?q?banni=C3=A8re=20info=20dimensions=20de=20?=
 =?UTF-8?q?l'image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                  |  7 ++--
 core/module/theme/view/header/header.js.php | 13 +++++---
 core/module/theme/view/header/header.php    | 36 +++++----------------
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f72b5c41..f1675b4a 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,8 +2,11 @@
 
 
 ## Version 11.4.00
-### Amélioration :
-    - prise en charge des fontes Web Safe : Georgia, Times, Arial, Trebuchet, Lucida, Tahoma, Verdana, Courier et Monaco.
+### Améliorations :
+    - Prise en charge des fontes Web Safe. Les fontes initiales sont transférées dans les fontes optionnelles, donc effaçables.
+    - Configuration de la bannière, modalité d'affichage de la taille d'image recommandée et affichage des dimensions de l'image.
+## Correction :
+    - Module blog : taille recommandée de l'image erronée lorsque la largeur de l'écran est réglée sur fluide (100%).
 
 ## Version 11.3.04
 ### Correction :
diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 7cc85e53..85f736b6 100644
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -47,9 +47,9 @@ $("input, select").on("change", function() {
 		var tmpImg = new Image();
 		tmpImg.onload = function() {
 			// Informations affichées
-			$("#themeHeaderImageHeight").val(tmpImg.height + " px");
-			$("#themeHeaderImageWidth").val(tmpImg.width + " px");
-			$("#themeHeaderImageRatio").val(tmpImg.width / tmpImg.height);
+			$("#themeHeaderImageHeight").html(tmpImg.height + "px");
+			$("#themeHeaderImageWidth").html(tmpImg.width + "px");
+			$("#themeHeaderImageRatio").html(tmpImg.width / tmpImg.height);
 
 			// Limiter la hauteur à 600 px
 			if (tmpImg.height > 600) {
@@ -69,6 +69,9 @@ $("input, select").on("change", function() {
 				$("#themeHeaderHeight option:eq(0)").val(tmpImgHeight + "px");
 				// Modifier l'option
 				$("#themeHeaderHeight option:eq(0)").html("Hauteur de l\'image sélectionnée (" + tmpImgHeight + "px)");
+				$("#themeHeaderImageInfo").show();
+			} else {
+				$("#themeHeaderImageInfo").hide();
 			}
 		};
 
@@ -207,10 +210,10 @@ $("input, select").on("change", function() {
 // Affiche / Cache les options de l'image du fond
 $("#themeHeaderImage").on("change", function() {
 	if($(this).val()) {
-		$("#themeHeaderImageOptions").slideDown();
+		$(".themeHeaderImageOptions").slideDown();
 	}
 	else {
-		$("#themeHeaderImageOptions").slideUp(function() {
+		$(".themeHeaderImageOptions").slideUp(function() {
 			$("#themeHeaderTextHide").prop("checked", false).trigger("change");
 		});
 	}
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index a9956412..232953db 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -154,40 +154,20 @@
                         $imageFile = file_exists(self::FILE_DIR.'source/'.$this->getData(['theme', 'header', 'image'])) ?
                                 $this->getData(['theme', 'header', 'image']) : "";
                         echo template::file('themeHeaderImage', [
-                            'help' => 'Sélectionner une image aux dimensions recommandées ci-dessous :',
                             'label' => 'Image',
                             'type' => 1,
                             'value' => $imageFile
                     ]); ?>
+                    <span  class="themeHeaderImageOptions displayNone" id="themeHeaderImageInfo">
+                        Largeur de l'image : <span id="themeHeaderImageWidth"></span> (largeur de site :  <?php echo $this->getData(['theme', 'site', 'width']); ?>)
+                        -
+                        Hauteur de l'image : <span id="themeHeaderImageHeight"></span>
+                        -
+                        Ratio : <span id="themeHeaderImageRatio"></span>
+                    </span>
                 </div>
             </div>
-            <div class="row">
-                <div class="col3 textAlignRight">
-                    Informations sur l'image : 
-                </div>
-                <div class="col2">                    
-                    <?php echo template::text('themeHeaderImageWidth', [
-                            'label' => 'Largeur',
-                            'class' => 'textAlignCenter',
-                            'disable' => true
-                    ]); ?>
-                </div>
-                <div class="col2">                    
-                    <?php echo template::text('themeHeaderImageHeight', [
-                            'label' => 'Hauteur',
-                            'class' => 'textAlignCenter',
-                            'disable' => true
-                    ]); ?>
-                </div>
-                <div class="col2">                    
-                    <?php echo template::text('themeHeaderImageRatio', [
-                            'label' => 'Ratio (L/H)',
-                            'class' => 'textAlignCenter',
-                            'disable' => true
-                    ]); ?>
-                </div>
-            </div>
-            <div id="themeHeaderImageOptions" class="displayNone">
+            <div class="themeHeaderImageOptions" class="displayNone">
                 <div class="row">
                     <div class="col3">
                         <?php echo template::select('themeHeaderImageRepeat', $module::$repeats, [

From 015b0377ea61e8b942281216c2ee63798ce4c469 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Mar 2022 11:32:55 +0100
Subject: [PATCH 06/26] =?UTF-8?q?menu=20accessoire,=20retour=20=C3=A0=20la?=
 =?UTF-8?q?=20version=20la=20premi=C3=A8re=20du=20js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/page/view/edit/edit.js.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 023a1a5e..703f2410 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -239,10 +239,12 @@ $( document ).ready(function() {
 	 */
 		 if ($("#pageEditExtraPosition").val() == 1 ) {
 			var positionDOM = $("#pageEditPosition");
+			var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
 			positionDOM.empty().append(
 				$("<option>").val(0).text("Ne pas afficher"),
 				$("<option>").val(1).text("Au début")
 			);
+			$("#pageEditPosition").val(positionInitial);
 		}
 
 });
@@ -525,12 +527,16 @@ $("#pageEditExtraPosition").on("change", function() {
 	if ($("#pageEditExtraPosition").val() == 1 ) {
 
 		var positionDOM = $("#pageEditPosition");
+		/*
 		positionDOM.empty().append(
 			$("<option>").val(0).text("Ne pas afficher"),
 			$("<option>").val(1).text("Au début")
 		);
+		$("#pageEditPosition").val(1);
+		*/
+		getPages(true);
 	} else {
-		getPages();
+		getPages(false);
 		//$("#pageEditParentPageId").trigger("change");
 	}
 });
@@ -546,14 +552,14 @@ $("#pageEditModuleConfig").on("click", function() {
  * Affiche les pages en fonction de la page parent dans le choix de la position
  */
 $("#pageEditParentPageId").on("change", function() {
-	getPages();
+	getPages(false);
 }).trigger("change");
 
 /**
  * Construit un select contenant la liste des pages du site.
  */
 
-function getPages() {
+function getPages(extra) {
 	var hierarchy = <?php echo json_encode($this->getHierarchy()); ?>;
 	var pages = <?php echo json_encode($this->getData(['page'])); ?>;
 	var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
@@ -567,12 +573,12 @@ function getPages() {
 	var positionSelected = 0;
 	var positionPrevious = 1;
 
-	// Aucune page parent selectionnée
+	// Aucune page parent sélectionnée
 	if(parentSelected === "") {
 		// Liste des pages sans parents
 		for(var key in hierarchy) {
 			if(hierarchy.hasOwnProperty(key) &&
-				extraPosition == pages[key].extraPosition ) {
+				extra === false ) {
 				// Sélectionne la page avant s'il s'agit de la page courante
 				if(key === "<?php echo $this->getUrl(2); ?>") {
 					positionSelected = positionPrevious;
@@ -592,7 +598,7 @@ function getPages() {
 			positionSelected = 0;
 		}
 	}
-	// Un page parent est sélectionnée
+	// Une page parent est sélectionnée
 	else {
 		// Liste des pages enfants de la page parent
 		for(var i = 0; i < hierarchy[parentSelected].length; i++) {

From f57f9ec4bb17de4a5a88a48caab5e508ecc95328 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Mar 2022 13:12:03 +0100
Subject: [PATCH 07/26] Ok sans la liste des pages accessoires

---
 core/module/page/page.php              | 5 +++--
 core/module/page/view/edit/edit.js.php | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/module/page/page.php b/core/module/page/page.php
index 17cbb7d3..9a672658 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -389,8 +389,9 @@ class page extends common {
 					$hierarchy = $this->getInput('pageEditParentPageId') ? $this->getHierarchy($this->getInput('pageEditParentPageId')) : array_keys($this->getHierarchy());
 					$position = $this->getInput('pageEditPosition', helper::FILTER_INT);
 					foreach($hierarchy as $hierarchyPageId) {
-						// Ignore la page en cours de modification
-						if($hierarchyPageId === $this->getUrl(2)) {
+						// Ignore la page en cours de modification et les pages dans le menu extra
+						if($hierarchyPageId === $this->getUrl(2) ||
+						   $this->getData(['page', $hierarchyPageId, 'extraPosition']) === false ) {
 							continue;
 						}
 						// Incrémente de +1 pour laisser la place à la position de la page en cours de modification
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 703f2410..95f08152 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -240,6 +240,12 @@ $( document ).ready(function() {
 		 if ($("#pageEditExtraPosition").val() == 1 ) {
 			var positionDOM = $("#pageEditPosition");
 			var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
+			console.log(positionInitial);
+			// La position précédente était dans le menu standard
+			if (positionInitial >= 2)
+			{
+				positionInitial = 0;
+			}
 			positionDOM.empty().append(
 				$("<option>").val(0).text("Ne pas afficher"),
 				$("<option>").val(1).text("Au début")

From 3d243e346346a203e729f233f9f5d57f6f024b37 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Mar 2022 13:46:55 +0100
Subject: [PATCH 08/26] =?UTF-8?q?Bug=20:=20ordre=20des=20pages=20du=20menu?=
 =?UTF-8?q?=20standard=20a=20r=C3=A9soudre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/page/page.php              | 22 +++++++------
 core/module/page/view/edit/edit.js.php | 44 ++++++++------------------
 2 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/core/module/page/page.php b/core/module/page/page.php
index 9a672658..e88d259c 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -389,19 +389,23 @@ class page extends common {
 					$hierarchy = $this->getInput('pageEditParentPageId') ? $this->getHierarchy($this->getInput('pageEditParentPageId')) : array_keys($this->getHierarchy());
 					$position = $this->getInput('pageEditPosition', helper::FILTER_INT);
 					foreach($hierarchy as $hierarchyPageId) {
-						// Ignore la page en cours de modification et les pages dans le menu extra
-						if($hierarchyPageId === $this->getUrl(2) ||
-						   $this->getData(['page', $hierarchyPageId, 'extraPosition']) === false ) {
+
+						// Ignore la page en cours de modification 
+						if($hierarchyPageId === $this->getUrl(2) ) {
 							continue;
 						}
-						// Incrémente de +1 pour laisser la place à la position de la page en cours de modification
-						if($lastPosition === $position) {
+						// Ne traite que les pages du menu standard
+						if ($this->getData(['page', $hierarchyPageId, 'extraPosition']) === false) {
+							// Incrémente de +1 pour laisser la place à la position de la page en cours de modification
+							if($lastPosition === $position) {
+								$lastPosition++;
+							}
+							// Change la position
+							$this->setData(['page', $hierarchyPageId, 'position', $lastPosition]);
+							// Incrémente pour la prochaine position
 							$lastPosition++;
 						}
-						// Change la position
-						$this->setData(['page', $hierarchyPageId, 'position', $lastPosition]);
-						// Incrémente pour la prochaine position
-						$lastPosition++;
+
 					}
 					if ($this->getinput('pageEditBlock') !== 'bar') {
 						$barLeft = $this->getinput('pageEditBarLeft');
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 95f08152..e344bd80 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -240,16 +240,7 @@ $( document ).ready(function() {
 		 if ($("#pageEditExtraPosition").val() == 1 ) {
 			var positionDOM = $("#pageEditPosition");
 			var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
-			console.log(positionInitial);
-			// La position précédente était dans le menu standard
-			if (positionInitial >= 2)
-			{
-				positionInitial = 0;
-			}
-			positionDOM.empty().append(
-				$("<option>").val(0).text("Ne pas afficher"),
-				$("<option>").val(1).text("Au début")
-			);
+			buildPagesList(true);
 			$("#pageEditPosition").val(positionInitial);
 		}
 
@@ -531,18 +522,9 @@ pageTypeMenuDOM.on("change", function() {
 
 $("#pageEditExtraPosition").on("change", function() {
 	if ($("#pageEditExtraPosition").val() == 1 ) {
-
-		var positionDOM = $("#pageEditPosition");
-		/*
-		positionDOM.empty().append(
-			$("<option>").val(0).text("Ne pas afficher"),
-			$("<option>").val(1).text("Au début")
-		);
-		$("#pageEditPosition").val(1);
-		*/
-		getPages(true);
+		buildPagesList(true);
 	} else {
-		getPages(false);
+		buildPagesList(false);
 		//$("#pageEditParentPageId").trigger("change");
 	}
 });
@@ -558,14 +540,14 @@ $("#pageEditModuleConfig").on("click", function() {
  * Affiche les pages en fonction de la page parent dans le choix de la position
  */
 $("#pageEditParentPageId").on("change", function() {
-	getPages(false);
+	buildPagesList(false);
 }).trigger("change");
 
 /**
  * Construit un select contenant la liste des pages du site.
  */
 
-function getPages(extra) {
+function buildPagesList(extraPosition) {
 	var hierarchy = <?php echo json_encode($this->getHierarchy()); ?>;
 	var pages = <?php echo json_encode($this->getData(['page'])); ?>;
 	var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
@@ -583,8 +565,7 @@ function getPages(extra) {
 	if(parentSelected === "") {
 		// Liste des pages sans parents
 		for(var key in hierarchy) {
-			if(hierarchy.hasOwnProperty(key) &&
-				extra === false ) {
+			if(hierarchy.hasOwnProperty(key) ) {
 				// Sélectionne la page avant s'il s'agit de la page courante
 				if(key === "<?php echo $this->getUrl(2); ?>") {
 					positionSelected = positionPrevious;
@@ -592,11 +573,14 @@ function getPages(extra) {
 				// Sinon ajoute la page à la liste
 				else {
 					// Enregistre la position de cette page afin de la sélectionner si la prochaine page de la liste est la page courante
-					positionPrevious++;
-					// Ajout à la liste
-					positionDOM.append(
-						$("<option>").val(positionPrevious).html("Après \"" + (pages[key].title) + "\"")
-					);
+					if (extraPosition == pages[key].extraPosition ) {
+						positionPrevious++;
+						// Ajout à la liste
+						positionDOM.append(
+							$("<option>").val(positionPrevious).html("Après \"" + (pages[key].title) + "\"")
+						);
+					}
+
 				}
 			}
 		}

From 66faa596dd62b95212c1efc5519527cabb0bf067 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Mar 2022 15:22:22 +0100
Subject: [PATCH 09/26] =?UTF-8?q?commentaire=20et=20polices=20par=20d?=
 =?UTF-8?q?=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 |  4 +---
 core/module/install/install.php               | 14 +++++++-------
 core/module/install/ressource/defaultdata.php | 14 +++++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/core/core.php b/core/core.php
index d1e969b2..dd8c4054 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2332,9 +2332,8 @@ class core extends common {
 			}
 
 			/**
-			* Chargement des polices en ligne dans un fichier séparé
+			* Chargement des polices en ligne dans un fichier fonts.html inclus dans main.php
 			*/
-			// Lire le fichier des fontes locales
 			$localFonts = $this->getData(['fonts', 'files']);
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
@@ -2348,7 +2347,6 @@ class core extends common {
 			/**
 			 * Fontes installées localement
 			 */
-			// Validité du format
 			if (  !empty($localFonts)
 			) {
 				foreach ($localFonts as $fontId => $fontName) {
diff --git a/core/module/install/install.php b/core/module/install/install.php
index 365defc2..af854cb8 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -54,11 +54,11 @@ class install extends common {
 				$userLastname = $this->getInput('installLastname', helper::FILTER_STRING_SHORT, true);
 				$userMail = $this->getInput('installMail', helper::FILTER_MAIL, true);
 				$userId = $this->getInput('installId', helper::FILTER_ID, true);
-					
+
 
 				// Création de l'utilisateur si les données sont complétées.
 				// success retour de l'enregistrement des données
-				
+
 				$success = $this->setData([
 					'user',
 					$userId,
@@ -73,7 +73,7 @@ class install extends common {
 						'password' => $this->getInput('installPassword', helper::FILTER_PASSWORD, true)
 					]
 				]);
-				
+
 				// Compte créé, envoi du mail et création des données du site
 				if ($success) { // Formulaire complété envoi du mail
 				// Envoie le mail
@@ -97,7 +97,7 @@ class install extends common {
 					$this->setData(['module', 'blog', 'posts', 'mon-premier-article', 'userId', $userId]);
 					$this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]);
 					$this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]);
-				} 
+				}
 				// Images exemples livrées dans tous les cas
 				try {
 					// Décompression dans le dossier de fichier temporaires
@@ -120,7 +120,7 @@ class install extends common {
 				// Créer le dossier des fontes
 				if (!is_dir(self::DATA_DIR . 'fonts')) {
 					mkdir(self::DATA_DIR . 'fonts');
-				}				
+				}
 				// Stocker le dossier d'installation
 				$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
 				// Créer sitemap
@@ -141,7 +141,7 @@ class install extends common {
 				}
 				$this->copyDir('core/module/install/ressource/themes', self::FILE_DIR . 'source/theme');
 				unlink(self::FILE_DIR . 'source/theme/themes.json');
-				
+
 				// Valeurs en sortie
 				$this->addOutput([
 					'redirect' => helper::baseUrl(false),
@@ -154,7 +154,7 @@ class install extends common {
 			$dataThemes = file_get_contents('core/module/install/ressource/themes/themes.json');
 			$dataThemes = json_decode($dataThemes, true);
 			self::$themes = helper::arrayCollumn($dataThemes, 'name');
-			
+
 			// Valeurs en sortie
 			$this->addOutput([
 				'display' => self::DISPLAY_LAYOUT_LIGHT,
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 8cf73dbd..583eb1e9 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -153,7 +153,7 @@ class init extends common {
 			],
 			'footer' => [
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
-				'font' => 'open-sans',
+				'font' => 'georgia',
 				'fontSize' => '.8em',
 				'fontWeight' => 'normal',
 				'height' => '5px',
@@ -180,7 +180,7 @@ class init extends common {
 			],
 			'header' => [
 				'backgroundColor' => 'rgba(32, 59, 82, 1)',
-				'font' => 'oswald-4',
+				'font' => 'arial',
 				'fontSize' => '2em',
 				'fontWeight' => 'normal',
 				'height' => '150px',
@@ -203,7 +203,7 @@ class init extends common {
 			'menu' => [
 				'backgroundColor' => 'rgba(32, 59, 82, 1)',
 				'backgroundColorSub' => 'rgba(32, 59, 82, 1)',
-				'font' => 'open-sans',
+				'font' => 'georgia',
 				'fontSize' => '1em',
 				'fontWeight' => 'normal',
 				'height' => '15px 10px',
@@ -234,13 +234,13 @@ class init extends common {
 				'borderColor' => 'rgba(236, 239, 241, 1)'
 			],
 			'text' => [
-				'font' => 'open-sans',
+				'font' => 'georgia',
 				'fontSize' => '13px',
 				'textColor' => 'rgba(33, 34, 35, 1)',
 				'linkColor' => 'rgba(74, 105, 189, 1)'
 			],
 			'title' => [
-				'font' => 'oswald-4',
+				'font' => 'arial',
 				'fontWeight' => 'normal',
 				'textColor' => 'rgba(74, 105, 189, 1)',
 				'textTransform' => 'none'
@@ -252,9 +252,9 @@ class init extends common {
 		],
 		'admin' => [
 			'backgroundColor' => 'rgba(255, 255, 255, 1)',
-			'fontText' => 'open-sans',
+			'fontText' => 'georgia',
 			'fontSize' => '13px',
-			'fontTitle' => 'oswald-4',
+			'fontTitle' => 'arial',
 			'colorText' => 'rgba(33, 34, 35, 1)',
 			'colorTitle' => 'rgba(74, 105, 189, 1)',
 			'backgroundColorButton' => 'rgba(74, 105, 189, 1)',

From f4cc1af9ae7d159f168534090bd10adf13255305 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 9 Mar 2022 09:15:47 +0100
Subject: [PATCH 10/26] bug changement menu standard ou accessoire

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

diff --git a/core/module/page/page.php b/core/module/page/page.php
index e88d259c..9b3f3eee 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -388,14 +388,15 @@ class page extends common {
 					$lastPosition = 1;
 					$hierarchy = $this->getInput('pageEditParentPageId') ? $this->getHierarchy($this->getInput('pageEditParentPageId')) : array_keys($this->getHierarchy());
 					$position = $this->getInput('pageEditPosition', helper::FILTER_INT);
+					$extraPosition = $this->getinput('pageEditExtraPosition', helper::FILTER_BOOLEAN);
 					foreach($hierarchy as $hierarchyPageId) {
 
-						// Ignore la page en cours de modification 
-						if($hierarchyPageId === $this->getUrl(2) ) {
-							continue;
-						}
-						// Ne traite que les pages du menu standard
-						if ($this->getData(['page', $hierarchyPageId, 'extraPosition']) === false) {
+						// Ne traite que les pages du menu sélectionné
+						if ($this->getData(['page', $hierarchyPageId, 'extraPosition']) === $extraPosition ) {
+							// Ignore la page en cours de modification 
+							if($hierarchyPageId === $this->getUrl(2) ) {
+								continue;
+							}
 							// Incrémente de +1 pour laisser la place à la position de la page en cours de modification
 							if($lastPosition === $position) {
 								$lastPosition++;
@@ -481,7 +482,7 @@ class page extends common {
 							'hideMenuSide' => $this->getinput('pageEditHideMenuSide', helper::FILTER_BOOLEAN),
 							'hideMenuHead' => $this->getinput('pageEditHideMenuHead', helper::FILTER_BOOLEAN),
 							'hideMenuChildren' => $this->getinput('pageEditHideMenuChildren', helper::FILTER_BOOLEAN),
-							'extraPosition' => $this->getinput('pageEditExtraPosition', helper::FILTER_BOOLEAN)
+							'extraPosition' => $extraPosition
 						]
 					]);
 

From f5ba9c2ccb3abd242119762700d9e43c330ebd65 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 9 Mar 2022 12:24:23 +0100
Subject: [PATCH 11/26] collumn avec un seul l

---
 core/class/helper.class.php               |  2 +-
 core/include/update.inc.php               |  2 +-
 core/module/addon/addon.php               |  6 +++---
 core/module/config/view/locale/locale.php | 12 ++++++------
 core/module/install/install.php           |  2 +-
 core/module/page/page.php                 |  2 +-
 core/module/sitemap/sitemap.php           |  8 ++++----
 core/module/theme/view/footer/footer.php  |  4 ++--
 core/module/user/user.php                 |  4 ++--
 module/blog/blog.php                      | 20 ++++++++++----------
 module/form/form.php                      |  2 +-
 module/form/view/config/config.js.php     |  2 +-
 module/gallery/gallery.php                |  4 ++--
 module/news/news.php                      | 14 +++++++-------
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/core/class/helper.class.php b/core/class/helper.class.php
index accf7132..fc623eab 100644
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@@ -86,7 +86,7 @@ class helper {
 	 * @param string $sort Type de tri à appliquer au tableau (SORT_ASC, SORT_DESC, ou null)
 	 * @return array
 	 */
-	public static function arrayCollumn($array, $column, $sort = null) {
+	public static function arrayColumn($array, $column, $sort = null) {
 		$newArray = [];
 		if(empty($array) === false) {
 			$newArray = array_map(function($element) use($column) {
diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 5500164a..4f3e20c8 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -481,7 +481,7 @@ if ($this->getData(['core', 'dataVersion']) < 10400) {
 	foreach ($pageList as $parentKey => $parent) {
 		//La page est un blog
 		if ($this->getData(['page',$parent,'moduleId']) === 'blog' ) {
-			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $parent, 'posts']), 'publishedOn', 'SORT_DESC'));
+			$articleIds = array_keys(helper::arrayColumn($this->getData(['module', $parent, 'posts']), 'publishedOn', 'SORT_DESC'));
 			foreach ($articleIds as $key => $article) {
 				// Droits les deux groupes
 				$this->setData(['module',  $parent, 'posts', $article,'editConsent', 3]);
diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index 2aff2f7a..7cb5792d 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -293,7 +293,7 @@ class addon extends common {
 			// Modules installés
 			$infoModules = helper::getModules();
 			// Clés moduleIds dans les pages
-			$inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC');
+			$inPages = helper::arrayColumn($this->getData(['page']),'moduleId', 'SORT_DESC');
 			foreach( $inPages as $key=>$value){
 				$inPagesTitle[ $this->getData(['page', $key, 'title' ]) ] = $value;
 			}
@@ -362,7 +362,7 @@ class addon extends common {
 		$infoModules = helper::getModules();
 
 		// Clés moduleIds dans les pages
-		$inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC');
+		$inPages = helper::arrayColumn($this->getData(['page']),'moduleId', 'SORT_DESC');
 		foreach( $inPages as $key=>$value){
 			$inPagesTitle[ $this->getData(['page', $key, 'title' ]) ] = $value;
 		}
@@ -428,7 +428,7 @@ class addon extends common {
 				mkdir($tmpFolder, 0755);
 			}
 			// Clés moduleIds dans les pages
-			$inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC');
+			$inPages = helper::arrayColumn($this->getData(['page']),'moduleId', 'SORT_DESC');
 			// Parcourir les pages utilisant le module
 			foreach (array_keys($inPages,$this->getUrl(2)) as $pageId) {
 				// Export des pages hébergeant le module
diff --git a/core/module/config/view/locale/locale.php b/core/module/config/view/locale/locale.php
index fb8faa85..e62c675b 100644
--- a/core/module/config/view/locale/locale.php
+++ b/core/module/config/view/locale/locale.php
@@ -57,21 +57,21 @@
 				</h4>
 				<div class="row">
 					<div class="col4">
-						<?php echo template::select('localeHomePageId', helper::arrayCollumn($module::$pagesList, 'title', 'SORT_ASC'), [
+						<?php echo template::select('localeHomePageId', helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC'), [
 								'label' => 'Accueil du site',
 								'selected' =>$this->getData(['locale', 'homePageId']),
 								'help' => 'La première page que vos visiteurs verront.'
 						]); ?>
 					</div>
 					<div class="col4">
-						<?php echo template::select('localePage403', array_merge(['none' => 'Page par défaut'],helper::arrayCollumn($module::$orphansList, 'title', 'SORT_ASC')), [
+						<?php echo template::select('localePage403', array_merge(['none' => 'Page par défaut'],helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
 								'label' => 'Accès interdit, erreur 403',
 								'selected' =>$this->getData(['locale', 'page403']),
 								'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
 							]); ?>
 					</div>
 					<div class="col4">
-						<?php echo template::select('localePage404', array_merge(['none' => 'Page par défaut'],helper::arrayCollumn($module::$orphansList, 'title', 'SORT_ASC')), [
+						<?php echo template::select('localePage404', array_merge(['none' => 'Page par défaut'],helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
 								'label' => 'Page inexistante, erreur 404',
 								'selected' =>$this->getData(['locale', 'page404']),
 								'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
@@ -80,14 +80,14 @@
 				</div>
 				<div class="row">
 					<div class="col4">
-						<?php echo template::select('localeLegalPageId', array_merge(['none' => 'Aucune'] , helper::arrayCollumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
+						<?php echo template::select('localeLegalPageId', array_merge(['none' => 'Aucune'] , helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
 							'label' => 'Mentions légales',
 							'selected' => $this->getData(['locale', 'legalPageId']),
 							'help' => 'Les mentions légales sont obligatoires en France. Une option du pied de page ajoute un lien discret vers cette page.'
 						]); ?>
 					</div>
 					<div class="col4">
-						<?php echo template::select('localeSearchPageId', array_merge(['none' => 'Aucune'] , helper::arrayCollumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
+						<?php echo template::select('localeSearchPageId', array_merge(['none' => 'Aucune'] , helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
 							'label' => 'Recherche dans le site',
 							'selected' => $this->getData(['locale', 'searchPageId']),
 							'help' => 'Sélectionnez une page contenant le module \'Recherche\'. Une option du pied de page ajoute un lien discret vers cette page.'
@@ -95,7 +95,7 @@
 					</div>
 					<div class="col4">
 						<?php
-							echo template::select('localePage302', array_merge(['none' => 'Page par défaut'],helper::arrayCollumn($module::$orphansList, 'title', 'SORT_ASC')), [
+							echo template::select('localePage302', array_merge(['none' => 'Page par défaut'],helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [
 								'label' => 'Site en maintenance',
 								'selected' =>$this->getData(['locale', 'page302']),
 								'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.'
diff --git a/core/module/install/install.php b/core/module/install/install.php
index af854cb8..efd82999 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -153,7 +153,7 @@ class install extends common {
 			// Récupération de la liste des thèmes
 			$dataThemes = file_get_contents('core/module/install/ressource/themes/themes.json');
 			$dataThemes = json_decode($dataThemes, true);
-			self::$themes = helper::arrayCollumn($dataThemes, 'name');
+			self::$themes = helper::arrayColumn($dataThemes, 'name');
 
 			// Valeurs en sortie
 			$this->addOutput([
diff --git a/core/module/page/page.php b/core/module/page/page.php
index 9b3f3eee..53b2e9be 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -516,7 +516,7 @@ class page extends common {
 					}
 				}
 			}
-			self::$moduleIds = array_merge( ['' => 'Aucun'] , helper::arrayCollumn(helper::getModules(),'realName','SORT_ASC'));			// Pages sans parent
+			self::$moduleIds = array_merge( ['' => 'Aucun'] , helper::arrayColumn(helper::getModules(),'realName','SORT_ASC'));			// Pages sans parent
 			foreach($this->getHierarchy() as $parentPageId => $childrenPageIds) {
 				if($parentPageId !== $this->getUrl(2)) {
 					self::$pagesNoParentId[$parentPageId] = $this->getData(['page', $parentPageId, 'title']);
diff --git a/core/module/sitemap/sitemap.php b/core/module/sitemap/sitemap.php
index 3807a403..0537f648 100644
--- a/core/module/sitemap/sitemap.php
+++ b/core/module/sitemap/sitemap.php
@@ -42,8 +42,8 @@ class sitemap extends common
                 !empty($this->getData(['module',$parentId, 'posts' ]))) {
                     $items .= '<ul>';									
                     // Ids des articles par ordre de publication
-                    $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC');
-                    $articleIdsStates = helper::arrayCollumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC');
+                    $articleIdsPublishedOns = helper::arrayColumn($this->getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC');
+                    $articleIdsStates = helper::arrayColumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC');
                     $articleIds = [];
                     foreach ($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
                         if ($articlePublishedOn <= time() and $articleIdsStates[$articleId]) {
@@ -78,8 +78,8 @@ class sitemap extends common
                                 !empty($this->getData(['module', $childId, 'posts' ]))) {
                         $items .= '<ul>';
                         // Ids des articles par ordre de publication
-                        $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC');
-                        $articleIdsStates = helper::arrayCollumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC');
+                        $articleIdsPublishedOns = helper::arrayColumn($this->getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC');
+                        $articleIdsStates = helper::arrayColumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC');
                         $articleIds = [];
                         foreach ($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
                             if ($articlePublishedOn <= time() and $articleIdsStates[$articleId]) {
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index 9c47aa82..0934b72a 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -133,7 +133,7 @@
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('configLegalPageId', array_merge(['none' => 'Aucune'] , helper::arrayCollumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
+                    <?php echo template::select('configLegalPageId', array_merge(['none' => 'Aucune'] , helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
                         'label' => 'Page "Mentions légales" ' . template::flag('site', '20px'),
                         'selected' => $this->getData(['locale', 'legalPageId'])
                     ]); ?>
@@ -147,7 +147,7 @@
                         ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::select('configSearchPageId', array_merge(['none' => 'Aucune'] , helper::arrayCollumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
+                    <?php echo template::select('configSearchPageId', array_merge(['none' => 'Aucune'] , helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC') ) , [
                         'label' => 'Page "Rechercher" ' . template::flag('site', '20px'),
                         'selected' => $this->getData(['locale', 'searchPageId'])
                     ]); ?>
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 82a22882..c4e4879f 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -336,7 +336,7 @@ class user extends common {
 	 * Liste des utilisateurs
 	 */
 	public function index() {
-		$userIdsFirstnames = helper::arrayCollumn($this->getData(['user']), 'firstname');
+		$userIdsFirstnames = helper::arrayColumn($this->getData(['user']), 'firstname');
 		ksort($userIdsFirstnames);
 		foreach($userIdsFirstnames as $userId => $userFirstname) {
 			if ($this->getData(['user', $userId, 'group'])) {
@@ -397,7 +397,7 @@ class user extends common {
 					]
 				]);
 				// Verrouillage des IP
-				$ipBlackList = helper::arrayCollumn($this->getData(['blacklist']), 'ip');
+				$ipBlackList = helper::arrayColumn($this->getData(['blacklist']), 'ip');
 				if ( $this->getData(['blacklist',$userId,'connectFail']) >= $this->getData(['config', 'connect', 'attempt'])
 					AND in_array($this->getData(['blacklist',$userId,'ip']),$ipBlackList) ) {
 					$logStatus = 'Compte inconnu verrouillé';
diff --git a/module/blog/blog.php b/module/blog/blog.php
index 18964165..69887203 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -140,8 +140,8 @@ class blog extends common {
 		$feeds->setDate(date('r',time()));
 		$feeds->addGenerator();
 		// Corps des articles
-		$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
-		$articleIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'state', 'SORT_DESC');
+		$articleIdsPublishedOns = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
+		$articleIdsStates = helper::arrayColumn($this->getData(['module', $this->getUrl(0),'posts']), 'state', 'SORT_DESC');
 		foreach( $articleIdsPublishedOns as $articleId => $articlePublishedOn ) {
 			if( $articlePublishedOn <= time() AND $articleIdsStates[$articleId]			 ) {
 				// Miniature
@@ -230,7 +230,7 @@ class blog extends common {
 			]);
 		}
 		// Liste des utilisateurs
-		self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname');
+		self::$users = helper::arrayColumn($this->getData(['user']), 'firstname');
 		ksort(self::$users);
 		foreach(self::$users as $userId => &$userFirstname) {
 			$userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']);
@@ -259,7 +259,7 @@ class blog extends common {
 					'value' => 'Tout effacer'
 		]);
 		// Ids des commentaires par ordre de création
-		$commentIds = array_keys(helper::arrayCollumn($comments, 'createdOn', 'SORT_DESC'));
+		$commentIds = array_keys(helper::arrayColumn($comments, 'createdOn', 'SORT_DESC'));
 		// Pagination
 		$pagination = helper::pagination($commentIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) );
 		// Liste des pages
@@ -416,7 +416,7 @@ class blog extends common {
 			]);
 		} else {
 			// Ids des articles par ordre de publication
-			$articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
+			$articleIds = array_keys(helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
 			// Gestion des droits d'accès
 			$filterData=[];
 			foreach ($articleIds as $key => $value) {
@@ -448,7 +448,7 @@ class blog extends common {
 			// Articles en fonction de la pagination
 			for($i = $pagination['first']; $i < $pagination['last']; $i++) {
 				// Nombre de commentaires à approuver et approuvés
-				$approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts',  $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
+				$approvals = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts',  $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
 				if ( is_array($approvals) ) {
 					$a = array_values($approvals);
 					$toApprove = count(array_keys($a,false));
@@ -595,7 +595,7 @@ class blog extends common {
 				]);
 			}
 			// Liste des utilisateurs
-			self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname');
+			self::$users = helper::arrayColumn($this->getData(['user']), 'firstname');
 			ksort(self::$users);
 			foreach(self::$users as $userId => &$userFirstname) {
 			// Les membres ne sont pas éditeurs, les exclure de la liste
@@ -709,7 +709,7 @@ class blog extends common {
 					// Ligne suivante si affichage du nombre total de commentaires approuvés sous l'article
 					self::$nbCommentsApproved = count($commentsApproved);
 				}
-				$commentIds = array_keys(helper::arrayCollumn($commentsApproved, 'createdOn', 'SORT_DESC'));
+				$commentIds = array_keys(helper::arrayColumn($commentsApproved, 'createdOn', 'SORT_DESC'));
 				// Pagination
 				$pagination = helper::pagination($commentIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']),'#comment');
 				// Liste des pages
@@ -749,8 +749,8 @@ class blog extends common {
 		// Liste des articles
 		else {
 			// Ids des articles par ordre de publication
-			$articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'publishedOn', 'SORT_DESC');
-			$articleIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
+			$articleIdsPublishedOns = helper::arrayColumn($this->getData(['module', $this->getUrl(0),'posts']), 'publishedOn', 'SORT_DESC');
+			$articleIdsStates = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
 			$articleIds = [];
 			foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) {
 				if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) {
diff --git a/module/form/form.php b/module/form/form.php
index 627ad4da..53733989 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -80,7 +80,7 @@ class form extends common {
 	 */
 	public function config() {
 		// Liste des utilisateurs
-		$userIdsFirstnames = helper::arrayCollumn($this->getData(['user']), 'firstname');
+		$userIdsFirstnames = helper::arrayColumn($this->getData(['user']), 'firstname');
 		ksort($userIdsFirstnames);
 		self::$listUsers [] = '';
 		foreach($userIdsFirstnames as $userId => $userFirstname) {
diff --git a/module/form/view/config/config.js.php b/module/form/view/config/config.js.php
index 1522ee3d..f6e56700 100644
--- a/module/form/view/config/config.js.php
+++ b/module/form/view/config/config.js.php
@@ -69,7 +69,7 @@ function position() {
 var inputUid = 0;
 var inputs = <?php echo json_encode($this->getData(['module', $this->getUrl(0), 'input'])); ?>;
 if(inputs) {
-	var inputsPerPosition = <?php echo json_encode(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'input']), 'position', 'SORT_ASC')); ?>;
+	var inputsPerPosition = <?php echo json_encode(helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'input']), 'position', 'SORT_ASC')); ?>;
 	$.each(inputsPerPosition, function(id) {
 		add(inputUid, inputs[id]);
 		inputUid++;
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 37a8a0df..7c8f43ff 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -320,7 +320,7 @@ class gallery extends common {
 
 		//Affichage de la galerie triée
 		$g = $this->getData(['module', $this->getUrl(0), 'content']);
-		$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
+		$p = helper::arrayColumn(helper::arrayColumn($g,'config'),'position');
 		asort($p,SORT_NUMERIC);
 		$galleries = [];
 		foreach ($p as $positionId => $item) {
@@ -676,7 +676,7 @@ class gallery extends common {
 		else {
 			// Tri des galeries suivant l'ordre défini
 			$g = $this->getData(['module', $this->getUrl(0), 'content']);
-			$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
+			$p = helper::arrayColumn(helper::arrayColumn($g,'config'),'position');
 			asort($p,SORT_NUMERIC);
 			$galleries = [];
 			foreach ($p as $positionId => $item) {
diff --git a/module/news/news.php b/module/news/news.php
index c2dbdabd..7216f5b0 100644
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -112,8 +112,8 @@ class news extends common {
 		$feeds->setDate(date('r',time()));
 		$feeds->addGenerator();
 		// Corps des articles
-		$newsIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
-		$newsIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
+		$newsIdsPublishedOns = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
+		$newsIdsStates = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
 		foreach($newsIdsPublishedOns as $newsId => $newsPublishedOn) {
 			if($newsPublishedOn <= time() AND $newsIdsStates[$newsId]) {
 				$newsArticle = $feeds->createNewItem();
@@ -164,7 +164,7 @@ class news extends common {
 			]);
 		}
 		// Liste des utilisateurs
-		self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname');
+		self::$users = helper::arrayColumn($this->getData(['user']), 'firstname');
 		ksort(self::$users);
 		foreach(self::$users as $userId => &$userFirstname) {
 			$userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']);
@@ -234,7 +234,7 @@ class news extends common {
 			]);
 		} else {
 			// Ids des news par ordre de publication
-			$newsIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
+			$newsIds = array_keys(helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
 			// Pagination
 			$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) );
 			// Liste des pages
@@ -367,7 +367,7 @@ class news extends common {
 				]);
 			}
 			// Liste des utilisateurs
-			self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname');
+			self::$users = helper::arrayColumn($this->getData(['user']), 'firstname');
 			ksort(self::$users);
 			foreach(self::$users as $userId => &$userFirstname) {
 				$userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']);
@@ -420,8 +420,8 @@ class news extends common {
 		} else {
 			// Affichage index
 			// Ids des news par ordre de publication
-			$newsIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
-			$newsIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
+			$newsIdsPublishedOns = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC');
+			$newsIdsStates = helper::arrayColumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC');
 			$newsIds = [];
 			foreach($newsIdsPublishedOns as $newsId => $newsPublishedOn) {
 				$newsIdsPublishedOff = $this->getData(['module', $this->getUrl(0), 'posts', $newsId, 'publishedOff']);

From 3284486383bb9e62c4ecbf39d2cb081ed271302c Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 9 Mar 2022 12:50:05 +0100
Subject: [PATCH 12/26] =?UTF-8?q?column=20renomm=C3=A9=20+=20import=20des?=
 =?UTF-8?q?=20polices=20en=20cours?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php | 117 +++++++++++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 48 deletions(-)

diff --git a/core/core.php b/core/core.php
index dd8c4054..0d234f23 100644
--- a/core/core.php
+++ b/core/core.php
@@ -298,7 +298,7 @@ class common {
 
 		// Construit la liste des pages parents/enfants
 		if($this->hierarchy['all'] === []) {
-			$pages = helper::arrayCollumn($this->getData(['page']), 'position', 'SORT_ASC');
+			$pages = helper::arrayColumn($this->getData(['page']), 'position', 'SORT_ASC');
 			// Parents
 			foreach($pages as $pageId => $pagePosition) {
 				if(
@@ -411,6 +411,54 @@ class common {
 		}
 	}
 
+	/**
+	 * Construit la liste des fontes dans un tableau
+	 * @return @fonts
+	 * 	fontid
+	 * 	'familyName' =>
+	 *  'type=> websafe ou imported ou file
+	 *  'ressource' => stack ou file
+	 */
+	public function getFonts() {
+
+		// Fusionne la liste des fontes avec les webSafe
+		foreach (self::$fontsWebSafe as $fontId => $fontValue) {
+			$fontName = explode (',', $fontValue);
+			$f[$fontId] = [
+				'fontfamily'=> $fontName[0],
+				'ressource' => $fontValue,
+				'type' => 'websafe'
+			];
+		}
+		// Ajoute les polices importées chez cdnfonts
+		$fontsImported = $this->getData(['fonts', 'imported']);
+		if (is_array($fontsImported)
+		) {
+			foreach ($fontsImported as $fontId => $fontValue) {
+				$f[$fontId] = [
+					'fontfamily'=> $fontValue,
+					'ressource' => $fontValue . "; sans-serif", // Format par défaut
+					'type' => 'imported'
+				];
+			}
+		}
+		// Ajoute les polices locales
+		$fontsFiles = $this->getData(['fonts', 'files']);
+		if (is_array($fontsFiles)
+		) {
+			foreach ($fontsFiles as $fontId => $fontValue) {
+				$f[$fontId] = [
+					// la fonte family est reprise de files
+					'ressource' => $fontValue,
+					'type' => 'files'
+				];
+			}
+		}
+		// Tri Alphabétique
+		ksort($f);
+		return $f;
+	}
+
 	/**
 	 * Check du token CSRF (true = bo
 	 */
@@ -2265,27 +2313,6 @@ class core extends common {
 			}
 		}
 
-		/**
-		 * Traitement des polices de caractères
-		 */
-
-		// Fusionne la liste des fontes avec les webSafe
-		foreach (self::$fontsWebSafe as $fontId => $fontValue) {
-			$fontName = explode (',', $fontValue);
-			self::$fonts [$fontId] = $fontName[0];
-		}
-		// Importe les polices personnalisées
-		$fontsImported = $this->getData(['fonts', 'imported']);
-		if (is_array($fontsImported) &&
-			!empty ($fontsImported)
-		) {
-			// Fusionner avec les fontes installées
-			self::$fonts = array_merge(self::$fonts, $fontsImported);
-
-		}
-		// Tri Alphabétique
-		asort(self::$fonts);
-
 		// Crée le fichier de personnalisation avancée
 		if(file_exists(self::DATA_DIR.'custom.css') === false) {
 			file_put_contents(self::DATA_DIR.'custom.css', file_get_contents('core/module/theme/resource/custom.css'));
@@ -2301,18 +2328,24 @@ class core extends common {
 			file_put_contents(self::DATA_DIR.'admin.css', '');
 			chmod(self::DATA_DIR.'admin.css', 0755);
 		}
+
 		// Check la version rafraichissement du theme
 		$cssVersion = preg_split('/\*+/', file_get_contents(self::DATA_DIR.'theme.css'));
 		if(empty($cssVersion[1]) OR $cssVersion[1] !== md5(json_encode($this->getData(['theme'])))) {
 			// Version
 			$css = '/*' . md5(json_encode($this->getData(['theme']))) . '*/';
 
+
 			/**
 			 * Import des polices de caractères
 			 * A partir du CDN
 			 * ou dans le dossier site/file/source/fonts
 			 * ou pas du tout si fonte webSafe
 			 */
+
+			// Fonts disponibles
+			$fontsAvailable = $this->getFonts();
+			// Fontes installées
 			$fonts = [ $this->getData(['theme', 'text',  'font']),
 						  $this->getData(['theme', 'title', 'font']),
 						  $this->getData(['theme', 'header', 'font']),
@@ -2322,44 +2355,32 @@ class core extends common {
 			// Suppression des polices identiques
 			$fonts = array_unique($fonts);
 
-			/**
-			 * Fontes Web Safe, ne sont pas chargées.
-			 */
-			foreach ($fonts as $fontId) {
-				if (array_key_exists($fontId, self::$fontsWebSafe) ) {
-					unset($fonts[$fontId]);
-				}
-			}
-
 			/**
 			* Chargement des polices en ligne dans un fichier fonts.html inclus dans main.php
 			*/
-			$localFonts = $this->getData(['fonts', 'files']);
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
-				if (!array_key_exists($fontId, $localFonts) ) {
-					$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
-					// Supprimer l'élément des fontes chargées en ligne
-					unset($fonts[$fontId]);
+				if ( isset($fontsAvailable[$fontId]) &&
+					 $fontsAvailable[$fontId]['type'] === 'imported' ) {
+						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
 				}
 			}
+			// Enregistre la personnalisation
+			file_put_contents(self::DATA_DIR.'fonts/fonts.html', $fontFile);
 
 			/**
 			 * Fontes installées localement
 			 */
-			if (  !empty($localFonts)
-			) {
-				foreach ($localFonts as $fontId => $fontName) {
-					// Validité du tableau :
-					if ( array_key_exists($fontId, self::$fonts) &&
-							file_exists(self::DATA_DIR . 'fonts/' . $fontName) ) {
-							// Chargement de la police
-							//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
-							$css .= '@font-face {font-family:"' . self::$fonts[$fontId] . '";';
-							$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
-					}
-
+			foreach ($fonts as $fontId) {
+				// Validité du tableau :
+				if ( array_key_exists($fontId, self::$fonts) &&
+						file_exists(self::DATA_DIR . 'fonts/' . $fontName) ) {
+						// Chargement de la police
+						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
+						$css .= '@font-face {font-family:"' . self::$fonts[$fontId] . '";';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
 				}
+
 			}
 
 			// Fond du body

From cfb61590f0271c1402ff418119870751f320d5db Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 10 Mar 2022 09:55:38 +0100
Subject: [PATCH 13/26] =?UTF-8?q?Pr=C3=A9sentation=20config=20/=20s=C3=A9c?=
 =?UTF-8?q?urit=C3=A9=20de=20la=20connexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/config/view/connect/connect.php | 42 +++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php
index a7a5f4f1..aa86f715 100644
--- a/core/module/config/view/connect/connect.php
+++ b/core/module/config/view/connect/connect.php
@@ -9,30 +9,15 @@
 						</a>
 					</span>
 				</h4>
+
 				<div class="row">
-					<div class="col3">
-							<?php echo template::checkbox('connectCaptcha', true, 'Captcha à la connexion', [
-									'checked' => $this->getData(['config', 'connect','captcha'])
-							]); ?>
-							<?php echo template::checkbox('connectCaptchaStrong', true, 'Captcha complexe', [
-								'checked' => $this->getData(['config', 'connect', 'captchaStrong']),
-								'help' => 'Option recommandée pour sécuriser la connexion. S\'applique à tous les captchas du site. Le captcha simple se limite à une addition de nombres de 0 à 10. Le captcha complexe utilise quatre opérations de nombres de 0 à 20. Activation recommandée.'
-							]); ?>
-						</div>
-					</div>
-					<div class="col3">
-						<?php echo template::select('connectCaptchaType', $module::$captchaTypes , [
-								'label' => 'Type de captcha',
-								'selected' => $this->getData(['config', 'connect', 'captchaType'])
-							]); ?>
-					</div>
-					<div class="col3">
+					<div class="col6">
 						<?php echo template::checkbox('connectAutoDisconnect', true, 'Déconnexion automatique', [
 							'checked' => $this->getData(['config', 'connect', 'autoDisconnect']),
 							'help' => 'Déconnecte les sessions ouvertes précédemment sur d\'autres navigateurs ou terminaux. Activation recommandée.'
 						]); ?>
 					</div>
-					<div class="col3">
+					<div class="col6">
 						<?php echo template::checkbox('connectShowPassword', true, 'Dévoiler le mot de passe', [
 							'checked' => $this->getData(['config', 'connect', 'showPassword']),
 							'help' => 'Dans l\'écran de connexion, active une icône dont le survol affiche temporairement le mot de passe.'
@@ -42,7 +27,7 @@
 				<div class="row">
 					<div class="col3">
 						<?php echo template::select('connectAttempt', $module::$connectAttempt , [
-							'label' => 'Connexions successives',
+							'label' => 'Limitation des tentatives',
 							'selected' => $this->getData(['config', 'connect', 'attempt'])
 						]); ?>
 					</div>
@@ -74,6 +59,25 @@
 						]); ?>
 					</div>
 				</div>
+				<div class="row">
+					<div class="col3">
+							<?php echo template::checkbox('connectCaptcha', true, 'Captcha à la connexion', [
+									'checked' => $this->getData(['config', 'connect','captcha'])
+							]); ?>
+					</div>
+					<div class="col3">
+							<?php echo template::checkbox('connectCaptchaStrong', true, 'Captcha complexe', [
+								'checked' => $this->getData(['config', 'connect', 'captchaStrong']),
+								'help' => 'Option recommandée pour sécuriser la connexion. S\'applique à tous les captchas du site. Le captcha simple se limite à une addition de nombres de 0 à 10. Le captcha complexe utilise quatre opérations de nombres de 0 à 20. Activation recommandée.'
+							]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::select('connectCaptchaType', $module::$captchaTypes , [
+								'label' => 'Type de captcha',
+								'selected' => $this->getData(['config', 'connect', 'captchaType'])
+							]); ?>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>

From 9dc533d7a9b9c8e4cc9604b6656613232632f392 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 10 Mar 2022 15:09:56 +0100
Subject: [PATCH 14/26] Gestion des fontes des feuilles de style ok

---
 core/core.php                                 | 120 +++++++++---------
 core/include/update.inc.php                   |  40 +++---
 core/module/install/ressource/defaultdata.php |  40 +++---
 3 files changed, 102 insertions(+), 98 deletions(-)

diff --git a/core/core.php b/core/core.php
index 0d234f23..847da7cd 100644
--- a/core/core.php
+++ b/core/core.php
@@ -413,21 +413,17 @@ class common {
 
 	/**
 	 * Construit la liste des fontes dans un tableau
-	 * @return @fonts
-	 * 	fontid
-	 * 	'familyName' =>
-	 *  'type=> websafe ou imported ou file
-	 *  'ressource' => stack ou file
+	 * @return array @fonts
+	 * 
 	 */
 	public function getFonts() {
 
 		// Fusionne la liste des fontes avec les webSafe
 		foreach (self::$fontsWebSafe as $fontId => $fontValue) {
 			$fontName = explode (',', $fontValue);
-			$f[$fontId] = [
-				'fontfamily'=> $fontName[0],
-				'ressource' => $fontValue,
-				'type' => 'websafe'
+			$f ['websafe'] [$fontId] =  [
+				'name' => $fontName[0],
+				'font-family'=> $fontValue
 			];
 		}
 		// Ajoute les polices importées chez cdnfonts
@@ -435,10 +431,11 @@ class common {
 		if (is_array($fontsImported)
 		) {
 			foreach ($fontsImported as $fontId => $fontValue) {
-				$f[$fontId] = [
-					'fontfamily'=> $fontValue,
-					'ressource' => $fontValue . "; sans-serif", // Format par défaut
-					'type' => 'imported'
+				$fontName = explode (',', $fontValue);
+				$f ['imported'] [$fontId] =  [
+					'name' => $fontName[0],
+					'font-family'=> $fontValue
+					//'ressource'
 				];
 			}
 		}
@@ -447,15 +444,12 @@ class common {
 		if (is_array($fontsFiles)
 		) {
 			foreach ($fontsFiles as $fontId => $fontValue) {
-				$f[$fontId] = [
-					// la fonte family est reprise de files
-					'ressource' => $fontValue,
-					'type' => 'files'
+				$f ['files'] [$fontId] =  [
+					'font-family'=> $fontValue ['font-family'],
+					'ressource'=> $fontValue ['ressource']
 				];
 			}
 		}
-		// Tri Alphabétique
-		ksort($f);
 		return $f;
 	}
 
@@ -2355,14 +2349,25 @@ class core extends common {
 			// Suppression des polices identiques
 			$fonts = array_unique($fonts);
 
+			/**
+			 * Charge les fontes websafe
+			 */
+			$fontFile = '';
+			foreach ($fonts as $fontId) {
+				if ( isset($fontsAvailable['websafe'][$fontId])) {
+					self::$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
+				}
+			}
+
 			/**
 			* Chargement des polices en ligne dans un fichier fonts.html inclus dans main.php
 			*/
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
-				if ( isset($fontsAvailable[$fontId]) &&
-					 $fontsAvailable[$fontId]['type'] === 'imported' ) {
+				if ( isset($fontsAvailable['imported'][$fontId])) {
 						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
+						// Tableau pour la construction de la feuille de style
+						self::$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
 			}
 			// Enregistre la personnalisation
@@ -2373,12 +2378,14 @@ class core extends common {
 			 */
 			foreach ($fonts as $fontId) {
 				// Validité du tableau :
-				if ( array_key_exists($fontId, self::$fonts) &&
-						file_exists(self::DATA_DIR . 'fonts/' . $fontName) ) {
+				if ( isset($fontsAvailable['files'][$fontId]) &&
+						file_exists(self::DATA_DIR . 'fonts/' . $f) ) {
 						// Chargement de la police
 						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
-						$css .= '@font-face {font-family:"' . self::$fonts[$fontId] . '";';
+						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
 						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
+						// Tableau pour la construction de la feuille de style
+						self::$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
 
 			}
@@ -2386,7 +2393,7 @@ class core extends common {
 			// Fond du body
 			$colors = helper::colorVariants($this->getData(['theme', 'body', 'backgroundColor']));
 			// Body
-			$css .= 'body{font-family:"' . self::$fonts[$this->getData(['theme', 'text', 'font'])] . '",sans-serif}';
+			$css .= 'body{font-family:' . self::$fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
 			if($themeBodyImage = $this->getData(['theme', 'body', 'image'])) {
 				// Image dans html pour éviter les déformations.
 				$css .= 'html {background-image:url("../file/source/' . $themeBodyImage . '");background-position:' . $this->getData(['theme', 'body', 'imagePosition']) . ';background-attachment:' . $this->getData(['theme', 'body', 'imageAttachment']) . ';background-size:' . $this->getData(['theme', 'body', 'imageSize']) . ';background-repeat:' . $this->getData(['theme', 'body', 'imageRepeat']) . '}';
@@ -2404,7 +2411,7 @@ class core extends common {
 			$colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor']));
 			$css .= 'a{color:' . $colors['normal'] . '}';
 			// Couleurs de site dans TinyMCe
-			$css .= 'div.mce-edit-area {font-family:"' .  self::$fonts[$this->getData(['theme', 'text', 'font'])] . '",sans-serif}';
+			$css .= 'div.mce-edit-area {font-family:' .  self::$fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
 			// Site dans TinyMCE
 			$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
 			$css .= 'span.mce-text{background-color: unset !important;}';
@@ -2445,7 +2452,7 @@ class core extends common {
 			$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
 			$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';
 			$colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor']));
-			$css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:' . $colors['normal'] . ';font-family:"' .  self::$fonts[$this->getData(['theme', 'title', 'font'])] . '",sans-serif;font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
+			$css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:' . $colors['normal'] . ';font-family:' .  self::$fonts[$this->getData(['theme', 'title', 'font'])] . ';font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
 			$css .= 'h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:' . $colors['darken'] . '}';
 			// Les blocs
 			$colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundColor']));
@@ -2479,7 +2486,7 @@ class core extends common {
 					$css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}';
 				}
 				$colors = helper::colorVariants($this->getData(['theme', 'header', 'textColor']));
-				$css .= 'header span{color:' . $colors['normal'] . ';font-family:"' .  self::$fonts[$this->getData(['theme', 'header', 'font'])] . '",sans-serif;font-weight:' . $this->getData(['theme', 'header', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'header', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'header', 'textTransform']) . '}';
+				$css .= 'header span{color:' . $colors['normal'] . ';font-family:' .  self::$fonts[$this->getData(['theme', 'header', 'font'])] . ';font-weight:' . $this->getData(['theme', 'header', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'header', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'header', 'textTransform']) . '}';
 			}
 
 			// Bannière au contenu personnalisé
@@ -2528,7 +2535,7 @@ class core extends common {
 					$css .= 'nav{padding:0 10px;}';
 			}
 
-			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' .  self::$fonts[$this->getData(['theme', 'menu', 'font'])] . '",sans-serif;font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
+			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:' .  self::$fonts[$this->getData(['theme', 'menu', 'font'])] . ';font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
 			// Pied de page
 
 			$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
@@ -2538,7 +2545,7 @@ class core extends common {
 				$css .= 'footer{padding:0}';
 			}
 
-			$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' .  self::$fonts[$this->getData(['theme', 'footer', 'font'])] . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
+			$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:' .  self::$fonts[$this->getData(['theme', 'footer', 'font'])] . ';font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
 			$css .= 'footer {background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer a{color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
@@ -2549,10 +2556,8 @@ class core extends common {
 			$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
 			$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
 
-
 			// Enregistre la personnalisation
 			file_put_contents(self::DATA_DIR.'theme.css', $css);
-			file_put_contents(self::DATA_DIR.'fonts/fonts.html', $fontFile);
 			// Effacer le cache pour tenir compte de la couleur de fond TinyMCE
 			header("Expires: Tue, 01 Jan 2000 00:00:00 GMT");
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -2579,52 +2584,51 @@ class core extends common {
 			$fonts = array_unique($fonts);
 
 			/**
-			 * Fontes Web Safe, ne sont pas chargées.
+			 * Charge les fontes websafe
 			 */
+			$fontFile = '';
 			foreach ($fonts as $fontId) {
-				if (array_key_exists($fontId, self::$fontsWebSafe) ) {
-					unset($fonts[$fontId]);
+				if ( isset($fontsAvailable['websafe'][$fontId])) {
+					self::$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
 				}
 			}
 
-			// Lire le fichier des fontes locales
-			$localFonts = $this->getData(['fonts', 'files']);
-
 			/**
-			* Chargement des polices en ligne
+			* Chargement des polices en ligne dans un fichier fonts.html inclus dans main.php
 			*/
+			$fontFile = '';
 			foreach ($fonts as $fontId) {
-				if (!array_key_exists($fontId, $localFonts) ) {
-					$css .= '@import url("https://fonts.cdnfonts.com/css/' . $fontId . '");';
-					// Supprimer l'élément des fontes chargées en ligne
-					unset($fonts[$fontId]);
+				if ( isset($fontsAvailable['imported'][$fontId])) {
+						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
+						// Tableau pour la construction de la feuille de style
+						self::$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
 			}
+			// Enregistre la personnalisation
+			file_put_contents(self::DATA_DIR.'fonts/fonts.html', $fontFile);
 
 			/**
 			 * Fontes installées localement
 			 */
-			// Validité du format
-			if (  !empty($localFonts)
-			) {
-				foreach ($localFonts as $fontId => $fontName) {
-					// Validité du tableau :
-					if ( array_key_exists($fontId, self::$fonts) &&
-							file_exists(self::DATA_DIR . 'fonts/' . $fontName) ) {
-							// Chargement de la police
-							//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
-							$css .= '@font-face {font-family:"' . self::$fonts[$fontId] . '";';
-							$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
-					}
-
+			foreach ($fonts as $fontId) {
+				// Validité du tableau :
+				if ( isset($fontsAvailable['files'][$fontId]) &&
+						file_exists(self::DATA_DIR . 'fonts/' . $f) ) {
+						// Chargement de la police
+						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
+						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
+						// Tableau pour la construction de la feuille de style
+						self::$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
+
 			}
 
 			// Thème Administration
 			$colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
 			$css .= '#site{background-color:' . $colors['normal']. ';}';
-			$css .= '.row > div {font:' . $this->getData(['admin','fontSize']) . ' "' . self::$fonts[$this->getData(['admin','fontText'])]  . '", sans-serif;}';
-			$css .= 'body h1, h2, h3, h4 a, h5, h6 {font-family:"' .   self::$fonts[$this->getData(['admin','fontTitle'])] . '", sans-serif;color:' . $this->getData(['admin','colorTitle' ]) . ';}';
+			$css .= '.row > div {font:' . self::$fonts[$this->getData(['admin','fontText'])]  . ';font-size:' . $this->getData(['admin','fontSize']) .'}';
+			$css .= 'body h1, h2, h3, h4 a, h5, h6 {font-family:' .   self::$fonts[$this->getData(['admin','fontTitle'])] . ';color:' . $this->getData(['admin','colorTitle' ]) . ';}';
 
 			// TinyMCE
 			$css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}';
diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 4f3e20c8..3dcf1306 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -813,26 +813,26 @@ if ($this->getData(['core', 'dataVersion']) < 11303) {
 if ($this->getData(['core', 'dataVersion']) < 11400) {
 
 	$fonts = [
-		'arimo' => 'Arimo',
-		'arvo' => 'Arvo',
-		'dancing-script' => 'Dancing Script',
-		'droid-sans-2' => 'Droid Sans',
-		'droid-serif-2' => 'Droid Serif',
-		'indie-flower' => 'Indie Flower',
-		'liberation-sans' => 'Liberation Sans',
-		'liberation-serif' => 'Liberation Serif',
-		'lobster-2' => 'Lobster',
-		'lora' => 'Lora',
-		'lato' => 'Lato',
-		'old-standard-tt-3' => 'Old Standard TT',
-		'open-sans' => 'Open Sans',
-		'oswald-4' => 'Oswald',
-		'pt-mono' => 'PT Mono',
-		'pt-serif' => 'PT Serif',
-		'rancho' => 'Rancho',
-		'roboto' => 'Roboto',
-		'ubuntu' => 'Ubuntu',
-		'vollkorn' => 'Vollkorn'
+		'arimo'=> 'Arimo,  sans-serif',
+		'arvo'=> 'Arvo, sans-serif',
+		'dancing-script' => '"Dancing Script", sans-serif',
+		'droid-sans-2'=> '"Droid Sans", sans-serif',
+		'droid-serif-2'=> '"Droid Serif", serif',
+		'indie-flower'=> '"Indie Flower", sans-serif',
+		'liberation-sans'=> '"Liberation Sans", sans-serif',
+		'liberation-serif'=> '"Liberation Serif", serif',
+		'lobster-2'=> 'Lobster, sans-serif',
+		'lora'=> 'Lora, serif',
+		'lato'=> 'Lato, sans-serif',
+		'old-standard-tt-3'=> '"Old Standard TT", serif',
+		'open-sans'=> '"Open Sans", sans-serif',
+		'oswald-4'=> 'Oswald, sans-serif',
+		'pt-mono'=> '"PT Mono", monospace',
+		'pt-serif'=> '"PT Serif", serif',
+		'rancho'=> 'Rancho, sans-serif',
+		'roboto'=> 'Roboto, sans-serif',
+		'ubuntu'=> 'Ubuntu, sans-serif',
+		'vollkorn'=> 'Vollkorn, serif'
 	];
 	$this->setData(['fonts', 'imported', $fonts]);
 
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 583eb1e9..ee0d0dd8 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -88,26 +88,26 @@ class init extends common {
 		'fonts' => [
 			'files' => [],
 			'imported'=> [
-				'arimo'=> 'Arimo',
-				'arvo'=> 'Arvo',
-				'dancing-script' => 'Dancing Script',
-				'droid-sans-2'=> 'Droid Sans',
-				'droid-serif-2'=> 'Droid Serif',
-				'indie-flower'=> 'Indie Flower',
-				'liberation-sans'=> 'Liberation Sans',
-				'liberation-serif'=> 'Liberation Serif',
-				'lobster-2'=> 'Lobster',
-				'lora'=> 'Lora',
-				'lato'=> 'Lato',
-				'old-standard-tt-3'=> 'Old Standard TT',
-				'open-sans'=> 'Open Sans',
-				'oswald-4'=> 'Oswald',
-				'pt-mono'=> 'PT Mono',
-				'pt-serif'=> 'PT Serif',
-				'rancho'=> 'Rancho',
-				'roboto'=> 'Roboto',
-				'ubuntu'=> 'Ubuntu',
-				'vollkorn'=> 'Vollkorn'
+				'arimo'=> 'Arimo,  sans-serif',
+				'arvo'=> 'Arvo, sans-serif',
+				'dancing-script' => '"Dancing Script", sans-serif',
+				'droid-sans-2'=> '"Droid Sans", sans-serif',
+				'droid-serif-2'=> '"Droid Serif", serif',
+				'indie-flower'=> '"Indie Flower", sans-serif',
+				'liberation-sans'=> '"Liberation Sans", sans-serif',
+				'liberation-serif'=> '"Liberation Serif", serif',
+				'lobster-2'=> 'Lobster, sans-serif',
+				'lora'=> 'Lora, serif',
+				'lato'=> 'Lato, sans-serif',
+				'old-standard-tt-3'=> '"Old Standard TT", serif',
+				'open-sans'=> '"Open Sans", sans-serif',
+				'oswald-4'=> 'Oswald, sans-serif',
+				'pt-mono'=> '"PT Mono", monospace',
+				'pt-serif'=> '"PT Serif", serif',
+				'rancho'=> 'Rancho, sans-serif',
+				'roboto'=> 'Roboto, sans-serif',
+				'ubuntu'=> 'Ubuntu, sans-serif',
+				'vollkorn'=> 'Vollkorn, serif'
 			]
 		],
 		'page' => [

From 142611e69dd962edbed46fb7a57dce8b72a9b839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Thu, 10 Mar 2022 17:06:28 +0100
Subject: [PATCH 15/26] theme WIP

---
 core/module/theme/theme.php | 2112 ++++++++++++++++++-----------------
 1 file changed, 1063 insertions(+), 1049 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 19a209c1..5fa0430f 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -1,1049 +1,1063 @@
-<?php
-
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @license GNU General Public License, version 3
- * @link http://zwiicms.fr/
- * @copyright  :  Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2022, Frédéric Tempez
- */
-
-class theme extends common {
-
-	public static $actions = [
-		'advanced' => self::GROUP_ADMIN,
-		'body' => self::GROUP_ADMIN,
-		'footer' => self::GROUP_ADMIN,
-		'header' => self::GROUP_ADMIN,
-		'index' => self::GROUP_ADMIN,
-		'menu' => self::GROUP_ADMIN,
-		'reset' => self::GROUP_ADMIN,
-		'site' => self::GROUP_ADMIN,
-		'admin' => self::GROUP_ADMIN,
-		'manage' => self::GROUP_ADMIN,
-		'export' => self::GROUP_ADMIN,
-		'import' => self::GROUP_ADMIN,
-		'save' => self::GROUP_ADMIN,
-		'fonts' => self::GROUP_ADMIN,
-		'fontAdd' => self::GROUP_ADMIN,
-		'fontDelete' => self::GROUP_ADMIN
-	];
-	public static $aligns = [
-		'left' => 'À gauche',
-		'center' => 'Au centre',
-		'right' => 'À droite'
-	];
-	public static $attachments = [
-		'scroll' => 'Standard',
-		'fixed' => 'Fixe'
-	];
-	public static $containerWides = [
-		'container' => 'Limitée au site',
-		'none' => 'Etendue sur la page'
-	];
-	public static $footerblocks = [
-		1 => [
-			'hide' => 'Masqué',
-			'center' => 'Affiché' ],
-		2 => [
-			'hide' => 'Masqué',
-			'left' => 'À gauche',
-			'right' => 'À droite' ],
-		3 => [
-			'hide' => 'Masqué',
-			'left' => 'À gauche',
-			'center' => 'Au centre',
-			'right' => 'À droite' ],
-		4 => [
-			'hide' => 'Masqué',
-			'left' => 'En haut',
-			'center' => 'Au milieu',
-			'right' => 'En bas' ]
-	];
-
-	public static $fontWeights = [
-		'normal' => 'Maigre',
-		'bold' => 'Gras'
-	];
-	public static $footerHeights = [
-		'0px' => 'Nulles (0px)',
-		'5px' => 'Très petites (5px)',
-		'10px' => 'Petites (10px)',
-		'15px' => 'Moyennes (15px)',
-		'20px' => 'Grandes (20px)'
-	];
-	public static $footerPositions = [
-		'hide' => 'Caché',
-		'site' => 'Dans le site',
-		'body' => 'En dessous du site'
-	];
-	public static $footerFontSizes = [
-		'.8em' => 'Très petite (80%)',
-		'.9em' => 'Petite (90%)',
-		'1em' => 'Standard (100%)',
-		'1.1em' => 'Moyenne (110%)',
-		'1.2em' => 'Grande (120%)',
-		'1.3em' => 'Très grande (130%)'
-	];
-	public static $headerFontSizes = [
-		'1.6em' => 'Très petite (160%)',
-		'1.8em' => 'Petite (180%)',
-		'2em' => 'Moyenne (200%)',
-		'2.2em' => 'Grande (220%)',
-		'2.4vmax' => 'Très grande (240%)'
-	];
-	public static $headerHeights = [
-		'unset' => 'Libre', // texte dynamique cf header.js.php
-		'100px' => 'Très petite (100px) ',
-		'150px' => 'Petite (150px)',
-		'200px' => 'Moyenne (200px)',
-		'300px' => 'Grande (300px)',
-		'400px' => 'Très grande (400px)',
-	];
-	public static $headerPositions = [
-		'body' => 'Au dessus du site',
-		'site' => 'Dans le site',
-		'hide' => 'Cachée'
-	];
-	public static $headerFeatures = [
-		'wallpaper' => 'Couleur unie ou papier-peint',
-		'feature'   => 'Contenu personnalisé'
-	];
-	public static $imagePositions = [
-		'top left' => 'En haut à gauche',
-		'top center' => 'En haut au centre',
-		'top right' => 'En haut à droite',
-		'center left' => 'Au milieu à gauche',
-		'center center' => 'Au milieu au centre',
-		'center right' => 'Au milieu à droite',
-		'bottom left' => 'En bas à gauche',
-		'bottom center' => 'En bas au centre',
-		'bottom right' => 'En bas à droite'
-	];
-	public static $menuFontSizes = [
-		'.8em' => 'Très petite (80%)',
-		'.9em' => 'Petite (90%)',
-		'1em' => 'Standard (100%)',
-		'1.1em' => 'Moyenne (110%)',
-		'1.2em' => 'Grande (120%)',
-		'1.3em' => 'Très grande (130%)'
-	];
-	public static $menuHeights = [
-		'5px 10px' => 'Très petite',
-		'10px' => 'Petite',
-		'15px 10px' => 'Moyenne',
-		'20px 15px' => 'Grande',
-		'25px 15px' => 'Très grande'
-	];
-	public static $menuPositionsSite = [
-		'top' => 'En-dehors du site',
-		'site-first' => 'Avant la bannière',
-		'site-second' => 'Après la bannière',
-		'hide' => 'Caché'
-	];
-	public static $menuPositionsBody = [
-		'top' => 'En-dehors du site',
-		'body-first' => 'Avant la bannière',
-		'body-second' => 'Après la bannière',
-		'site' => 'Dans le site',
-		'hide' => 'Caché'
-	];
-	public static $menuRadius = [
-		'0px' => 'Aucun',
-		'3px 3px 0px 0px' => 'Très léger',
-		'6px 6px 0px 0px' => 'Léger',
-		'9px 9px 0px 0px' => 'Moyen',
-		'12px 12px 0px 0px' => 'Important',
-		'15px 15px 0px 0px' => 'Très important'
-	];
-	public static $radius = [
-		'0px' => 'Aucun',
-		'5px' => 'Très léger',
-		'10px' => 'Léger',
-		'15px' => 'Moyen',
-		'25px' => 'Important',
-		'50px' => 'Très important'
-	];
-	public static $repeats = [
-		'no-repeat' => 'Ne pas répéter',
-		'repeat-x' => 'Sur l\'axe horizontal',
-		'repeat-y' => 'Sur l\'axe vertical',
-		'repeat' => 'Sur les deux axes'
-	];
-	public static $shadows = [
-		'0px' => 'Aucune',
-		'1px 1px 5px' => 'Très légère',
-		'1px 1px 10px' => 'Légère',
-		'1px 1px 15px' => 'Moyenne',
-		'1px 1px 25px' => 'Importante',
-		'1px 1px 50px' => 'Très importante'
-	];
-	public static $siteFontSizes = [
-		'12px' => '12 pixels',
-		'13px' => '13 pixels',
-		'14px' => '14 pixels',
-		'15px' => '15 pixels',
-		'16px' => '16 pixels'
-	];
-	public static $bodySizes = [
-		'auto' => 'Automatique',
-		'100% 100%' => 'Image étirée (100% 100%)',
-		'cover' => 'Responsive (cover)',
-		'contain' => 'Responsive (contain)'
-	];
-	public static $textTransforms = [
-		'none' => 'Standard',
-		'lowercase' => 'Minuscules',
-		'uppercase' => 'Majuscules',
-		'capitalize' => 'Majuscule à chaque mot'
-	];
-	public static $siteWidths = [
-		'750px' => 'Petite (750 pixels)',
-		'960px' => 'Moyenne (960 pixels)',
-		'1170px' => 'Grande (1170 pixels)',
-		'100%' => 'Fluide (100%)'
-	];
-	public static $headerWide = [
-		'auto auto' => 'Automatique',
-		'100% 100%' => 'Image étirée (100% 100%)',
-		'cover' => 'Responsive (cover)',
-		'contain' => 'Responsive (contain)'
-	];
-	public static $footerTemplate = [
-		'1' => 'Une seule colonne',
-		'2' => 'Deux colonnes : 1/2 - 1/2',
-		'3' => 'Trois colonnes : 1/3 - 1/3 - 1/3',
-		'4' => 'Trois lignes superposées'
-	];
-	public static $burgerContent = [
-		'none' => 'Aucun',
-		'title' => 'Titre du site',
-		'logo' => 'Logo du site'
-	];
-
-
-	// Variable pour construire la liste des pages du site
-	public static $pagesList = [];
-	// Variable pour construire la liste des fontes installées
-	public static $fontsList = [];
-
-	/**
-	 * Thème des écrans d'administration
-	 */
-	public function admin() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$this->setData(['admin', [
-				'backgroundColor' 	=> $this->getInput('adminBackgroundColor'),
-				'colorTitle' 		=> $this->getInput('adminColorTitle'),
-				'colorText'			=> $this->getInput('adminColorText'),
-				'colorButtonText' 	=> $this->getInput('adminColorButtonText'),
-				'backgroundColorButton' 	=> $this->getInput('adminColorButton'),
-				'backgroundColorButtonGrey'	=> $this->getInput('adminColorGrey'),
-				'backgroundColorButtonRed'	=> $this->getInput('adminColorRed'),
-				'backgroundColorButtonGreen'=> $this->getInput('adminColorGreen'),
-				'backgroundColorButtonHelp'=> $this->getInput('adminColorHelp'),
-				'fontText' 		=> $this->getInput('adminFontText'),
-				'fontSize' 	=> $this->getInput('adminFontTextSize'),
-				'fontTitle' => $this->getInput('adminFontTitle'),
-				'backgroundBlockColor' => $this->getInput('adminBackGroundBlockColor'),
-				'borderBlockColor' => $this->getInput('adminBorderBlockColor'),
-			]]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme/admin',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Administration',
-			'view' => 'admin',
-			'vendor' => [
-				'tinycolorpicker'
-			],
-		]);
-	}
-
-	/**
-	 * Mode avancé
-	 */
-	public function advanced() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			// Enregistre le CSS
-			file_put_contents(self::DATA_DIR.'custom.css', $this->getInput('themeAdvancedCss', null));
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme/advanced',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Éditeur CSS',
-			'vendor' => [
-				'codemirror'
-			],
-			'view' => 'advanced'
-		]);
-	}
-
-	/**
-	 * Options de l'arrière plan
-	 */
-	public function body() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$this->setData(['theme', 'body', [
-				'backgroundColor' => $this->getInput('themeBodyBackgroundColor'),
-				'image' => $this->getInput('themeBodyImage'),
-				'imageAttachment' => $this->getInput('themeBodyImageAttachment'),
-				'imagePosition' => $this->getInput('themeBodyImagePosition'),
-				'imageRepeat' => $this->getInput('themeBodyImageRepeat'),
-				'imageSize' => $this->getInput('themeBodyImageSize'),
-				'toTopbackgroundColor' => $this->getInput('themeBodyToTopBackground'),
-				'toTopColor' => $this->getInput('themeBodyToTopColor')
-			]]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation de l\'arrière plan',
-			'vendor' => [
-				'tinycolorpicker'
-			],
-			'view' => 'body'
-		]);
-	}
-
-	/**
-	 * Options du pied de page
-	 */
-	public function footer() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			if ( $this->getInput('themeFooterCopyrightPosition') === 'hide' &&
-				 $this->getInput('themeFooterSocialsPosition') === 'hide' &&
-				 $this->getInput('themeFooterTextPosition') === 'hide' 	) {
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'Sélectionnez au moins un contenu à afficher',
-					'redirect' => helper::baseUrl() . 'theme/footer',
-					'state' => false
-				]);
-			} else {
-				$this->setData(['theme', 'footer', [
-					'backgroundColor' => $this->getInput('themeFooterBackgroundColor'),
-					'copyrightAlign' => $this->getInput('themeFooterCopyrightAlign'),
-					'height' => $this->getInput('themeFooterHeight'),
-					'loginLink' => $this->getInput('themeFooterLoginLink'),
-					'margin' => $this->getInput('themeFooterMargin', helper::FILTER_BOOLEAN),
-					'position' => $this->getInput('themeFooterPosition'),
-					'fixed' => $this->getInput('themeFooterFixed', helper::FILTER_BOOLEAN),
-					'socialsAlign' => $this->getInput('themeFooterSocialsAlign'),
-					'text' => $this->getInput('themeFooterText', null),
-					'textAlign' => $this->getInput('themeFooterTextAlign'),
-					'textColor' => $this->getInput('themeFooterTextColor'),
-					'copyrightPosition' => $this->getInput('themeFooterCopyrightPosition'),
-					'textPosition' => $this->getInput('themeFooterTextPosition'),
-					'socialsPosition' => $this->getInput('themeFooterSocialsPosition'),
-					'textTransform' => $this->getInput('themeFooterTextTransform'),
-					'font' => $this->getInput('themeFooterFont'),
-					'fontSize' => $this->getInput('themeFooterFontSize'),
-					'fontWeight' => $this->getInput('themeFooterFontWeight'),
-					'displayVersion' => $this->getInput('themefooterDisplayVersion', helper::FILTER_BOOLEAN),
-					'displaySiteMap' => $this->getInput('themefooterDisplaySiteMap', helper::FILTER_BOOLEAN),
-					'displayCopyright' => $this->getInput('themefooterDisplayCopyright', helper::FILTER_BOOLEAN),
-					'displayCookie' => $this->getInput('themefooterDisplayCookie', helper::FILTER_BOOLEAN),
-					'displayLegal' =>  $this->getInput('themeFooterDisplayLegal', helper::FILTER_BOOLEAN),
-					'displaySearch' =>  $this->getInput('themeFooterDisplaySearch', helper::FILTER_BOOLEAN),
-					'displayMemberBar'=> $this->getInput('themeFooterDisplayMemberBar', helper::FILTER_BOOLEAN),
-					'template' => $this->getInput('themeFooterTemplate')
-				]]);
-
-				// Sauvegarder la configuration localisée
-				$this->setData(['locale','legalPageId', $this->getInput('configLegalPageId')]);
-				$this->setData(['locale','searchPageId', $this->getInput('configSearchPageId')]);
-
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'Modifications enregistrées',
-					'redirect' => helper::baseUrl() . 'theme',
-					'state' => true
-				]);
-			}
-		}
-
-		// Liste des pages
-		self::$pagesList = $this->getData(['page']);
-		foreach(self::$pagesList as $page => $pageId) {
-			if ($this->getData(['page',$page,'block']) === 'bar' ||
-				$this->getData(['page',$page,'disable']) === true) {
-				unset(self::$pagesList[$page]);
-			}
-		}
-
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation du pied de page',
-			'vendor' => [
-				'tinycolorpicker',
-				'tinymce'
-			],
-			'view' => 'footer'
-		]);
-	}
-
-	/**
-	 * Options de la bannière
-	 */
-	public function header() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			// Modification des URL des images dans la bannière perso
-			$featureContent = $this->getInput('themeHeaderText', null);
-			$featureContent = str_replace(helper::baseUrl(false,false), './', $featureContent);
-
-			/**
-			* Stocker les images incluses dans la bannière perso dans un tableau
-			*/
-			preg_match_all('/<img[^>]+>/i',$featureContent, $results);
-			foreach($results[0] as $value) {
-				// Lire le contenu XML
-				$sx = simplexml_load_string($value);
-				// Élément à remplacer
-				$files [] = str_replace('./site/file/source/','',(string) $sx[0]['src']);
-			}
-
-			// Sauvegarder
-			$this->setData(['theme', 'header', [
-				'backgroundColor' => $this->getInput('themeHeaderBackgroundColor'),
-				'font' => $this->getInput('themeHeaderFont'),
-				'fontSize' => $this->getInput('themeHeaderFontSize'),
-				'fontWeight' => $this->getInput('themeHeaderFontWeight'),
-				'height' => $this->getInput('themeHeaderHeight'),
-				'wide' => $this->getInput('themeHeaderWide'),
-				'image' => $this->getInput('themeHeaderImage'),
-				'imagePosition' => $this->getInput('themeHeaderImagePosition'),
-				'imageRepeat' => $this->getInput('themeHeaderImageRepeat'),
-				'margin' => $this->getInput('themeHeaderMargin', helper::FILTER_BOOLEAN),
-				'position' => $this->getInput('themeHeaderPosition'),
-				'textAlign' => $this->getInput('themeHeaderTextAlign'),
-				'textColor' => $this->getInput('themeHeaderTextColor'),
-				'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN),
-				'textTransform' => $this->getInput('themeHeaderTextTransform'),
-				'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN),
-				'imageContainer' => $this->getInput('themeHeaderImageContainer'),
-				'tinyHidden' => $this->getInput('themeHeaderTinyHidden', helper::FILTER_BOOLEAN),
-				'feature' => $this->getInput('themeHeaderFeature'),
-				'featureContent' => $featureContent,
-				'featureFiles' => 	$files
-			]]);
-			// Modification de la position du menu selon la position de la bannière
-			if  ( $this->getData(['theme','header','position']) == 'site'  )
-				{
-					$this->setData(['theme', 'menu', 'position',str_replace ('body-','site-',$this->getData(['theme','menu','position']))]);
-			}
-			if  ( $this->getData(['theme','header','position']) == 'body')
-				{
-					$this->setData(['theme', 'menu', 'position',str_replace ('site-','body-',$this->getData(['theme','menu','position']))]);
-			}
-			// Menu accroché à la bannière qui devient cachée
-			if  ( $this->getData(['theme','header','position']) == 'hide' &&
-				  in_array( $this->getData(['theme','menu','position']) , ['body-first', 'site-first', 'body-first' , 'site-second'])
-				 ) {
-					$this->setData(['theme', 'menu', 'position','site']);
-			}
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation de la bannière',
-			'vendor' => [
-				'tinycolorpicker',
-				'tinymce'
-			],
-			'view' => 'header'
-		]);
-	}
-
-	/**
-	 * Accueil de la personnalisation
-	 */
-	public function index() {
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation des thèmes',
-			'view' => 'index'
-		]);
-	}
-
-	/**
-	 * Options du menu
-	 */
-	public function menu() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$this->setData(['theme', 'menu', [
-				'backgroundColor' => $this->getInput('themeMenuBackgroundColor'),
-				'backgroundColorSub' => $this->getInput('themeMenuBackgroundColorSub'),
-				'font' => $this->getInput('themeMenuFont'),
-				'fontSize' => $this->getInput('themeMenuFontSize'),
-				'fontWeight' => $this->getInput('themeMenuFontWeight'),
-				'height' => $this->getInput('themeMenuHeight'),
-				'wide' => $this->getInput('themeMenuWide'),
-				'loginLink' => $this->getInput('themeMenuLoginLink', helper::FILTER_BOOLEAN),
-				'margin' => $this->getInput('themeMenuMargin', helper::FILTER_BOOLEAN),
-				'position' => $this->getInput('themeMenuPosition'),
-				'textAlign' => $this->getInput('themeMenuTextAlign'),
-				'textColor' => $this->getInput('themeMenuTextColor'),
-				'textTransform' => $this->getInput('themeMenuTextTransform'),
-				'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN),
-				'activeColorAuto' => $this->getInput('themeMenuActiveColorAuto', helper::FILTER_BOOLEAN),
-				'activeColor' => $this->getInput('themeMenuActiveColor'),
-				'activeTextColor' => $this->getInput('themeMenuActiveTextColor'),
-				'radius' => $this->getInput('themeMenuRadius'),
-				'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN),
-				'memberBar' =>  $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN),
-				'burgerLogo' => $this->getInput('themeMenuBurgerLogo'),
-				'burgerContent' => $this->getInput('themeMenuBurgerContent')
-			]]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation du menu',
-			'vendor' => [
-				'tinycolorpicker'
-			],
-			'view' => 'menu'
-		]);
-	}
-
-	/**
-	 * Options des fontes
-	 */
-	public function fonts() {
-
-		// Polices trouvées dans la configuration
-		$fonts = $this->getData(['fonts']);
-
-		// Polices liées au thème
-		$used = [
-			'Bannière' 		=> $this->getData (['theme', 'header', 'font']),
-			'Menu' 			=> $this->getData (['theme', 'menu', 'font']),
-			'Titre ' 		=> $this->getData (['theme', 'title', 'font']),
-			'Texte'   		=> $this->getData (['theme', 'text', 'font']),
-			'Pied de page' 	=> $this->getData (['theme', 'footer', 'font']),
-			'Titre (admin)' => $this->getData (['admin', 'fontTitle' ]),
-			'Admin (texte)' => $this->getData (['admin', 'fontText' ])
-		];
-
-		// Parcourir les fontes installées et construire le tableau pour le formulaire
-		foreach (self::$fonts as $fontId => $fontName) {
-
-			// Fontes utilisées par le thème
-			$fontUsed[$fontId] = '';
-			foreach ($used as $key => $value) {
-				if ( $value === $fontId) {
-					$fontUsed[$fontId] .=  $key . '<br/>';
-				}
-			}
-			self::$fontsList [] = [
-				'<span style="font-family:' . $fontName . '">' . $fontName . '</span>' ,
-				$fontId,
-				$fontUsed[$fontId],
-				//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
-				array_key_exists($fontId, $fonts['files']) ?
-							 $fonts['files'][$fontId] : 
-							 (array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
-				array_key_exists($fontId, $fonts['imported']) || array_key_exists($fontId, $fonts['files'])
-					? 	template::button('themeFontDelete' . $fontId, [
-							'class' => 'themeFontDelete buttonRed',
-							'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
-							'value' => template::ico('cancel'),
-							'disabled' => !empty($fontUsed[$fontId])
-						])
-					: ''
-			];
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Gestion des fontes',
-			'view' => 'fonts'
-		]);
-	}
-
-	/**
-	 * Ajouter une fonte
-	 */
-	public function fontAdd() {
-		// Soumission du formulaire
-		if ($this->isPost()) {
-
-			$fontId = $this->getInput('fontAddFontId', null, true);
-			$fontName = $this->getInput('fontAddFontName', null, true);
-			$filePath = $this->getInput('fontAddFile', null);
-			$e = explode ('/', $filePath);
-			$file = $e[count($e) - 1 ];
-
-			// Vérifier l'existence de fontId et validité de family namesi usage en ligne de cdnFonts
-			$data = helper::getUrlContents('https://www.cdnfonts.com/' . $fontId . '.font');
-
-			if ( $filePath === ''
-				 && $fontName !== ''
-				 && strpos($data, $fontName) === false
-			) {
-
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'Erreur de nom de fonte ou d\'identifiant',
-					'redirect' => helper::baseUrl() . 'theme/fontAdd',
-					'state' => false
-				]);
-
-			} else {
-
-				// Charger les données des fontes
-				$files = $this->getData(['fonts', 'files']);
-				$imported = $this->getData(['fonts', 'imported']);
-
-				// Concaténation dans les tableaux existants
-				$imported = array_merge([$fontId => $fontName], $imported);
-				$files = array_merge([$fontId => $file], $files);
-
-				// Copier la fonte si le nom du fichier est fourni
-				if (!empty($filePath)) {
-					copy ( self::FILE_DIR . 'source/' . $filePath, self::DATA_DIR . 'fonts/' . $file );
-				}
-
-				// Mettre à jour le fichier des fontes
-				$this->setData(['fonts', 'imported', $imported ]);
-				if (!empty($filePath) ) {
-					$this->setData(['fonts', 'files', $files ]);
-				}
-
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'La fonte a été importée',
-					'redirect' => helper::baseUrl() . 'theme/fonts',
-					'state' => true
-				]);
-			}
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Ajouter une fonte',
-			'view' => 'fontAdd'
-		]);
-	}
-
-	/**
-	 * Effacer une fonte
-	 */
-	public function fontDelete() {
-		// Jeton incorrect
-		if ($this->getUrl(3) !== $_SESSION['csrf']) {
-			// Valeurs en sortie
-			$this->addOutput([
-				'redirect' => helper::baseUrl()  . 'theme/fonts',
-				'notification' => 'Action non autorisée'
-			]);
-		}
-		// Suppression
-		else {
-
-			// Charger les données des fontes
-			$files = $this->getData(['fonts', 'files']);
-			$imported = $this->getData(['fonts', 'imported']);
-
-			// Effacer le fichier existant
-			if ( file_exists(self::DATA_DIR . $files[$this->getUrl(2)]) ) {
-				unlink(self::DATA_DIR . $files[$this->getUrl(2)]);
-			}
-
-			// Supprimer les entrées
-			unset($files[$this->getUrl(2)]);
-			unset($imported[$this->getUrl(2)]);
-
-			// Mettre à jour le fichier des fontes
-			$this->setData(['fonts', 'files', $files ]);
-			$this->setData(['fonts', 'imported', $imported ]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'redirect' => helper::baseUrl()  . 'theme/fonts',
-				'notification' => 'Fonte supprimée',
-				'state' => true
-			]);
-		}
-	}
-
-
-	/**
-	 * Réinitialisation de la personnalisation avancée
-	 */
-	public function reset() {
-		// $url prend l'adresse sans le token
-		$url = explode('&',$this->getUrl(2));
-
-		if  ( isset($_GET['csrf'])
-			 AND $_GET['csrf'] === $_SESSION['csrf']
-			) {
-			// Réinitialisation
-			$redirect ='';
-			switch ($url[0]) {
-				case 'admin':
-					$this->initData('admin');
-					$redirect = helper::baseUrl() . 'theme/admin';
-					break;
-				case 'manage':
-					$this->initData('theme');
-					$redirect = helper::baseUrl() . 'theme/manage';
-					break;
-				case 'custom':
-					unlink(self::DATA_DIR.'custom.css');
-					$redirect = helper::baseUrl() . 'theme/advanced';
-					break;
-				default :
-					$redirect = helper::baseUrl() . 'theme';
-			}
-
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Réinitialisation effectuée',
-				'redirect' => $redirect,
-				'state' => true
-			]);
-		} else {
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Jeton incorrect'
-			]);
-		}
-	}
-
-
-	/**
-	 * Options du site
-	 */
-	public function site() {
-		// Soumission du formulaire
-		if($this->isPost()) {
-			$this->setData(['theme', 'title', [
-				'font' => $this->getInput('themeTitleFont'),
-				'textColor' => $this->getInput('themeTitleTextColor'),
-				'fontWeight' => $this->getInput('themeTitleFontWeight'),
-				'textTransform' => $this->getInput('themeTitleTextTransform')
-			]]);
-			$this->setData(['theme', 'text', [
-				'font' => $this->getInput('themeTextFont'),
-				'fontSize' => $this->getInput('themeTextFontSize'),
-				'textColor' => $this->getInput('themeTextTextColor'),
-				'linkColor'=> $this->getInput('themeTextLinkColor')
-			]]);
-			$this->setData(['theme', 'site', [
-				'backgroundColor' => $this->getInput('themeSiteBackgroundColor'),
-				'radius' => $this->getInput('themeSiteRadius'),
-				'shadow' => $this->getInput('themeSiteShadow'),
-				'width' => $this->getInput('themeSiteWidth'),
-				'margin' => $this->getInput('themeSiteMargin',helper::FILTER_BOOLEAN)
-			]]);
-			$this->setData(['theme', 'button', [
-				'backgroundColor' => $this->getInput('themeButtonBackgroundColor')
-			]]);
-			$this->setData(['theme', 'block', [
-				'backgroundColor' => $this->getInput('themeBlockBackgroundColor'),
-				'borderColor' => $this->getInput('themeBlockBorderColor')
-			]]);
-			// Valeurs en sortie
-			$this->addOutput([
-				'notification' => 'Modifications enregistrées',
-				'redirect' => helper::baseUrl() . 'theme',
-				'state' => true
-			]);
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Personnalisation du site',
-			'vendor' => [
-				'tinycolorpicker',
-				'tinymce'
-			],
-			'view' => 'site'
-		]);
-	}
-
-	/**
-	 * Import du thème
-	 */
-	public function manage() {
-		if($this->isPost() ) {
-
-			$zipFilename =	$this->getInput('themeManageImport', helper::FILTER_STRING_SHORT, true);
-			$data = $this->import(self::FILE_DIR.'source/' . $zipFilename);
-			if ($data['success']) {
-				header("Refresh:0");
-			} else {
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => $data['notification'],
-					'state' => $data['success'],
-					'title' => 'Gestion des thèmes',
-					'view' => 'manage'
-				]);;
-			}
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Gestion des thèmes',
-			'view' => 'manage'
-		]);
-	}
-
-	/**
-	 * Importe un thème
-	 * @param string Url du thème à télécharger
-	 * @param @return array contenant $success = true ou false ; $ notification string message à afficher
-	 */
-
-	public function import($zipName = '') {
-
-		if ($zipName !== '' &&
-			file_exists($zipName)) {
-			// Init variables de retour
-			$success = false;
-			$notification = '';
-			// Dossier temporaire
-			$tempFolder = uniqid();
-			// Ouvrir le zip
-			$zip = new ZipArchive();
-			if ($zip->open($zipName) === TRUE) {
-				mkdir (self::TEMP_DIR . $tempFolder, 0755);
-				$zip->extractTo(self::TEMP_DIR . $tempFolder );
-				$modele = '';
-				// Archive de thème ?
-				if (
-					file_exists(self::TEMP_DIR . $tempFolder . '/site/data/custom.css')
-					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.css')
-					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.json')
-					) {
-						$modele = 'theme';
-				}
-				if(
-					file_exists(self::TEMP_DIR . $tempFolder . '/site/data/admin.json')
-					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/admin.css')
-				) {
-						$modele = 'admin';
-
-				}
-				if (!empty($modele)
-				) {
-					// traiter l'archive
-					$success = $zip->extractTo('.');
-
-					// Substitution des fontes Google
-					if ($modele = 'theme') {
-						$c = $this->subFonts(self::DATA_DIR . 'theme.json');
-						// Un remplacement nécessite la régénération de la feuille de style
-						if ($c > 0
-							AND file_exists(self::DATA_DIR . 'theme.css')
-						) {
-								unlink(self::DATA_DIR . 'theme.css');
-						}
-					}
-					if ($modele = 'admin') {
-						$c = $this->subFonts(self::DATA_DIR . 'admin.json');
-						// Un remplacement nécessite la régénération de la feuille de style
-						if ($c > 0
-							AND file_exists(self::DATA_DIR . 'admin.css')
-							) {
-								unlink(self::DATA_DIR . 'admin.css');
-						}
-					}
-
-					// traitement d'erreur
-					$notification = $success ? 'Le thème  a été importé' : 'Erreur lors de l\'extraction, vérifiez les permissions.';
-
-
-				} else {
-					// pas une archive de thème
-					$success = false;
-					$notification = 'Ce n\'est pas l\'archive d\'un thème !';
-				}
-				// Supprimer le dossier temporaire même si le thème est invalide
-				$this->removeDir(self::TEMP_DIR . $tempFolder);
-				$zip->close();
-			} else {
-				// erreur à l'ouverture
-				$success = false;
-				$notification = 'Impossible d\'ouvrir l\'archive';
-			}
-			return (['success' => $success, 'notification' => $notification]);
-		}
-
-		return (['success' => false, 'notification' => 'Archive non spécifiée ou introuvable']);
-	}
-
-
-
-	/**
-	 * Export du thème
-	 */
-	public function export() {
-		// Make zip
-			$zipFilename = $this->zipTheme($this->getUrl(2));
-			// Téléchargement du ZIP
-			header('Content-Description: File Transfer');
-			header('Content-Type: application/octet-stream');
-			header('Content-Transfer-Encoding: binary');
-			header('Content-Disposition: attachment; filename="' . $zipFilename . '"');
-			header('Content-Length: ' . filesize(self::TEMP_DIR . $zipFilename));
-			readfile(self::TEMP_DIR . $zipFilename);
-			// Nettoyage du dossier
-			unlink (self::TEMP_DIR . $zipFilename);
-			exit();
-	}
-
-	/**
-	 * Export du thème
-	 */
-	public function save() {
-		// Make zip
-		$zipFilename = $this->zipTheme($this->getUrl(2));
-		// Téléchargement du ZIP
-		if (!is_dir(self::FILE_DIR.'source/theme')) {
-			mkdir(self::FILE_DIR.'source/theme', 0755);
-		}
-		copy (self::TEMP_DIR . $zipFilename , self::FILE_DIR.'source/theme/' . $zipFilename);
-		// Nettoyage du dossier
-		unlink (self::TEMP_DIR . $zipFilename);
-		// Valeurs en sortie
-		$this->addOutput([
-			'notification' => 'Archive <b>'.$zipFilename.'</b> sauvegardée avec succès',
-			'redirect' => helper::baseUrl() . 'theme/manage',
-			'state' => true
-		]);
-	}
-
-	/**
-	 * construction du zip Fonction appelée par export() et save()
-	 * @param string $modele theme ou admin
-	 */
-	private function zipTheme($modele) {
-		// Creation du dossier
-		$zipFilename  =  $modele . date('Y-m-d-H-i-s', time()) . '.zip';
-		$zip = new ZipArchive();
-		if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) {
-			switch ($modele) {
-				case 'admin':
-					$zip->addFile(self::DATA_DIR.'admin.json',self::DATA_DIR.'admin.json');
-					$zip->addFile(self::DATA_DIR.'admin.css',self::DATA_DIR.'admin.css');
-					break;
-				case 'theme':
-					$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');
-					$zip->addFile(self::DATA_DIR.'theme.css',self::DATA_DIR.'theme.css');
-					$zip->addFile(self::DATA_DIR.'custom.css',self::DATA_DIR.'custom.css');
-					// Traite l'image dans le body
-					if ($this->getData(['theme','body','image']) !== '' ) {
-					$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','body','image']),
-								self::FILE_DIR.'source/'.$this->getData(['theme','body','image'])
-								);
-					}
-					// Traite l'image dans le header
-					if ($this->getData(['theme','header','image']) !== '' ) {
-					$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','header','image']),
-								  self::FILE_DIR.'source/'.$this->getData(['theme','header','image'])
-								);
-					}
-					// Traite les images du header perso
-					if (!empty($this->getData(['theme','header','featureFiles'])) ) {
-						foreach($this->getData(['theme','header','featureFiles']) as $value) {
-							$zip->addFile(self::FILE_DIR . 'source/' . $value,
-										  self::FILE_DIR . 'source/' . $value );
-						}
-					}
-					break;
-			}
-			$ret = $zip->close();
-		}
-		return ($zipFilename);
-	}
-
-	/**
-	 * Subsitution des fontes de Google Fonts vers CdnFont grâce à un tableau de conversion
-	 * @param string $file, nom du fichier json à convertir
-	 * @return int nombre de substitution effectuées
-	 */
-	private function subFonts($file)   {
-		// Tableau de substitution des fontes
-		$fonts = [
-			'Abril+Fatface' => 'abril-fatface',
-			'Arimo' => 'arimo',
-			'Arvo' => 'arvo',
-			'Berkshire+Swash' => 'berkshire-swash',
-			'Cabin' => 'genera',
-			'Dancing+Script' => 'dancing-script',
-			'Droid+Sans' => 'droid-sans-2',
-			'Droid+Serif' => 'droid-serif-2',
-			'Fira+Sans' => 'fira-sans',
-			'Inconsolata' => 'inconsolata-2',
-			'Indie+Flower' =>'indie-flower',
-			'Josefin+Slab' => 'josefin-sans-std',
-			'Lobster' => 'lobster-2',
-			'Lora' => 'lora',
-			'Lato' =>'lato',
-			'Marvel' => 'montserrat-ace',
-			'Old+Standard+TT' => 'old-standard-tt-3',
-			'Open+Sans' =>'open-sans',
-				// Corriger l'erreur de nom de police installée par défaut, il manquait un O en majuscule
-			'open+Sans' =>'open-sans',
-			'Oswald' =>'oswald-4',
-			'PT+Mono' => 'pt-mono',
-			'PT+Serif' =>'pt-serif',
-			'Raleway' => 'raleway-5',
-			'Rancho' => 'rancho',
-			'Roboto' => 'Roboto',
-			'Signika' => 'signika',
-			'Ubuntu' => 'ubuntu',
-			'Vollkorn' => 'vollkorn'
-		];
-
-		$data = file_get_contents($file);
-		$count = 0;
-		foreach ($fonts as $oldId => $newId){
-			$data = str_replace($oldId, $newId, $data, $c);
-			$count = $count + (int) $c;
-		}
-		// Sauvegarder la chaîne modifiée
-		if ($count > 0) {
-			file_put_contents($file, $data);
-		}
-		// Retourner le nombre d'occurrences
-		return ($count);
-	}
-
-}
+<?php
+
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ * @copyright  :  Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2022, Frédéric Tempez
+ */
+
+class theme extends common {
+
+	public static $actions = [
+		'advanced' => self::GROUP_ADMIN,
+		'body' => self::GROUP_ADMIN,
+		'footer' => self::GROUP_ADMIN,
+		'header' => self::GROUP_ADMIN,
+		'index' => self::GROUP_ADMIN,
+		'menu' => self::GROUP_ADMIN,
+		'reset' => self::GROUP_ADMIN,
+		'site' => self::GROUP_ADMIN,
+		'admin' => self::GROUP_ADMIN,
+		'manage' => self::GROUP_ADMIN,
+		'export' => self::GROUP_ADMIN,
+		'import' => self::GROUP_ADMIN,
+		'save' => self::GROUP_ADMIN,
+		'fonts' => self::GROUP_ADMIN,
+		'fontAdd' => self::GROUP_ADMIN,
+		'fontDelete' => self::GROUP_ADMIN
+	];
+	public static $aligns = [
+		'left' => 'À gauche',
+		'center' => 'Au centre',
+		'right' => 'À droite'
+	];
+	public static $attachments = [
+		'scroll' => 'Standard',
+		'fixed' => 'Fixe'
+	];
+	public static $containerWides = [
+		'container' => 'Limitée au site',
+		'none' => 'Etendue sur la page'
+	];
+	public static $footerblocks = [
+		1 => [
+			'hide' => 'Masqué',
+			'center' => 'Affiché' ],
+		2 => [
+			'hide' => 'Masqué',
+			'left' => 'À gauche',
+			'right' => 'À droite' ],
+		3 => [
+			'hide' => 'Masqué',
+			'left' => 'À gauche',
+			'center' => 'Au centre',
+			'right' => 'À droite' ],
+		4 => [
+			'hide' => 'Masqué',
+			'left' => 'En haut',
+			'center' => 'Au milieu',
+			'right' => 'En bas' ]
+	];
+
+	public static $fontWeights = [
+		'normal' => 'Maigre',
+		'bold' => 'Gras'
+	];
+	public static $footerHeights = [
+		'0px' => 'Nulles (0px)',
+		'5px' => 'Très petites (5px)',
+		'10px' => 'Petites (10px)',
+		'15px' => 'Moyennes (15px)',
+		'20px' => 'Grandes (20px)'
+	];
+	public static $footerPositions = [
+		'hide' => 'Caché',
+		'site' => 'Dans le site',
+		'body' => 'En dessous du site'
+	];
+	public static $footerFontSizes = [
+		'.8em' => 'Très petite (80%)',
+		'.9em' => 'Petite (90%)',
+		'1em' => 'Standard (100%)',
+		'1.1em' => 'Moyenne (110%)',
+		'1.2em' => 'Grande (120%)',
+		'1.3em' => 'Très grande (130%)'
+	];
+	public static $headerFontSizes = [
+		'1.6em' => 'Très petite (160%)',
+		'1.8em' => 'Petite (180%)',
+		'2em' => 'Moyenne (200%)',
+		'2.2em' => 'Grande (220%)',
+		'2.4vmax' => 'Très grande (240%)'
+	];
+	public static $headerHeights = [
+		'unset' => 'Libre', // texte dynamique cf header.js.php
+		'100px' => 'Très petite (100px) ',
+		'150px' => 'Petite (150px)',
+		'200px' => 'Moyenne (200px)',
+		'300px' => 'Grande (300px)',
+		'400px' => 'Très grande (400px)',
+	];
+	public static $headerPositions = [
+		'body' => 'Au dessus du site',
+		'site' => 'Dans le site',
+		'hide' => 'Cachée'
+	];
+	public static $headerFeatures = [
+		'wallpaper' => 'Couleur unie ou papier-peint',
+		'feature'   => 'Contenu personnalisé'
+	];
+	public static $imagePositions = [
+		'top left' => 'En haut à gauche',
+		'top center' => 'En haut au centre',
+		'top right' => 'En haut à droite',
+		'center left' => 'Au milieu à gauche',
+		'center center' => 'Au milieu au centre',
+		'center right' => 'Au milieu à droite',
+		'bottom left' => 'En bas à gauche',
+		'bottom center' => 'En bas au centre',
+		'bottom right' => 'En bas à droite'
+	];
+	public static $menuFontSizes = [
+		'.8em' => 'Très petite (80%)',
+		'.9em' => 'Petite (90%)',
+		'1em' => 'Standard (100%)',
+		'1.1em' => 'Moyenne (110%)',
+		'1.2em' => 'Grande (120%)',
+		'1.3em' => 'Très grande (130%)'
+	];
+	public static $menuHeights = [
+		'5px 10px' => 'Très petite',
+		'10px' => 'Petite',
+		'15px 10px' => 'Moyenne',
+		'20px 15px' => 'Grande',
+		'25px 15px' => 'Très grande'
+	];
+	public static $menuPositionsSite = [
+		'top' => 'En-dehors du site',
+		'site-first' => 'Avant la bannière',
+		'site-second' => 'Après la bannière',
+		'hide' => 'Caché'
+	];
+	public static $menuPositionsBody = [
+		'top' => 'En-dehors du site',
+		'body-first' => 'Avant la bannière',
+		'body-second' => 'Après la bannière',
+		'site' => 'Dans le site',
+		'hide' => 'Caché'
+	];
+	public static $menuRadius = [
+		'0px' => 'Aucun',
+		'3px 3px 0px 0px' => 'Très léger',
+		'6px 6px 0px 0px' => 'Léger',
+		'9px 9px 0px 0px' => 'Moyen',
+		'12px 12px 0px 0px' => 'Important',
+		'15px 15px 0px 0px' => 'Très important'
+	];
+	public static $radius = [
+		'0px' => 'Aucun',
+		'5px' => 'Très léger',
+		'10px' => 'Léger',
+		'15px' => 'Moyen',
+		'25px' => 'Important',
+		'50px' => 'Très important'
+	];
+	public static $repeats = [
+		'no-repeat' => 'Ne pas répéter',
+		'repeat-x' => 'Sur l\'axe horizontal',
+		'repeat-y' => 'Sur l\'axe vertical',
+		'repeat' => 'Sur les deux axes'
+	];
+	public static $shadows = [
+		'0px' => 'Aucune',
+		'1px 1px 5px' => 'Très légère',
+		'1px 1px 10px' => 'Légère',
+		'1px 1px 15px' => 'Moyenne',
+		'1px 1px 25px' => 'Importante',
+		'1px 1px 50px' => 'Très importante'
+	];
+	public static $siteFontSizes = [
+		'12px' => '12 pixels',
+		'13px' => '13 pixels',
+		'14px' => '14 pixels',
+		'15px' => '15 pixels',
+		'16px' => '16 pixels'
+	];
+	public static $bodySizes = [
+		'auto' => 'Automatique',
+		'100% 100%' => 'Image étirée (100% 100%)',
+		'cover' => 'Responsive (cover)',
+		'contain' => 'Responsive (contain)'
+	];
+	public static $textTransforms = [
+		'none' => 'Standard',
+		'lowercase' => 'Minuscules',
+		'uppercase' => 'Majuscules',
+		'capitalize' => 'Majuscule à chaque mot'
+	];
+	public static $siteWidths = [
+		'750px' => 'Petite (750 pixels)',
+		'960px' => 'Moyenne (960 pixels)',
+		'1170px' => 'Grande (1170 pixels)',
+		'100%' => 'Fluide (100%)'
+	];
+	public static $headerWide = [
+		'auto auto' => 'Automatique',
+		'100% 100%' => 'Image étirée (100% 100%)',
+		'cover' => 'Responsive (cover)',
+		'contain' => 'Responsive (contain)'
+	];
+	public static $footerTemplate = [
+		'1' => 'Une seule colonne',
+		'2' => 'Deux colonnes : 1/2 - 1/2',
+		'3' => 'Trois colonnes : 1/3 - 1/3 - 1/3',
+		'4' => 'Trois lignes superposées'
+	];
+	public static $burgerContent = [
+		'none' => 'Aucun',
+		'title' => 'Titre du site',
+		'logo' => 'Logo du site'
+	];
+
+
+	// Variable pour construire la liste des pages du site
+	public static $pagesList = [];
+	// Variable pour construire la liste des fontes installées
+	public static $fontsList = [];
+
+	/**
+	 * Thème des écrans d'administration
+	 */
+	public function admin() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			$this->setData(['admin', [
+				'backgroundColor' 	=> $this->getInput('adminBackgroundColor'),
+				'colorTitle' 		=> $this->getInput('adminColorTitle'),
+				'colorText'			=> $this->getInput('adminColorText'),
+				'colorButtonText' 	=> $this->getInput('adminColorButtonText'),
+				'backgroundColorButton' 	=> $this->getInput('adminColorButton'),
+				'backgroundColorButtonGrey'	=> $this->getInput('adminColorGrey'),
+				'backgroundColorButtonRed'	=> $this->getInput('adminColorRed'),
+				'backgroundColorButtonGreen'=> $this->getInput('adminColorGreen'),
+				'backgroundColorButtonHelp'=> $this->getInput('adminColorHelp'),
+				'fontText' 		=> $this->getInput('adminFontText'),
+				'fontSize' 	=> $this->getInput('adminFontTextSize'),
+				'fontTitle' => $this->getInput('adminFontTitle'),
+				'backgroundBlockColor' => $this->getInput('adminBackGroundBlockColor'),
+				'borderBlockColor' => $this->getInput('adminBorderBlockColor'),
+			]]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme/admin',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Administration',
+			'view' => 'admin',
+			'vendor' => [
+				'tinycolorpicker'
+			],
+		]);
+	}
+
+	/**
+	 * Mode avancé
+	 */
+	public function advanced() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			// Enregistre le CSS
+			file_put_contents(self::DATA_DIR.'custom.css', $this->getInput('themeAdvancedCss', null));
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme/advanced',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Éditeur CSS',
+			'vendor' => [
+				'codemirror'
+			],
+			'view' => 'advanced'
+		]);
+	}
+
+	/**
+	 * Options de l'arrière plan
+	 */
+	public function body() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			$this->setData(['theme', 'body', [
+				'backgroundColor' => $this->getInput('themeBodyBackgroundColor'),
+				'image' => $this->getInput('themeBodyImage'),
+				'imageAttachment' => $this->getInput('themeBodyImageAttachment'),
+				'imagePosition' => $this->getInput('themeBodyImagePosition'),
+				'imageRepeat' => $this->getInput('themeBodyImageRepeat'),
+				'imageSize' => $this->getInput('themeBodyImageSize'),
+				'toTopbackgroundColor' => $this->getInput('themeBodyToTopBackground'),
+				'toTopColor' => $this->getInput('themeBodyToTopColor')
+			]]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation de l\'arrière plan',
+			'vendor' => [
+				'tinycolorpicker'
+			],
+			'view' => 'body'
+		]);
+	}
+
+	/**
+	 * Options du pied de page
+	 */
+	public function footer() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			if ( $this->getInput('themeFooterCopyrightPosition') === 'hide' &&
+				 $this->getInput('themeFooterSocialsPosition') === 'hide' &&
+				 $this->getInput('themeFooterTextPosition') === 'hide' 	) {
+				// Valeurs en sortie
+				$this->addOutput([
+					'notification' => 'Sélectionnez au moins un contenu à afficher',
+					'redirect' => helper::baseUrl() . 'theme/footer',
+					'state' => false
+				]);
+			} else {
+				$this->setData(['theme', 'footer', [
+					'backgroundColor' => $this->getInput('themeFooterBackgroundColor'),
+					'copyrightAlign' => $this->getInput('themeFooterCopyrightAlign'),
+					'height' => $this->getInput('themeFooterHeight'),
+					'loginLink' => $this->getInput('themeFooterLoginLink'),
+					'margin' => $this->getInput('themeFooterMargin', helper::FILTER_BOOLEAN),
+					'position' => $this->getInput('themeFooterPosition'),
+					'fixed' => $this->getInput('themeFooterFixed', helper::FILTER_BOOLEAN),
+					'socialsAlign' => $this->getInput('themeFooterSocialsAlign'),
+					'text' => $this->getInput('themeFooterText', null),
+					'textAlign' => $this->getInput('themeFooterTextAlign'),
+					'textColor' => $this->getInput('themeFooterTextColor'),
+					'copyrightPosition' => $this->getInput('themeFooterCopyrightPosition'),
+					'textPosition' => $this->getInput('themeFooterTextPosition'),
+					'socialsPosition' => $this->getInput('themeFooterSocialsPosition'),
+					'textTransform' => $this->getInput('themeFooterTextTransform'),
+					'font' => $this->getInput('themeFooterFont'),
+					'fontSize' => $this->getInput('themeFooterFontSize'),
+					'fontWeight' => $this->getInput('themeFooterFontWeight'),
+					'displayVersion' => $this->getInput('themefooterDisplayVersion', helper::FILTER_BOOLEAN),
+					'displaySiteMap' => $this->getInput('themefooterDisplaySiteMap', helper::FILTER_BOOLEAN),
+					'displayCopyright' => $this->getInput('themefooterDisplayCopyright', helper::FILTER_BOOLEAN),
+					'displayCookie' => $this->getInput('themefooterDisplayCookie', helper::FILTER_BOOLEAN),
+					'displayLegal' =>  $this->getInput('themeFooterDisplayLegal', helper::FILTER_BOOLEAN),
+					'displaySearch' =>  $this->getInput('themeFooterDisplaySearch', helper::FILTER_BOOLEAN),
+					'displayMemberBar'=> $this->getInput('themeFooterDisplayMemberBar', helper::FILTER_BOOLEAN),
+					'template' => $this->getInput('themeFooterTemplate')
+				]]);
+
+				// Sauvegarder la configuration localisée
+				$this->setData(['locale','legalPageId', $this->getInput('configLegalPageId')]);
+				$this->setData(['locale','searchPageId', $this->getInput('configSearchPageId')]);
+
+				// Valeurs en sortie
+				$this->addOutput([
+					'notification' => 'Modifications enregistrées',
+					'redirect' => helper::baseUrl() . 'theme',
+					'state' => true
+				]);
+			}
+		}
+
+		// Liste des pages
+		self::$pagesList = $this->getData(['page']);
+		foreach(self::$pagesList as $page => $pageId) {
+			if ($this->getData(['page',$page,'block']) === 'bar' ||
+				$this->getData(['page',$page,'disable']) === true) {
+				unset(self::$pagesList[$page]);
+			}
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation du pied de page',
+			'vendor' => [
+				'tinycolorpicker',
+				'tinymce'
+			],
+			'view' => 'footer'
+		]);
+	}
+
+	/**
+	 * Options de la bannière
+	 */
+	public function header() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			// Modification des URL des images dans la bannière perso
+			$featureContent = $this->getInput('themeHeaderText', null);
+			$featureContent = str_replace(helper::baseUrl(false,false), './', $featureContent);
+
+			/**
+			* Stocker les images incluses dans la bannière perso dans un tableau
+			*/
+			preg_match_all('/<img[^>]+>/i',$featureContent, $results);
+			foreach($results[0] as $value) {
+				// Lire le contenu XML
+				$sx = simplexml_load_string($value);
+				// Élément à remplacer
+				$files [] = str_replace('./site/file/source/','',(string) $sx[0]['src']);
+			}
+
+			// Sauvegarder
+			$this->setData(['theme', 'header', [
+				'backgroundColor' => $this->getInput('themeHeaderBackgroundColor'),
+				'font' => $this->getInput('themeHeaderFont'),
+				'fontSize' => $this->getInput('themeHeaderFontSize'),
+				'fontWeight' => $this->getInput('themeHeaderFontWeight'),
+				'height' => $this->getInput('themeHeaderHeight'),
+				'wide' => $this->getInput('themeHeaderWide'),
+				'image' => $this->getInput('themeHeaderImage'),
+				'imagePosition' => $this->getInput('themeHeaderImagePosition'),
+				'imageRepeat' => $this->getInput('themeHeaderImageRepeat'),
+				'margin' => $this->getInput('themeHeaderMargin', helper::FILTER_BOOLEAN),
+				'position' => $this->getInput('themeHeaderPosition'),
+				'textAlign' => $this->getInput('themeHeaderTextAlign'),
+				'textColor' => $this->getInput('themeHeaderTextColor'),
+				'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN),
+				'textTransform' => $this->getInput('themeHeaderTextTransform'),
+				'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN),
+				'imageContainer' => $this->getInput('themeHeaderImageContainer'),
+				'tinyHidden' => $this->getInput('themeHeaderTinyHidden', helper::FILTER_BOOLEAN),
+				'feature' => $this->getInput('themeHeaderFeature'),
+				'featureContent' => $featureContent,
+				'featureFiles' => 	$files
+			]]);
+			// Modification de la position du menu selon la position de la bannière
+			if  ( $this->getData(['theme','header','position']) == 'site'  )
+				{
+					$this->setData(['theme', 'menu', 'position',str_replace ('body-','site-',$this->getData(['theme','menu','position']))]);
+			}
+			if  ( $this->getData(['theme','header','position']) == 'body')
+				{
+					$this->setData(['theme', 'menu', 'position',str_replace ('site-','body-',$this->getData(['theme','menu','position']))]);
+			}
+			// Menu accroché à la bannière qui devient cachée
+			if  ( $this->getData(['theme','header','position']) == 'hide' &&
+				  in_array( $this->getData(['theme','menu','position']) , ['body-first', 'site-first', 'body-first' , 'site-second'])
+				 ) {
+					$this->setData(['theme', 'menu', 'position','site']);
+			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation de la bannière',
+			'vendor' => [
+				'tinycolorpicker',
+				'tinymce'
+			],
+			'view' => 'header'
+		]);
+	}
+
+	/**
+	 * Accueil de la personnalisation
+	 */
+	public function index() {
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation des thèmes',
+			'view' => 'index'
+		]);
+	}
+
+	/**
+	 * Options du menu
+	 */
+	public function menu() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			$this->setData(['theme', 'menu', [
+				'backgroundColor' => $this->getInput('themeMenuBackgroundColor'),
+				'backgroundColorSub' => $this->getInput('themeMenuBackgroundColorSub'),
+				'font' => $this->getInput('themeMenuFont'),
+				'fontSize' => $this->getInput('themeMenuFontSize'),
+				'fontWeight' => $this->getInput('themeMenuFontWeight'),
+				'height' => $this->getInput('themeMenuHeight'),
+				'wide' => $this->getInput('themeMenuWide'),
+				'loginLink' => $this->getInput('themeMenuLoginLink', helper::FILTER_BOOLEAN),
+				'margin' => $this->getInput('themeMenuMargin', helper::FILTER_BOOLEAN),
+				'position' => $this->getInput('themeMenuPosition'),
+				'textAlign' => $this->getInput('themeMenuTextAlign'),
+				'textColor' => $this->getInput('themeMenuTextColor'),
+				'textTransform' => $this->getInput('themeMenuTextTransform'),
+				'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN),
+				'activeColorAuto' => $this->getInput('themeMenuActiveColorAuto', helper::FILTER_BOOLEAN),
+				'activeColor' => $this->getInput('themeMenuActiveColor'),
+				'activeTextColor' => $this->getInput('themeMenuActiveTextColor'),
+				'radius' => $this->getInput('themeMenuRadius'),
+				'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN),
+				'memberBar' =>  $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN),
+				'burgerLogo' => $this->getInput('themeMenuBurgerLogo'),
+				'burgerContent' => $this->getInput('themeMenuBurgerContent')
+			]]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation du menu',
+			'vendor' => [
+				'tinycolorpicker'
+			],
+			'view' => 'menu'
+		]);
+	}
+
+	/**
+	 * Options des fontes
+	 */
+	public function fonts() {
+
+		$this->listFonts();
+		//echo "<pre>";
+
+
+		// Polices liées au thème
+		$used = [
+			'Bannière' 		=> $this->getData (['theme', 'header', 'font']),
+			'Menu' 			=> $this->getData (['theme', 'menu', 'font']),
+			'Titre ' 		=> $this->getData (['theme', 'title', 'font']),
+			'Texte'   		=> $this->getData (['theme', 'text', 'font']),
+			'Pied de page' 	=> $this->getData (['theme', 'footer', 'font']),
+			'Titre (admin)' => $this->getData (['admin', 'fontTitle' ]),
+			'Admin (texte)' => $this->getData (['admin', 'fontText' ])
+		];
+
+		// Parcourir les fontes installées et construire le tableau pour le formulaire
+		foreach (self::$fonts as $fontId => $fontName) {
+
+			// Fontes utilisées par le thème
+			$fontUsed[$fontId] = '';
+			foreach ($used as $key => $value) {
+				if ( $value === $fontId) {
+					$fontUsed[$fontId] .=  $key . '<br/>';
+				}
+			}
+			self::$fontsList [] = [
+				'<span style="font-family:' . $fontName . '">' . $fontName . '</span>' ,
+				$fontId,
+				$fontUsed[$fontId],
+				//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
+				array_key_exists($fontId, $fonts['files']) ?
+							 $fonts['files'][$fontId] : 
+							 (array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
+				array_key_exists($fontId, $fonts['imported']) || array_key_exists($fontId, $fonts['files'])
+					? 	template::button('themeFontDelete' . $fontId, [
+							'class' => 'themeFontDelete buttonRed',
+							'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
+							'value' => template::ico('cancel'),
+							'disabled' => !empty($fontUsed[$fontId])
+						])
+					: ''
+			];
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Gestion des fontes',
+			'view' => 'fonts'
+		]);
+	}
+
+	/**
+	 * Ajouter une fonte
+	 */
+	public function fontAdd() {
+		// Soumission du formulaire
+		if ($this->isPost()) {
+
+			$fontId = $this->getInput('fontAddFontId', null, true);
+			$fontName = $this->getInput('fontAddFontName', null, true);
+			$filePath = $this->getInput('fontAddFile', null);
+			$e = explode ('/', $filePath);
+			$file = $e[count($e) - 1 ];
+
+			// Vérifier l'existence de fontId et validité de family namesi usage en ligne de cdnFonts
+			$data = helper::getUrlContents('https://www.cdnfonts.com/' . $fontId . '.font');
+
+			if ( $filePath === ''
+				 && $fontName !== ''
+				 && strpos($data, $fontName) === false
+			) {
+
+				// Valeurs en sortie
+				$this->addOutput([
+					'notification' => 'Erreur de nom de fonte ou d\'identifiant',
+					'redirect' => helper::baseUrl() . 'theme/fontAdd',
+					'state' => false
+				]);
+
+			} else {
+
+				// Charger les données des fontes
+				$files = $this->getData(['fonts', 'files']);
+				$imported = $this->getData(['fonts', 'imported']);
+
+				// Concaténation dans les tableaux existants
+				$imported = array_merge([$fontId => $fontName], $imported);
+				$files = array_merge([$fontId => $file], $files);
+
+				// Copier la fonte si le nom du fichier est fourni
+				if (!empty($filePath)) {
+					copy ( self::FILE_DIR . 'source/' . $filePath, self::DATA_DIR . 'fonts/' . $file );
+				}
+
+				// Mettre à jour le fichier des fontes
+				$this->setData(['fonts', 'imported', $imported ]);
+				if (!empty($filePath) ) {
+					$this->setData(['fonts', 'files', $files ]);
+				}
+
+				// Valeurs en sortie
+				$this->addOutput([
+					'notification' => 'La fonte a été importée',
+					'redirect' => helper::baseUrl() . 'theme/fonts',
+					'state' => true
+				]);
+			}
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Ajouter une fonte',
+			'view' => 'fontAdd'
+		]);
+	}
+
+	/**
+	 * Effacer une fonte
+	 */
+	public function fontDelete() {
+		// Jeton incorrect
+		if ($this->getUrl(3) !== $_SESSION['csrf']) {
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl()  . 'theme/fonts',
+				'notification' => 'Action non autorisée'
+			]);
+		}
+		// Suppression
+		else {
+
+			// Charger les données des fontes
+			$files = $this->getData(['fonts', 'files']);
+			$imported = $this->getData(['fonts', 'imported']);
+
+			// Effacer le fichier existant
+			if ( file_exists(self::DATA_DIR . $files[$this->getUrl(2)]) ) {
+				unlink(self::DATA_DIR . $files[$this->getUrl(2)]);
+			}
+
+			// Supprimer les entrées
+			unset($files[$this->getUrl(2)]);
+			unset($imported[$this->getUrl(2)]);
+
+			// Mettre à jour le fichier des fontes
+			$this->setData(['fonts', 'files', $files ]);
+			$this->setData(['fonts', 'imported', $imported ]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl()  . 'theme/fonts',
+				'notification' => 'Fonte supprimée',
+				'state' => true
+			]);
+		}
+	}
+
+
+	/**
+	 * Réinitialisation de la personnalisation avancée
+	 */
+	public function reset() {
+		// $url prend l'adresse sans le token
+		$url = explode('&',$this->getUrl(2));
+
+		if  ( isset($_GET['csrf'])
+			 AND $_GET['csrf'] === $_SESSION['csrf']
+			) {
+			// Réinitialisation
+			$redirect ='';
+			switch ($url[0]) {
+				case 'admin':
+					$this->initData('admin');
+					$redirect = helper::baseUrl() . 'theme/admin';
+					break;
+				case 'manage':
+					$this->initData('theme');
+					$redirect = helper::baseUrl() . 'theme/manage';
+					break;
+				case 'custom':
+					unlink(self::DATA_DIR.'custom.css');
+					$redirect = helper::baseUrl() . 'theme/advanced';
+					break;
+				default :
+					$redirect = helper::baseUrl() . 'theme';
+			}
+
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Réinitialisation effectuée',
+				'redirect' => $redirect,
+				'state' => true
+			]);
+		} else {
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Jeton incorrect'
+			]);
+		}
+	}
+
+
+	/**
+	 * Options du site
+	 */
+	public function site() {
+		// Soumission du formulaire
+		if($this->isPost()) {
+			$this->setData(['theme', 'title', [
+				'font' => $this->getInput('themeTitleFont'),
+				'textColor' => $this->getInput('themeTitleTextColor'),
+				'fontWeight' => $this->getInput('themeTitleFontWeight'),
+				'textTransform' => $this->getInput('themeTitleTextTransform')
+			]]);
+			$this->setData(['theme', 'text', [
+				'font' => $this->getInput('themeTextFont'),
+				'fontSize' => $this->getInput('themeTextFontSize'),
+				'textColor' => $this->getInput('themeTextTextColor'),
+				'linkColor'=> $this->getInput('themeTextLinkColor')
+			]]);
+			$this->setData(['theme', 'site', [
+				'backgroundColor' => $this->getInput('themeSiteBackgroundColor'),
+				'radius' => $this->getInput('themeSiteRadius'),
+				'shadow' => $this->getInput('themeSiteShadow'),
+				'width' => $this->getInput('themeSiteWidth'),
+				'margin' => $this->getInput('themeSiteMargin',helper::FILTER_BOOLEAN)
+			]]);
+			$this->setData(['theme', 'button', [
+				'backgroundColor' => $this->getInput('themeButtonBackgroundColor')
+			]]);
+			$this->setData(['theme', 'block', [
+				'backgroundColor' => $this->getInput('themeBlockBackgroundColor'),
+				'borderColor' => $this->getInput('themeBlockBorderColor')
+			]]);
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'Modifications enregistrées',
+				'redirect' => helper::baseUrl() . 'theme',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Personnalisation du site',
+			'vendor' => [
+				'tinycolorpicker',
+				'tinymce'
+			],
+			'view' => 'site'
+		]);
+	}
+
+	/**
+	 * Import du thème
+	 */
+	public function manage() {
+		if($this->isPost() ) {
+
+			$zipFilename =	$this->getInput('themeManageImport', helper::FILTER_STRING_SHORT, true);
+			$data = $this->import(self::FILE_DIR.'source/' . $zipFilename);
+			if ($data['success']) {
+				header("Refresh:0");
+			} else {
+				// Valeurs en sortie
+				$this->addOutput([
+					'notification' => $data['notification'],
+					'state' => $data['success'],
+					'title' => 'Gestion des thèmes',
+					'view' => 'manage'
+				]);;
+			}
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Gestion des thèmes',
+			'view' => 'manage'
+		]);
+	}
+
+	/**
+	 * Importe un thème
+	 * @param string Url du thème à télécharger
+	 * @param @return array contenant $success = true ou false ; $ notification string message à afficher
+	 */
+
+	public function import($zipName = '') {
+
+		if ($zipName !== '' &&
+			file_exists($zipName)) {
+			// Init variables de retour
+			$success = false;
+			$notification = '';
+			// Dossier temporaire
+			$tempFolder = uniqid();
+			// Ouvrir le zip
+			$zip = new ZipArchive();
+			if ($zip->open($zipName) === TRUE) {
+				mkdir (self::TEMP_DIR . $tempFolder, 0755);
+				$zip->extractTo(self::TEMP_DIR . $tempFolder );
+				$modele = '';
+				// Archive de thème ?
+				if (
+					file_exists(self::TEMP_DIR . $tempFolder . '/site/data/custom.css')
+					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.css')
+					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.json')
+					) {
+						$modele = 'theme';
+				}
+				if(
+					file_exists(self::TEMP_DIR . $tempFolder . '/site/data/admin.json')
+					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/admin.css')
+				) {
+						$modele = 'admin';
+
+				}
+				if (!empty($modele)
+				) {
+					// traiter l'archive
+					$success = $zip->extractTo('.');
+
+					// Substitution des fontes Google
+					if ($modele = 'theme') {
+						$c = $this->subFonts(self::DATA_DIR . 'theme.json');
+						// Un remplacement nécessite la régénération de la feuille de style
+						if ($c > 0
+							AND file_exists(self::DATA_DIR . 'theme.css')
+						) {
+								unlink(self::DATA_DIR . 'theme.css');
+						}
+					}
+					if ($modele = 'admin') {
+						$c = $this->subFonts(self::DATA_DIR . 'admin.json');
+						// Un remplacement nécessite la régénération de la feuille de style
+						if ($c > 0
+							AND file_exists(self::DATA_DIR . 'admin.css')
+							) {
+								unlink(self::DATA_DIR . 'admin.css');
+						}
+					}
+
+					// traitement d'erreur
+					$notification = $success ? 'Le thème  a été importé' : 'Erreur lors de l\'extraction, vérifiez les permissions.';
+
+
+				} else {
+					// pas une archive de thème
+					$success = false;
+					$notification = 'Ce n\'est pas l\'archive d\'un thème !';
+				}
+				// Supprimer le dossier temporaire même si le thème est invalide
+				$this->removeDir(self::TEMP_DIR . $tempFolder);
+				$zip->close();
+			} else {
+				// erreur à l'ouverture
+				$success = false;
+				$notification = 'Impossible d\'ouvrir l\'archive';
+			}
+			return (['success' => $success, 'notification' => $notification]);
+		}
+
+		return (['success' => false, 'notification' => 'Archive non spécifiée ou introuvable']);
+	}
+
+
+
+	/**
+	 * Export du thème
+	 */
+	public function export() {
+		// Make zip
+			$zipFilename = $this->zipTheme($this->getUrl(2));
+			// Téléchargement du ZIP
+			header('Content-Description: File Transfer');
+			header('Content-Type: application/octet-stream');
+			header('Content-Transfer-Encoding: binary');
+			header('Content-Disposition: attachment; filename="' . $zipFilename . '"');
+			header('Content-Length: ' . filesize(self::TEMP_DIR . $zipFilename));
+			readfile(self::TEMP_DIR . $zipFilename);
+			// Nettoyage du dossier
+			unlink (self::TEMP_DIR . $zipFilename);
+			exit();
+	}
+
+	/**
+	 * Export du thème
+	 */
+	public function save() {
+		// Make zip
+		$zipFilename = $this->zipTheme($this->getUrl(2));
+		// Téléchargement du ZIP
+		if (!is_dir(self::FILE_DIR.'source/theme')) {
+			mkdir(self::FILE_DIR.'source/theme', 0755);
+		}
+		copy (self::TEMP_DIR . $zipFilename , self::FILE_DIR.'source/theme/' . $zipFilename);
+		// Nettoyage du dossier
+		unlink (self::TEMP_DIR . $zipFilename);
+		// Valeurs en sortie
+		$this->addOutput([
+			'notification' => 'Archive <b>'.$zipFilename.'</b> sauvegardée avec succès',
+			'redirect' => helper::baseUrl() . 'theme/manage',
+			'state' => true
+		]);
+	}
+
+	/**
+	 * construction du zip Fonction appelée par export() et save()
+	 * @param string $modele theme ou admin
+	 */
+	private function zipTheme($modele) {
+		// Creation du dossier
+		$zipFilename  =  $modele . date('Y-m-d-H-i-s', time()) . '.zip';
+		$zip = new ZipArchive();
+		if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) {
+			switch ($modele) {
+				case 'admin':
+					$zip->addFile(self::DATA_DIR.'admin.json',self::DATA_DIR.'admin.json');
+					$zip->addFile(self::DATA_DIR.'admin.css',self::DATA_DIR.'admin.css');
+					break;
+				case 'theme':
+					$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');
+					$zip->addFile(self::DATA_DIR.'theme.css',self::DATA_DIR.'theme.css');
+					$zip->addFile(self::DATA_DIR.'custom.css',self::DATA_DIR.'custom.css');
+					// Traite l'image dans le body
+					if ($this->getData(['theme','body','image']) !== '' ) {
+					$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','body','image']),
+								self::FILE_DIR.'source/'.$this->getData(['theme','body','image'])
+								);
+					}
+					// Traite l'image dans le header
+					if ($this->getData(['theme','header','image']) !== '' ) {
+					$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','header','image']),
+								  self::FILE_DIR.'source/'.$this->getData(['theme','header','image'])
+								);
+					}
+					// Traite les images du header perso
+					if (!empty($this->getData(['theme','header','featureFiles'])) ) {
+						foreach($this->getData(['theme','header','featureFiles']) as $value) {
+							$zip->addFile(self::FILE_DIR . 'source/' . $value,
+										  self::FILE_DIR . 'source/' . $value );
+						}
+					}
+					break;
+			}
+			$ret = $zip->close();
+		}
+		return ($zipFilename);
+	}
+
+	/**
+	 * Substitution des fontes de Google Fonts vers CdnFont grâce à un tableau de conversion
+	 * Cette fonction est utilisée par l'import.
+	 * @param string $file, nom du fichier json à convertir
+	 * @return int nombre de substitution effectuées
+	 */
+	private function subFonts($file)   {
+		// Tableau de substitution des fontes
+		$fonts = [
+			'Abril+Fatface' => 'abril-fatface',
+			'Arimo' => 'arimo',
+			'Arvo' => 'arvo',
+			'Berkshire+Swash' => 'berkshire-swash',
+			'Cabin' => 'genera',
+			'Dancing+Script' => 'dancing-script',
+			'Droid+Sans' => 'droid-sans-2',
+			'Droid+Serif' => 'droid-serif-2',
+			'Fira+Sans' => 'fira-sans',
+			'Inconsolata' => 'inconsolata-2',
+			'Indie+Flower' =>'indie-flower',
+			'Josefin+Slab' => 'josefin-sans-std',
+			'Lobster' => 'lobster-2',
+			'Lora' => 'lora',
+			'Lato' =>'lato',
+			'Marvel' => 'montserrat-ace',
+			'Old+Standard+TT' => 'old-standard-tt-3',
+			'Open+Sans' =>'open-sans',
+				// Corriger l'erreur de nom de police installée par défaut, il manquait un O en majuscule
+			'open+Sans' =>'open-sans',
+			'Oswald' =>'oswald-4',
+			'PT+Mono' => 'pt-mono',
+			'PT+Serif' =>'pt-serif',
+			'Raleway' => 'raleway-5',
+			'Rancho' => 'rancho',
+			'Roboto' => 'Roboto',
+			'Signika' => 'signika',
+			'Ubuntu' => 'ubuntu',
+			'Vollkorn' => 'vollkorn'
+		];
+
+		$data = file_get_contents($file);
+		$count = 0;
+		foreach ($fonts as $oldId => $newId){
+			$data = str_replace($oldId, $newId, $data, $c);
+			$count = $count + (int) $c;
+		}
+		// Sauvegarder la chaîne modifiée
+		if ($count > 0) {
+			file_put_contents($file, $data);
+		}
+		// Retourner le nombre d'occurrences
+		return ($count);
+	}
+
+	// Peule la variable self:$fonts avec les fontes disponibles.
+	public function listFonts() {
+		// Récupère la liste des fontes installées
+		$f = $this->getFonts();
+		// Construit un tableau avec leur ID et leur famille
+		foreach(['websafe', 'imported', 'files'] as $type) {
+			foreach ($f[$type] as $fontId => $fontValue ) {
+				self::$fonts [$fontId] = $fontValue['name'];
+			}
+		}
+	}
+
+}

From bafb7b3bc30ccbf08c99fc65e5f599842ccd04d0 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 09:17:13 +0100
Subject: [PATCH 16/26] theme liste des polices ok

---
 core/class/template.class.php            |  7 -----
 core/core.php                            | 39 +++++++++++-------------
 core/module/theme/theme.php              | 32 ++++++++++++++-----
 core/module/theme/view/footer/footer.php |  2 +-
 core/module/theme/view/header/header.php |  2 +-
 core/module/theme/view/menu/menu.php     |  2 +-
 core/module/theme/view/site/site.php     |  4 +--
 7 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index b412e3ea..a0f64982 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -618,13 +618,6 @@ class template {
         if($attributes['before'] AND array_key_exists($attributes['id'], common::$inputBefore)) {
             $attributes['selected'] = common::$inputBefore[$attributes['id']];
         }
-        // Liste des polices à intégrer
-        //var_dump(core::$fonts);
-        if ($attributes['fonts'] === true) {
-            foreach (core::$fonts as $fontId => $font) {
-                echo "<link href='https://fonts.cdnfonts.com/css/" . $fontId . "' rel='stylesheet' type='text/css'>\n";
-            }
-        }
         // Début du wrapper
         $html = '<div id="' . $attributes['id'] . 'Wrapper" class="inputWrapper ' . $attributes['classWrapper'] . '">';
         // Label
diff --git a/core/core.php b/core/core.php
index 847da7cd..5eb63537 100644
--- a/core/core.php
+++ b/core/core.php
@@ -183,10 +183,6 @@ class common {
 
 	];
 
-	// Fontes
-	public static $fonts = [
-	];
-
 	public static $fontsWebSafe = [
 		'arial' 			=> 'Arial, Helvetica, sans-serif;',
 		'arial-black' 		=> 'Arial Black, Gadget, sans-serif;',
@@ -422,7 +418,7 @@ class common {
 		foreach (self::$fontsWebSafe as $fontId => $fontValue) {
 			$fontName = explode (',', $fontValue);
 			$f ['websafe'] [$fontId] =  [
-				'name' => $fontName[0],
+				'name' => str_replace('"', '', $fontName[0]),
 				'font-family'=> $fontValue
 			];
 		}
@@ -433,7 +429,7 @@ class common {
 			foreach ($fontsImported as $fontId => $fontValue) {
 				$fontName = explode (',', $fontValue);
 				$f ['imported'] [$fontId] =  [
-					'name' => $fontName[0],
+					'name' => str_replace('"', '', $fontName[0]),
 					'font-family'=> $fontValue
 					//'ressource'
 				];
@@ -446,7 +442,8 @@ class common {
 			foreach ($fontsFiles as $fontId => $fontValue) {
 				$f ['files'] [$fontId] =  [
 					'font-family'=> $fontValue ['font-family'],
-					'ressource'=> $fontValue ['ressource']
+					'ressource'=> $fontValue ['ressource'],
+					'name' => ucfirst($fontId) // A créer
 				];
 			}
 		}
@@ -2355,7 +2352,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['websafe'][$fontId])) {
-					self::$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
+					$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
 				}
 			}
 
@@ -2367,7 +2364,7 @@ class core extends common {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
 						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
-						self::$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
+						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
 			}
 			// Enregistre la personnalisation
@@ -2385,7 +2382,7 @@ class core extends common {
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
 						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
 						// Tableau pour la construction de la feuille de style
-						self::$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
+						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
 
 			}
@@ -2393,7 +2390,7 @@ class core extends common {
 			// Fond du body
 			$colors = helper::colorVariants($this->getData(['theme', 'body', 'backgroundColor']));
 			// Body
-			$css .= 'body{font-family:' . self::$fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
+			$css .= 'body{font-family:' . $fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
 			if($themeBodyImage = $this->getData(['theme', 'body', 'image'])) {
 				// Image dans html pour éviter les déformations.
 				$css .= 'html {background-image:url("../file/source/' . $themeBodyImage . '");background-position:' . $this->getData(['theme', 'body', 'imagePosition']) . ';background-attachment:' . $this->getData(['theme', 'body', 'imageAttachment']) . ';background-size:' . $this->getData(['theme', 'body', 'imageSize']) . ';background-repeat:' . $this->getData(['theme', 'body', 'imageRepeat']) . '}';
@@ -2411,7 +2408,7 @@ class core extends common {
 			$colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor']));
 			$css .= 'a{color:' . $colors['normal'] . '}';
 			// Couleurs de site dans TinyMCe
-			$css .= 'div.mce-edit-area {font-family:' .  self::$fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
+			$css .= 'div.mce-edit-area {font-family:' .  $fonts[$this->getData(['theme', 'text', 'font'])] . ';}';
 			// Site dans TinyMCE
 			$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
 			$css .= 'span.mce-text{background-color: unset !important;}';
@@ -2452,7 +2449,7 @@ class core extends common {
 			$css .= '.helpButton span:hover{color:' . $colors['darken'] . '}';
 			$css .= '.button:active,button[type=\'submit\']:active,.pagination a:active{background-color:' . $colors['veryDarken'] . '}';
 			$colors = helper::colorVariants($this->getData(['theme', 'title', 'textColor']));
-			$css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:' . $colors['normal'] . ';font-family:' .  self::$fonts[$this->getData(['theme', 'title', 'font'])] . ';font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
+			$css .= 'h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:' . $colors['normal'] . ';font-family:' .  $fonts[$this->getData(['theme', 'title', 'font'])] . ';font-weight:' . $this->getData(['theme', 'title', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'title', 'textTransform']) . '}';
 			$css .= 'h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color:' . $colors['darken'] . '}';
 			// Les blocs
 			$colors = helper::colorVariants($this->getData(['theme', 'block', 'backgroundColor']));
@@ -2486,7 +2483,7 @@ class core extends common {
 					$css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}';
 				}
 				$colors = helper::colorVariants($this->getData(['theme', 'header', 'textColor']));
-				$css .= 'header span{color:' . $colors['normal'] . ';font-family:' .  self::$fonts[$this->getData(['theme', 'header', 'font'])] . ';font-weight:' . $this->getData(['theme', 'header', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'header', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'header', 'textTransform']) . '}';
+				$css .= 'header span{color:' . $colors['normal'] . ';font-family:' .  $fonts[$this->getData(['theme', 'header', 'font'])] . ';font-weight:' . $this->getData(['theme', 'header', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'header', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'header', 'textTransform']) . '}';
 			}
 
 			// Bannière au contenu personnalisé
@@ -2535,7 +2532,7 @@ class core extends common {
 					$css .= 'nav{padding:0 10px;}';
 			}
 
-			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:' .  self::$fonts[$this->getData(['theme', 'menu', 'font'])] . ';font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
+			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:' .  $fonts[$this->getData(['theme', 'menu', 'font'])] . ';font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
 			// Pied de page
 
 			$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
@@ -2545,7 +2542,7 @@ class core extends common {
 				$css .= 'footer{padding:0}';
 			}
 
-			$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:' .  self::$fonts[$this->getData(['theme', 'footer', 'font'])] . ';font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
+			$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:' .  $fonts[$this->getData(['theme', 'footer', 'font'])] . ';font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
 			$css .= 'footer {background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer a{color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
@@ -2589,7 +2586,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['websafe'][$fontId])) {
-					self::$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
+					$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
 				}
 			}
 
@@ -2601,7 +2598,7 @@ class core extends common {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
 						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
-						self::$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
+						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
 			}
 			// Enregistre la personnalisation
@@ -2619,7 +2616,7 @@ class core extends common {
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
 						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
 						// Tableau pour la construction de la feuille de style
-						self::$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
+						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
 
 			}
@@ -2627,8 +2624,8 @@ class core extends common {
 			// Thème Administration
 			$colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
 			$css .= '#site{background-color:' . $colors['normal']. ';}';
-			$css .= '.row > div {font:' . self::$fonts[$this->getData(['admin','fontText'])]  . ';font-size:' . $this->getData(['admin','fontSize']) .'}';
-			$css .= 'body h1, h2, h3, h4 a, h5, h6 {font-family:' .   self::$fonts[$this->getData(['admin','fontTitle'])] . ';color:' . $this->getData(['admin','colorTitle' ]) . ';}';
+			$css .= '.row > div {font:' . $fonts[$this->getData(['admin','fontText'])]  . ';font-size:' . $this->getData(['admin','fontSize']) .'}';
+			$css .= 'body h1, h2, h3, h4 a, h5, h6 {font-family:' .   $fonts[$this->getData(['admin','fontTitle'])] . ';color:' . $this->getData(['admin','colorTitle' ]) . ';}';
 
 			// TinyMCE
 			$css .= 'body:not(.editorWysiwyg),span .zwiico-help {color:' . $this->getData(['admin','colorText']) . ';}';
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 5fa0430f..80f2c0c7 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -396,7 +396,8 @@ class theme extends common {
 				unset(self::$pagesList[$page]);
 			}
 		}
-
+		// Lire les fontes installées
+		$this->enumFonts();
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Personnalisation du pied de page',
@@ -475,6 +476,8 @@ class theme extends common {
 				'state' => true
 			]);
 		}
+		// Lire les fontes installées
+		$this->enumFonts();
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Personnalisation de la bannière',
@@ -534,6 +537,8 @@ class theme extends common {
 				'state' => true
 			]);
 		}
+		// Lire les fontes installées
+		$this->enumFonts();
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Personnalisation du menu',
@@ -549,10 +554,14 @@ class theme extends common {
 	 */
 	public function fonts() {
 
-		$this->listFonts();
+		// Peuple la variable de module fontsList de la liste des fonts disponibles clé : fontid - valeur nom de la fonte
+		$this->enumFonts();
 		//echo "<pre>";
 
 
+
+
+
 		// Polices liées au thème
 		$used = [
 			'Bannière' 		=> $this->getData (['theme', 'header', 'font']),
@@ -564,16 +573,18 @@ class theme extends common {
 			'Admin (texte)' => $this->getData (['admin', 'fontText' ])
 		];
 
-		// Parcourir les fontes installées et construire le tableau pour le formulaire
-		foreach (self::$fonts as $fontId => $fontName) {
+		// Parcourir les fontes disponibles et construire le tableau pour le formulaire
+		foreach ($fonts as $fontId => $fontName) {
 
-			// Fontes utilisées par le thème
+			// Fontes utilisées par les thèmes
 			$fontUsed[$fontId] = '';
 			foreach ($used as $key => $value) {
 				if ( $value === $fontId) {
 					$fontUsed[$fontId] .=  $key . '<br/>';
 				}
 			}
+
+
 			self::$fontsList [] = [
 				'<span style="font-family:' . $fontName . '">' . $fontName . '</span>' ,
 				$fontId,
@@ -787,6 +798,8 @@ class theme extends common {
 				'state' => true
 			]);
 		}
+		// Lire les fontes installées
+		$this->enumFonts();
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Personnalisation du site',
@@ -1048,16 +1061,19 @@ class theme extends common {
 		return ($count);
 	}
 
-	// Peule la variable self:$fonts avec les fontes disponibles.
-	public function listFonts() {
+	// Retourne un tableau simple des fonts installées idfont avec le nom
+	// Cette fonction est utile aux sélecteurs de fonts dans les formulaires.
+	public function enumFonts() {
 		// Récupère la liste des fontes installées
 		$f = $this->getFonts();
 		// Construit un tableau avec leur ID et leur famille
 		foreach(['websafe', 'imported', 'files'] as $type) {
 			foreach ($f[$type] as $fontId => $fontValue ) {
-				self::$fonts [$fontId] = $fontValue['name'];
+				$fonts [$fontId] = $fontValue['name'];
 			}
 		}
+		ksort($fonts);
+		self::$fontsList = $fonts;
 	}
 
 }
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index 0934b72a..7afcf447 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -171,7 +171,7 @@
             <h4>Mise en forme du texte</h4>
             <div class="row">
                 <div class="col3">
-                    <?php echo template::select('themeFooterFont', self::$fonts, [
+                    <?php echo template::select('themeFooterFont', $module::$fontsList, [
 							'label' => 'Police',
 							'selected' => $this->getData(['theme', 'footer', 'font']),
 							'fonts' => true
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 232953db..0f6abeaf 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -106,7 +106,7 @@
                         ]); ?>
                 </div>
                 <div class="col4">
-                    <?php echo template::select('themeHeaderFont', self::$fonts, [
+                    <?php echo template::select('themeHeaderFont', $module::$fontsList, [
 							'label' => 'Police',
 							'selected' => $this->getData(['theme', 'header', 'font']),
 							'fonts' => true
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 9bcbb88a..46c943ba 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -183,7 +183,7 @@
             <h4>Mise en forme du texte</h4>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('themeMenuFont', self::$fonts, [
+                    <?php echo template::select('themeMenuFont', $module::$fontsList, [
 								'label' => 'Police',
 								'selected' => $this->getData(['theme', 'menu', 'font']),
                                 'fonts' => true
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index 7f4c4e67..b4a6bd42 100644
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -158,7 +158,7 @@
 				<h4>Mise en forme du texte</h4>
 				<div class="row">
 					<div class="col6">
-						<?php echo template::select('themeTextFont', self::$fonts, [
+						<?php echo template::select('themeTextFont', $module::$fontsList, [
 							'label' => 'Police',
 							'selected' => $this->getData(['theme', 'text', 'font']),
 							'fonts' => true
@@ -179,7 +179,7 @@
 				<h4>Mise en forme des titres</h4>
 				<div class="row">
 					<div class="col4">
-						<?php echo template::select('themeTitleFont', self::$fonts, [
+						<?php echo template::select('themeTitleFont', $module::$fontsList, [
 							'label' => 'Police',
 							'selected' => $this->getData(['theme', 'title', 'font']),
 							'fonts' => true

From 29396c8a1010d18470ff1bd57c3019d65943e562 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 09:59:59 +0100
Subject: [PATCH 17/26] liste des fontes ok

---
 core/module/theme/theme.php            | 66 +++++++++++++-------------
 core/module/theme/view/fonts/fonts.php |  4 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 80f2c0c7..ce1ae845 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -232,6 +232,8 @@ class theme extends common {
 	public static $pagesList = [];
 	// Variable pour construire la liste des fontes installées
 	public static $fontsList = [];
+	// Variable pour détailler les fontes installées
+	public static $fontsDetail = [];
 
 	/**
 	 * Thème des écrans d'administration
@@ -554,14 +556,6 @@ class theme extends common {
 	 */
 	public function fonts() {
 
-		// Peuple la variable de module fontsList de la liste des fonts disponibles clé : fontid - valeur nom de la fonte
-		$this->enumFonts();
-		//echo "<pre>";
-
-
-
-
-
 		// Polices liées au thème
 		$used = [
 			'Bannière' 		=> $this->getData (['theme', 'header', 'font']),
@@ -573,36 +567,42 @@ class theme extends common {
 			'Admin (texte)' => $this->getData (['admin', 'fontText' ])
 		];
 
+		// Récupérer le détail des fontes installées
+		$f = $this->getFonts();
+
 		// Parcourir les fontes disponibles et construire le tableau pour le formulaire
-		foreach ($fonts as $fontId => $fontName) {
+		foreach ($f as $type => $typeValue) {
 
-			// Fontes utilisées par les thèmes
-			$fontUsed[$fontId] = '';
-			foreach ($used as $key => $value) {
-				if ( $value === $fontId) {
-					$fontUsed[$fontId] .=  $key . '<br/>';
+			foreach ($typeValue as $fontId => $fontValue) {
+				// Fontes utilisées par les thèmes
+				$fontUsed[$fontId] = '';
+				foreach ($used as $key => $value) {
+					if ( $value === $fontId) {
+						$fontUsed[$fontId] .=  $key . '<br/>';
+					}
 				}
+				self::$fontsDetail [] = [
+					$fontId,
+					'<span style="font-family:' . $f[$type][$fontId]['font-family'] . '">' . $f[$type][$fontId]['name'] . '</span>' ,
+					$f[$type][$fontId]['font-family'],
+					$fontUsed[$fontId],
+					//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
+					/*array_key_exists($fontId, $fonts['files']) ?
+								$fonts['files'][$fontId] :
+								(array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
+								*/
+					$type,
+					$type !== 'websafe' ? 	template::button('themeFontDelete' . $fontId, [
+												'class' => 'themeFontDelete buttonRed',
+												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
+												'value' => template::ico('cancel'),
+												'disabled' => !empty($fontUsed[$fontId])
+											])
+										: ''
+				];
 			}
-
-
-			self::$fontsList [] = [
-				'<span style="font-family:' . $fontName . '">' . $fontName . '</span>' ,
-				$fontId,
-				$fontUsed[$fontId],
-				//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
-				array_key_exists($fontId, $fonts['files']) ?
-							 $fonts['files'][$fontId] : 
-							 (array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
-				array_key_exists($fontId, $fonts['imported']) || array_key_exists($fontId, $fonts['files'])
-					? 	template::button('themeFontDelete' . $fontId, [
-							'class' => 'themeFontDelete buttonRed',
-							'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
-							'value' => template::ico('cancel'),
-							'disabled' => !empty($fontUsed[$fontId])
-						])
-					: ''
-			];
 		}
+		sort(self::$fontsDetail);
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Gestion des fontes',
diff --git a/core/module/theme/view/fonts/fonts.php b/core/module/theme/view/fonts/fonts.php
index 2458ba1c..000601a9 100644
--- a/core/module/theme/view/fonts/fonts.php
+++ b/core/module/theme/view/fonts/fonts.php
@@ -24,8 +24,8 @@
 		]); ?>
 	</div>
 </div>
-<?php if($module::$fontsList): ?>
-  <?php echo template::table([3, 3, 3, 3, 1], $module::$fontsList, ['Family Name', 'Font Id', 'Affectation', 'Ressource', 'Effacer']); ?>
+<?php if($module::$fontsDetail): ?>
+  <?php echo template::table([2, 2, 3, 3, 1, 1], $module::$fontsDetail, ['FontId', 'Nom', 'Famille', 'Affectation', 'Origine', '']); ?>
 <?php else: ?>
   <?php echo template::speech('Aucune fonte !'); ?>
 <?php endif; ?>
\ No newline at end of file

From cd6e6145f4f8859e21a84e3040404c99ae8a5af4 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 11:12:16 +0100
Subject: [PATCH 18/26] formulaire ajout de fonte okay

---
 core/module/theme/view/fontAdd/fontAdd.js.php |  9 +++--
 core/module/theme/view/fontAdd/fontAdd.php    | 34 +++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/core/module/theme/view/fontAdd/fontAdd.js.php b/core/module/theme/view/fontAdd/fontAdd.js.php
index dd53c7cf..ab356c53 100644
--- a/core/module/theme/view/fontAdd/fontAdd.js.php
+++ b/core/module/theme/view/fontAdd/fontAdd.js.php
@@ -15,7 +15,8 @@
  */
  $(document).ready(function(){
     $('input[name=fontAddFontImported]').prop('checked', true);
-    $('#fontAddFileWrapper').hide();
+    $('input[name=fontAddFontUrl]').prop('checked', false);
+    $('#containerFontAddUrl').hide();
 });
 
 
@@ -28,7 +29,8 @@ $("input[name=fontAddFontImported]").on("click", function() {
     } else {
         $('input[name=fontAddFontFile]').prop('checked', true);
     }
-    $('#fontAddFileWrapper').hide();
+    $('#containerFontAddFile').hide();
+    $('#containerFontAddUrl').show();
 });
 
 $("input[name=fontAddFontFile]").on("click", function() {
@@ -37,5 +39,6 @@ $("input[name=fontAddFontFile]").on("click", function() {
     } else {
         $('input[name=fontAddFontImported]').prop('checked', true);
     }
-    $('#fontAddFileWrapper').show();
+    $('#containerFontAddFile').show();
+    $('#containerFontAddUrl').hide();
 });
diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index 9085f503..ebe3daf9 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -30,14 +30,10 @@
 				<h4>Identité de la fonte</h4>
 				<div class="row">
 					<div class="col6">
-							<?php echo template::checkbox('fontAddFontImported', true, 'Fonte téléchargée sur <a href="https://cdnfonts.com" target="_blank">cdnFonts</a>', [
-								'help' => 'Police utilisée en ligne, se connecter sur cdnFonts pour récupérer les informations nécessaires.'
-							]); ?>
+							<?php echo template::checkbox('fontAddFontImported', true, 'Fonte en ligne', []); ?>
 					</div>
 					<div class="col6">
-							<?php echo template::checkbox('fontAddFontFile', true,'Fonte installée', [
-								'help' => 'Sélectionnez un fichier de fonte au format WOFF.'
-							]); ?>
+							<?php echo template::checkbox('fontAddFontFile', true,'Fonte installée', []); ?>
 					</div>
 				</div>
 				<div class="row">
@@ -45,23 +41,39 @@
 						<?php echo template::text('fontAddFontId', [
 							'autocomplete' => 'off',
 							'label' => 'Identifiant (sans espace ni majuscule)',
-							'placeholder' => 'perry-gothic'
+							'placeholder' => 'big-marker-extrude'
 
 						]); ?>
 					</div>
 					<div class="col6">
 						<?php echo template::text('fontAddFontName', [
 							'autocomplete' => 'off',
-							'label' => 'Nom (Font Family)',
-							'placeholder' => 'PerryGothic'
+							'label' => 'Nom',
+							'placeholder' => 'Big Marker Extrude'
 						]); ?>
 					</div>
 				</div>
 				<div class="row">
+					<div class="col12">
+					<?php echo template::text('fontAddFontFamilyName', [
+							'autocomplete' => 'off',
+							'label' => 'Famille',
+							'placeholder' =>  "'Big Marker Extrude', sans-serif"
+						]); ?>
+					</div>
+				</div>
+				<div class="row" id="containerFontAddFile">
 					<div class="col12">
 						<?php echo template::file('fontAddFile', [
-							'label' => 'Fichier de police (Format WOFF)',
-							'placeholder' => 'https://fonts.cdnfonts.com/s/7896/PERRYGOT.woff'
+							'label' => 'Fichier de fonte (Format WOFF)'
+						]); ?>
+					</div>
+				</div>
+				<div class="row" id="containerFontAddUrl">
+					<div class="col12">
+						<?php echo template::text('fontAddUrl', [
+							'label' => 'Url du fichier de fonte',
+							'placeholder' => 'https://fonts.cdnfonts.com/css/big-marker-extrude'
 						]); ?>
 					</div>
 				</div>

From 2aadc1bbaa52540d4e59e43f0e273978ad71be90 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 14:03:42 +0100
Subject: [PATCH 19/26] Nouvelle structure de fontes ok

---
 core/core.php                                 |  21 ++-
 core/include/update.inc.php                   | 120 +++++++++++++++---
 core/module/install/ressource/defaultdata.php | 120 +++++++++++++++---
 core/module/theme/theme.php                   |  74 +++++------
 4 files changed, 241 insertions(+), 94 deletions(-)

diff --git a/core/core.php b/core/core.php
index 5eb63537..aed8d23d 100644
--- a/core/core.php
+++ b/core/core.php
@@ -422,16 +422,15 @@ class common {
 				'font-family'=> $fontValue
 			];
 		}
-		// Ajoute les polices importées chez cdnfonts
+		// Ajoute les polices importées
 		$fontsImported = $this->getData(['fonts', 'imported']);
 		if (is_array($fontsImported)
 		) {
 			foreach ($fontsImported as $fontId => $fontValue) {
-				$fontName = explode (',', $fontValue);
 				$f ['imported'] [$fontId] =  [
-					'name' => str_replace('"', '', $fontName[0]),
-					'font-family'=> $fontValue
-					//'ressource'
+					'name' => $fontValue ['name'],
+					'font-family'=> $fontValue ['font-family'],
+					'url' => $fontValue ['url']
 				];
 			}
 		}
@@ -441,9 +440,9 @@ class common {
 		) {
 			foreach ($fontsFiles as $fontId => $fontValue) {
 				$f ['files'] [$fontId] =  [
+					'name' => $fontValue ['name'],
 					'font-family'=> $fontValue ['font-family'],
-					'ressource'=> $fontValue ['ressource'],
-					'name' => ucfirst($fontId) // A créer
+					'file' => $fontValue ['file']
 				];
 			}
 		}
@@ -2362,7 +2361,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
-						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
+						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['url'] .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
@@ -2380,7 +2379,7 @@ class core extends common {
 						// Chargement de la police
 						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
-						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['file'] . '");}';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
@@ -2596,7 +2595,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
-						$fontFile .= '<link href="https://fonts.cdnfonts.com/css/' . $fontId .'" rel="stylesheet">';
+						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['url'] .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
@@ -2614,7 +2613,7 @@ class core extends common {
 						// Chargement de la police
 						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
-						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' . $fontName . '");}';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['file'] . '");}';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 3dcf1306..021cf19a 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -813,26 +813,106 @@ if ($this->getData(['core', 'dataVersion']) < 11303) {
 if ($this->getData(['core', 'dataVersion']) < 11400) {
 
 	$fonts = [
-		'arimo'=> 'Arimo,  sans-serif',
-		'arvo'=> 'Arvo, sans-serif',
-		'dancing-script' => '"Dancing Script", sans-serif',
-		'droid-sans-2'=> '"Droid Sans", sans-serif',
-		'droid-serif-2'=> '"Droid Serif", serif',
-		'indie-flower'=> '"Indie Flower", sans-serif',
-		'liberation-sans'=> '"Liberation Sans", sans-serif',
-		'liberation-serif'=> '"Liberation Serif", serif',
-		'lobster-2'=> 'Lobster, sans-serif',
-		'lora'=> 'Lora, serif',
-		'lato'=> 'Lato, sans-serif',
-		'old-standard-tt-3'=> '"Old Standard TT", serif',
-		'open-sans'=> '"Open Sans", sans-serif',
-		'oswald-4'=> 'Oswald, sans-serif',
-		'pt-mono'=> '"PT Mono", monospace',
-		'pt-serif'=> '"PT Serif", serif',
-		'rancho'=> 'Rancho, sans-serif',
-		'roboto'=> 'Roboto, sans-serif',
-		'ubuntu'=> 'Ubuntu, sans-serif',
-		'vollkorn'=> 'Vollkorn, serif'
+			'arimo'=> [
+				'name' => 'Arimo',
+				'font-family' => 'Arimo,  sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/arimo'
+			],
+			'arvo'=> [
+				'name' => 'Arvo',
+				'font-family' => 'Arvo,  sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/arvo'
+			],
+			'dancing-script' => [
+				'name' => 'Dancing Script',
+				'font-family' => '"Dancing Script", sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/dancing-script'
+			],
+			'droid-sans-2'=> [
+				'name' => 'Droid Sans',
+				'font-family' =>  '"Droid Sans", sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/droid-sans-2'
+			],
+			'droid-serif-2'=> [
+				'name' => 'Droid Serif',
+				'font-family' =>  '"Droid Serif", serif',
+				'url' => 'https://fonts.cdnfonts.com/css/droid-serif-2'
+			],
+			'indie-flower'=> [
+				'name' => 'Indie Flower',
+				'font-family' => '"Indie Flower", sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/indie-flower'
+			],
+			'liberation-sans'=> [
+				'name' => 'Liberation Sans',
+				'font-family' => '"Liberation Sans", sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/liberation-sans'
+			],
+			'liberation-serif'=> [
+				'name' => 'Liberation Serif',
+				'font-family' => '"Liberation Serif", serif',
+				'url' => 'https://fonts.cdnfonts.com/css/liberation-serif'
+			],
+			'lobster-2'=> [
+				'name' => 'Lobster',
+				'font-family' => 'Lobster, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/lobster-2'
+			],
+			'lato'=> [
+				'name' => 'lato',
+				'font-family' => 'Lato, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/lato'
+			],
+			'lora'=> [
+				'name' => 'Lora',
+				'font-family' => 'Lora, serif',
+				'url' => 'https://fonts.cdnfonts.com/css/lora'
+			],
+			'old-standard-tt-3'=> [
+				'name' => 'Old Standard TT',
+				'font-family' => '"Old Standard TT", serif',
+				'url' => 'https://fonts.cdnfonts.com/css/old-standard-tt-3'
+			],
+			'open-sans' => [
+				'name' => 'Open Sans',
+				'font-family' => '"Open Sans", sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/open-sans'
+			],
+			'oswald-4'=> [
+				'name' => 'Oswald',
+				'font-family' => 'Oswald, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/oswald-4'
+			],
+			'pt-mono'=> [
+				'name' => 'PT Mono',
+				'font-family' => '"PT Mono", monospace',
+				'url' => 'https://fonts.cdnfonts.com/css/pt-mono'
+			],
+			'pt-serif'=> [
+				'name' => "PR Serif",
+				'font-family' => '"PT Serif", serif',
+				'url' => 'https://fonts.cdnfonts.com/css/pt-serif'
+			],
+			'rancho'=> [
+				'name' => 'Rancho',
+				'font-family' => 'Rancho, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/rancho'
+			],
+			'roboto'=> [
+				'name' => 'Roboto',
+				'font-family' => 'Roboto, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/roboto'
+			],
+			'ubuntu'=> [
+				'name' => 'Ubuntu',
+				'font-family' => 'Ubuntu, sans-serif',
+				'url' => 'https://fonts.cdnfonts.com/css/ubuntu'
+			],
+			'vollkorn'=> [
+				'name' => 'Vollkorn',
+				'font-family' => 'Vollkorn, serif',
+				'url' => 'https://fonts.cdnfonts.com/css/vollkorn'
+			]
 	];
 	$this->setData(['fonts', 'imported', $fonts]);
 
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index ee0d0dd8..21b5d70e 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -88,26 +88,106 @@ class init extends common {
 		'fonts' => [
 			'files' => [],
 			'imported'=> [
-				'arimo'=> 'Arimo,  sans-serif',
-				'arvo'=> 'Arvo, sans-serif',
-				'dancing-script' => '"Dancing Script", sans-serif',
-				'droid-sans-2'=> '"Droid Sans", sans-serif',
-				'droid-serif-2'=> '"Droid Serif", serif',
-				'indie-flower'=> '"Indie Flower", sans-serif',
-				'liberation-sans'=> '"Liberation Sans", sans-serif',
-				'liberation-serif'=> '"Liberation Serif", serif',
-				'lobster-2'=> 'Lobster, sans-serif',
-				'lora'=> 'Lora, serif',
-				'lato'=> 'Lato, sans-serif',
-				'old-standard-tt-3'=> '"Old Standard TT", serif',
-				'open-sans'=> '"Open Sans", sans-serif',
-				'oswald-4'=> 'Oswald, sans-serif',
-				'pt-mono'=> '"PT Mono", monospace',
-				'pt-serif'=> '"PT Serif", serif',
-				'rancho'=> 'Rancho, sans-serif',
-				'roboto'=> 'Roboto, sans-serif',
-				'ubuntu'=> 'Ubuntu, sans-serif',
-				'vollkorn'=> 'Vollkorn, serif'
+				'arimo'=> [
+					'name' => 'Arimo',
+					'font-family' => 'Arimo,  sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/arimo'
+				],
+				'arvo'=> [
+					'name' => 'Arvo',
+					'font-family' => 'Arvo,  sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/arvo'
+				],
+				'dancing-script' => [
+					'name' => 'Dancing Script',
+					'font-family' => '"Dancing Script", sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/dancing-script'
+				],
+				'droid-sans-2'=> [
+					'name' => 'Droid Sans',
+					'font-family' =>  '"Droid Sans", sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/droid-sans-2'
+				],
+				'droid-serif-2'=> [
+					'name' => 'Droid Serif',
+					'font-family' =>  '"Droid Serif", serif',
+					'url' => 'https://fonts.cdnfonts.com/css/droid-serif-2'
+				],
+				'indie-flower'=> [
+					'name' => 'Indie Flower',
+					'font-family' => '"Indie Flower", sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/indie-flower'
+				],
+				'liberation-sans'=> [
+					'name' => 'Liberation Sans',
+					'font-family' => '"Liberation Sans", sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/liberation-sans'
+				],
+				'liberation-serif'=> [
+					'name' => 'Liberation Serif',
+					'font-family' => '"Liberation Serif", serif',
+					'url' => 'https://fonts.cdnfonts.com/css/liberation-serif'
+				],
+				'lobster-2'=> [
+					'name' => 'Lobster',
+					'font-family' => 'Lobster, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/lobster-2'
+				],
+				'lato'=> [
+					'name' => 'lato',
+					'font-family' => 'Lato, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/lato'
+				],
+				'lora'=> [
+					'name' => 'Lora',
+					'font-family' => 'Lora, serif',
+					'url' => 'https://fonts.cdnfonts.com/css/lora'
+				],
+				'old-standard-tt-3'=> [
+					'name' => 'Old Standard TT',
+					'font-family' => '"Old Standard TT", serif',
+					'url' => 'https://fonts.cdnfonts.com/css/old-standard-tt-3'
+				],
+				'open-sans' => [
+					'name' => 'Open Sans',
+					'font-family' => '"Open Sans", sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/open-sans'
+				],
+				'oswald-4'=> [
+					'name' => 'Oswald',
+					'font-family' => 'Oswald, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/oswald-4'
+				],
+				'pt-mono'=> [
+					'name' => 'PT Mono',
+					'font-family' => '"PT Mono", monospace',
+					'url' => 'https://fonts.cdnfonts.com/css/pt-mono'
+				],
+				'pt-serif'=> [
+					'name' => "PR Serif",
+					'font-family' => '"PT Serif", serif',
+					'url' => 'https://fonts.cdnfonts.com/css/pt-serif'
+				],
+				'rancho'=> [
+					'name' => 'Rancho',
+					'font-family' => 'Rancho, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/rancho'
+				],
+				'roboto'=> [
+					'name' => 'Roboto',
+					'font-family' => 'Roboto, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/roboto'
+				],
+				'ubuntu'=> [
+					'name' => 'Ubuntu',
+					'font-family' => 'Ubuntu, sans-serif',
+					'url' => 'https://fonts.cdnfonts.com/css/ubuntu'
+				],
+				'vollkorn'=> [
+					'name' => 'Vollkorn',
+					'font-family' => 'Vollkorn, serif',
+					'url' => 'https://fonts.cdnfonts.com/css/vollkorn'
+				]
 			]
 		],
 		'page' => [
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index ce1ae845..83aa2ea8 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -616,56 +616,44 @@ class theme extends common {
 	public function fontAdd() {
 		// Soumission du formulaire
 		if ($this->isPost()) {
-
+			// Type d'import en ligne ou local
+			$type = $this->getInput('fontAddFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'url';
+			$ressource = $type === 'imported' ? $this->getInput('fontAddFile', helper::FILTER__SHORT_STRING) : $this->getInput('fontAddUrl',  helper::FILTER__SHORT_STRING);
 			$fontId = $this->getInput('fontAddFontId', null, true);
 			$fontName = $this->getInput('fontAddFontName', null, true);
-			$filePath = $this->getInput('fontAddFile', null);
-			$e = explode ('/', $filePath);
-			$file = $e[count($e) - 1 ];
+			$fontFamilyName = $this->getInput('fontAddFontFamilyName', null, true);
 
-			// Vérifier l'existence de fontId et validité de family namesi usage en ligne de cdnFonts
-			$data = helper::getUrlContents('https://www.cdnfonts.com/' . $fontId . '.font');
+			// Vérifier l'existence de fontId et validité de family name si usage en ligne de cdnFonts
+			/*
+			if ($type === 'url') {
+				$data = helper::getUrlContents($ressource);
+			}*/
 
-			if ( $filePath === ''
-				 && $fontName !== ''
-				 && strpos($data, $fontName) === false
-			) {
+			// Charger les données des fontes
+			$files = $this->getData(['fonts', 'files']);
+			$imported = $this->getData(['fonts', 'imported']);
 
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'Erreur de nom de fonte ou d\'identifiant',
-					'redirect' => helper::baseUrl() . 'theme/fontAdd',
-					'state' => false
-				]);
+			// Concaténation dans les tableaux existants
+			$imported = array_merge([$fontId => $fontName], $imported);
+			$files = array_merge([$fontId => $file], $files);
 
-			} else {
-
-				// Charger les données des fontes
-				$files = $this->getData(['fonts', 'files']);
-				$imported = $this->getData(['fonts', 'imported']);
-
-				// Concaténation dans les tableaux existants
-				$imported = array_merge([$fontId => $fontName], $imported);
-				$files = array_merge([$fontId => $file], $files);
-
-				// Copier la fonte si le nom du fichier est fourni
-				if (!empty($filePath)) {
-					copy ( self::FILE_DIR . 'source/' . $filePath, self::DATA_DIR . 'fonts/' . $file );
-				}
-
-				// Mettre à jour le fichier des fontes
-				$this->setData(['fonts', 'imported', $imported ]);
-				if (!empty($filePath) ) {
-					$this->setData(['fonts', 'files', $files ]);
-				}
-
-				// Valeurs en sortie
-				$this->addOutput([
-					'notification' => 'La fonte a été importée',
-					'redirect' => helper::baseUrl() . 'theme/fonts',
-					'state' => true
-				]);
+			// Copier la fonte si le nom du fichier est fourni
+			if (!empty($filePath)) {
+				copy ( self::FILE_DIR . 'source/' . $filePath, self::DATA_DIR . 'fonts/' . $file );
 			}
+
+			// Mettre à jour le fichier des fontes
+			$this->setData(['fonts', 'imported', $imported ]);
+			if (!empty($filePath) ) {
+				$this->setData(['fonts', 'files', $files ]);
+			}
+
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'La fonte a été importée',
+				'redirect' => helper::baseUrl() . 'theme/fonts',
+				'state' => true
+			]);
 		}
 		// Valeurs en sortie
 		$this->addOutput([

From c6e1ef2aebd274a733b4c6587c02c77efdd4808f Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 15:56:06 +0100
Subject: [PATCH 20/26] font Add okay

---
 core/core.php                                 | 12 ++---
 core/module/theme/theme.php                   | 45 ++++++++++---------
 core/module/theme/view/fontAdd/fontAdd.js.php |  2 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/core/core.php b/core/core.php
index aed8d23d..35f49f42 100644
--- a/core/core.php
+++ b/core/core.php
@@ -430,7 +430,7 @@ class common {
 				$f ['imported'] [$fontId] =  [
 					'name' => $fontValue ['name'],
 					'font-family'=> $fontValue ['font-family'],
-					'url' => $fontValue ['url']
+					'ressource' => $fontValue ['ressource']
 				];
 			}
 		}
@@ -442,7 +442,7 @@ class common {
 				$f ['files'] [$fontId] =  [
 					'name' => $fontValue ['name'],
 					'font-family'=> $fontValue ['font-family'],
-					'file' => $fontValue ['file']
+					'ressource' => $fontValue ['ressource']
 				];
 			}
 		}
@@ -2361,7 +2361,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
-						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['url'] .'" rel="stylesheet">';
+						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['ressource'] .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
@@ -2379,7 +2379,7 @@ class core extends common {
 						// Chargement de la police
 						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
-						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['file'] . '");}';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['ressource'] . '");}';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
@@ -2595,7 +2595,7 @@ class core extends common {
 			$fontFile = '';
 			foreach ($fonts as $fontId) {
 				if ( isset($fontsAvailable['imported'][$fontId])) {
-						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['url'] .'" rel="stylesheet">';
+						$fontFile .= '<link href="' . $fontsAvailable['imported'][$fontId]['ressource'] .'" rel="stylesheet">';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['imported'][$fontId]['font-family'];
 				}
@@ -2613,7 +2613,7 @@ class core extends common {
 						// Chargement de la police
 						//$formatFont = explode('.', self::DATA_DIR . 'fonts/' . $fontName);
 						$css .= '@font-face {font-family:"' . $fontsAvailable['files'][$fontId]['font-family'] . '";';
-						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['file'] . '");}';
+						$css .= 'src: url("' . helper::baseUrl(false) . self::DATA_DIR . 'fonts/' .$fontsAvailable['files'][$fontId]['ressource'] . '");}';
 						// Tableau pour la construction de la feuille de style
 						$fonts [$fontId] = $fontsAvailable['files'][$fontId]['font-family'];
 				}
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 83aa2ea8..f14527f6 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -617,35 +617,38 @@ class theme extends common {
 		// Soumission du formulaire
 		if ($this->isPost()) {
 			// Type d'import en ligne ou local
-			$type = $this->getInput('fontAddFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'url';
-			$ressource = $type === 'imported' ? $this->getInput('fontAddFile', helper::FILTER__SHORT_STRING) : $this->getInput('fontAddUrl',  helper::FILTER__SHORT_STRING);
-			$fontId = $this->getInput('fontAddFontId', null, true);
-			$fontName = $this->getInput('fontAddFontName', null, true);
-			$fontFamilyName = $this->getInput('fontAddFontFamilyName', null, true);
+			$type = $this->getInput('fontAddFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'files';
+			$ressource = $type === 'imported' ? $this->getInput('fontAddUrl', helper::FILTER_STRING_SHORT) : $this->getInput('fontAddFile',  helper::FILTER__SHORT_STRING);
+			$fontId = $this->getInput('fontAddFontId',  helper::FILTER_STRING_SHORT, true);
+			$fontName = $this->getInput('fontAddFontName',  helper::FILTER_STRING_SHORT, true);
+			$fontFamilyName = $this->getInput('fontAddFontFamilyName',  helper::FILTER_STRING_SHORT, true);
 
 			// Vérifier l'existence de fontId et validité de family name si usage en ligne de cdnFonts
-			/*
-			if ($type === 'url') {
-				$data = helper::getUrlContents($ressource);
-			}*/
 
 			// Charger les données des fontes
-			$files = $this->getData(['fonts', 'files']);
-			$imported = $this->getData(['fonts', 'imported']);
+			$fonts = $this->getData(['fonts']);
 
 			// Concaténation dans les tableaux existants
-			$imported = array_merge([$fontId => $fontName], $imported);
-			$files = array_merge([$fontId => $file], $files);
+			$t = [ $fontId => [
+					'name' => $fontName,
+					'font-family' => $fontFamilyName,
+					'ressource' => $ressource
+			]];
+
+			// Stocker les fontes
+			$this->setData(['fonts', $type, [ $fontId =>
+								[
+									'name' => $fontName,
+									'font-family' => $fontFamilyName,
+									'ressource' => $ressource
+								]]
+			]);
 
 			// Copier la fonte si le nom du fichier est fourni
-			if (!empty($filePath)) {
-				copy ( self::FILE_DIR . 'source/' . $filePath, self::DATA_DIR . 'fonts/' . $file );
-			}
-
-			// Mettre à jour le fichier des fontes
-			$this->setData(['fonts', 'imported', $imported ]);
-			if (!empty($filePath) ) {
-				$this->setData(['fonts', 'files', $files ]);
+			if ( $type === 'files' &&
+					is_file(self::FILE_DIR . 'source/' . $ressource)
+			) {
+				copy ( self::FILE_DIR . 'source/' . $ressource, self::DATA_DIR . 'fonts/' . $ressource );
 			}
 
 			// Valeurs en sortie
diff --git a/core/module/theme/view/fontAdd/fontAdd.js.php b/core/module/theme/view/fontAdd/fontAdd.js.php
index ab356c53..e9105513 100644
--- a/core/module/theme/view/fontAdd/fontAdd.js.php
+++ b/core/module/theme/view/fontAdd/fontAdd.js.php
@@ -16,7 +16,7 @@
  $(document).ready(function(){
     $('input[name=fontAddFontImported]').prop('checked', true);
     $('input[name=fontAddFontUrl]').prop('checked', false);
-    $('#containerFontAddUrl').hide();
+    $('#containerFontAddFile').hide();
 });
 
 

From dbf1f18e34ea18e1bbad23dfa3c07442da1fee92 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 11 Mar 2022 16:09:43 +0100
Subject: [PATCH 21/26] =?UTF-8?q?font=20edit=20=C3=A0=20terminer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 | 12 +--
 core/module/theme/theme.php                   | 69 +++++++++++++--
 core/module/theme/view/fontEdit/fontEdit.css  | 18 ++++
 .../theme/view/fontEdit/fontEdit.js.php       | 44 ++++++++++
 core/module/theme/view/fontEdit/fontEdit.php  | 83 +++++++++++++++++++
 core/module/theme/view/fonts/fonts.php        |  2 +-
 6 files changed, 216 insertions(+), 12 deletions(-)
 create mode 100644 core/module/theme/view/fontEdit/fontEdit.css
 create mode 100644 core/module/theme/view/fontEdit/fontEdit.js.php
 create mode 100644 core/module/theme/view/fontEdit/fontEdit.php

diff --git a/core/core.php b/core/core.php
index 35f49f42..db18c31c 100644
--- a/core/core.php
+++ b/core/core.php
@@ -185,16 +185,16 @@ class common {
 
 	public static $fontsWebSafe = [
 		'arial' 			=> 'Arial, Helvetica, sans-serif;',
-		'arial-black' 		=> 'Arial Black, Gadget, sans-serif;',
-		'courrier' 			=> 'Courier, Liberation Mono, monospace;',
-		'courrier-new' 		=> 'Courier New, Courier, monospace',
+		'arial-black' 		=> '"Arial Black", Gadget, sans-serif;',
+		'courrier' 			=> 'Courier, "Liberation Mono", monospace;',
+		'courrier-new' 		=> '"Courier New", Courier, monospace',
 		'garamond' 			=> 'Garamond, serif',
 		'georgia' 			=> 'Georgia, serif;',
 		'impact' 			=> 'Impact, Charcoal, sans-serif;',
-		'lucida' 			=> 'Lucida Sans Unicode, Lucida Grande, sans-serif',
+		'lucida' 			=> '"Lucida Sans Unicode", "Lucida Grande", sans-serif',
 		'tahoma'			=> 'Tahoma, Geneva, sans-serif;',
-		'times-new-roman' 	=> 'Times New Roman, Liberation Serif, serif;',
-		'trebuchet' 		=> 'Trebuchet MS, Arial, Helvetica, sans-serif;',
+		'times-new-roman' 	=> '"Times New Roman", "Liberation Serif", serif;',
+		'trebuchet' 		=> '"Trebuchet MS", Arial, Helvetica, sans-serif;',
 		'tahoma' 			=> 'Tahoma, Geneva, sans-serif;',
 		'verdana' 			=> 'Verdana, Geneva, sans-serif;',
 	];
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index f14527f6..d2c3be20 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -32,6 +32,7 @@ class theme extends common {
 		'save' => self::GROUP_ADMIN,
 		'fonts' => self::GROUP_ADMIN,
 		'fontAdd' => self::GROUP_ADMIN,
+		'fontEdit' => self::GROUP_ADMIN,
 		'fontDelete' => self::GROUP_ADMIN
 	];
 	public static $aligns = [
@@ -586,12 +587,14 @@ class theme extends common {
 					'<span style="font-family:' . $f[$type][$fontId]['font-family'] . '">' . $f[$type][$fontId]['name'] . '</span>' ,
 					$f[$type][$fontId]['font-family'],
 					$fontUsed[$fontId],
-					//array_key_exists($fontId, $fonts['imported']) ? 'Importée' : '',
-					/*array_key_exists($fontId, $fonts['files']) ?
-								$fonts['files'][$fontId] :
-								(array_key_exists($fontId, self::$fontsWebSafe) ? 'WebSafe' :	'CDN Fonts'),
-								*/
 					$type,
+					$type !== 'websafe' ? 	template::button('themeFontEdit' . $fontId, [
+												'class' => 'themeFontEdit',
+												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontEdit/' . $fontId . '/' . $_SESSION['csrf'],
+												'value' => template::ico('pencil'),
+												'disabled' => !empty($fontUsed[$fontId])
+											])
+										: '',
 					$type !== 'websafe' ? 	template::button('themeFontDelete' . $fontId, [
 												'class' => 'themeFontDelete buttonRed',
 												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
@@ -665,6 +668,62 @@ class theme extends common {
 		]);
 	}
 
+
+	/**
+	 * Ajouter une fonte
+	 */
+	public function fontEdit() {
+		// Soumission du formulaire
+		if ($this->isPost()) {
+			// Type d'import en ligne ou local
+			$type = $this->getInput('fontAddFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'files';
+			$ressource = $type === 'imported' ? $this->getInput('fontAddUrl', helper::FILTER_STRING_SHORT) : $this->getInput('fontAddFile',  helper::FILTER__SHORT_STRING);
+			$fontId = $this->getInput('fontAddFontId',  helper::FILTER_STRING_SHORT, true);
+			$fontName = $this->getInput('fontAddFontName',  helper::FILTER_STRING_SHORT, true);
+			$fontFamilyName = $this->getInput('fontAddFontFamilyName',  helper::FILTER_STRING_SHORT, true);
+
+			// Vérifier l'existence de fontId et validité de family name si usage en ligne de cdnFonts
+
+			// Charger les données des fontes
+			$fonts = $this->getData(['fonts']);
+
+			// Concaténation dans les tableaux existants
+			$t = [ $fontId => [
+					'name' => $fontName,
+					'font-family' => $fontFamilyName,
+					'ressource' => $ressource
+			]];
+
+			// Stocker les fontes
+			$this->setData(['fonts', $type, [ $fontId =>
+								[
+									'name' => $fontName,
+									'font-family' => $fontFamilyName,
+									'ressource' => $ressource
+								]]
+			]);
+
+			// Copier la fonte si le nom du fichier est fourni
+			if ( $type === 'files' &&
+					is_file(self::FILE_DIR . 'source/' . $ressource)
+			) {
+				copy ( self::FILE_DIR . 'source/' . $ressource, self::DATA_DIR . 'fonts/' . $ressource );
+			}
+
+			// Valeurs en sortie
+			$this->addOutput([
+				'notification' => 'La fonte a été importée',
+				'redirect' => helper::baseUrl() . 'theme/fonts',
+				'state' => true
+			]);
+		}
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Ajouter une fonte',
+			'view' => 'fontAdd'
+		]);
+	}
+
 	/**
 	 * Effacer une fonte
 	 */
diff --git a/core/module/theme/view/fontEdit/fontEdit.css b/core/module/theme/view/fontEdit/fontEdit.css
new file mode 100644
index 00000000..52709ea6
--- /dev/null
+++ b/core/module/theme/view/fontEdit/fontEdit.css
@@ -0,0 +1,18 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2022, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+
+/** NE PAS EFFACER
+* admin.css
+*/
\ No newline at end of file
diff --git a/core/module/theme/view/fontEdit/fontEdit.js.php b/core/module/theme/view/fontEdit/fontEdit.js.php
new file mode 100644
index 00000000..e9105513
--- /dev/null
+++ b/core/module/theme/view/fontEdit/fontEdit.js.php
@@ -0,0 +1,44 @@
+/**
+ * This file is part of Zwii.
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2022, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+
+/** 
+ * Option par défaut du sélecteur de mode
+ */
+ $(document).ready(function(){
+    $('input[name=fontAddFontImported]').prop('checked', true);
+    $('input[name=fontAddFontUrl]').prop('checked', false);
+    $('#containerFontAddFile').hide();
+});
+
+
+/**
+ * Mode téléchargement en ligne de la fonte ou installation locale
+ */
+$("input[name=fontAddFontImported]").on("click", function() {
+    if( $('input[name=fontAddFontImported]').is(':checked') ){
+        $('input[name=fontAddFontFile]').prop('checked', false);
+    } else {
+        $('input[name=fontAddFontFile]').prop('checked', true);
+    }
+    $('#containerFontAddFile').hide();
+    $('#containerFontAddUrl').show();
+});
+
+$("input[name=fontAddFontFile]").on("click", function() {
+    if( $('input[name=fontAddFontFile]').is(':checked') ){
+        $('input[name=fontAddFontImported]').prop('checked', false);
+    } else {
+        $('input[name=fontAddFontImported]').prop('checked', true);
+    }
+    $('#containerFontAddFile').show();
+    $('#containerFontAddUrl').hide();
+});
diff --git a/core/module/theme/view/fontEdit/fontEdit.php b/core/module/theme/view/fontEdit/fontEdit.php
new file mode 100644
index 00000000..ebe3daf9
--- /dev/null
+++ b/core/module/theme/view/fontEdit/fontEdit.php
@@ -0,0 +1,83 @@
+<?php echo template::formOpen('fontAddForm'); ?>
+	<div class="row">
+		<div class="col2">
+			<?php echo template::button('fontAddBack', [
+				'class' => 'buttonGrey',
+				'href' => helper::baseUrl() . 'theme/fonts',
+				'ico' => 'left',
+				'value' => 'Retour'
+			]); ?>
+		</div>
+		<div class="col2">
+			<?php echo template::button('pageEditHelp', [
+				'href' => 'https://doc.zwiicms.fr/fontes#add',
+				'target' => '_blank',
+				'ico' => 'help',
+				'value' => 'Aide',
+				'class' => 'buttonHelp'
+			]); ?>
+		</div>
+		<div class="col2 offset6">
+			<?php echo template::submit('fontAddPublish', [
+				'value' => 'Valider',
+				'uniqueSubmission' => true
+			]); ?>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Identité de la fonte</h4>
+				<div class="row">
+					<div class="col6">
+							<?php echo template::checkbox('fontAddFontImported', true, 'Fonte en ligne', []); ?>
+					</div>
+					<div class="col6">
+							<?php echo template::checkbox('fontAddFontFile', true,'Fonte installée', []); ?>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::text('fontAddFontId', [
+							'autocomplete' => 'off',
+							'label' => 'Identifiant (sans espace ni majuscule)',
+							'placeholder' => 'big-marker-extrude'
+
+						]); ?>
+					</div>
+					<div class="col6">
+						<?php echo template::text('fontAddFontName', [
+							'autocomplete' => 'off',
+							'label' => 'Nom',
+							'placeholder' => 'Big Marker Extrude'
+						]); ?>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col12">
+					<?php echo template::text('fontAddFontFamilyName', [
+							'autocomplete' => 'off',
+							'label' => 'Famille',
+							'placeholder' =>  "'Big Marker Extrude', sans-serif"
+						]); ?>
+					</div>
+				</div>
+				<div class="row" id="containerFontAddFile">
+					<div class="col12">
+						<?php echo template::file('fontAddFile', [
+							'label' => 'Fichier de fonte (Format WOFF)'
+						]); ?>
+					</div>
+				</div>
+				<div class="row" id="containerFontAddUrl">
+					<div class="col12">
+						<?php echo template::text('fontAddUrl', [
+							'label' => 'Url du fichier de fonte',
+							'placeholder' => 'https://fonts.cdnfonts.com/css/big-marker-extrude'
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php echo template::formClose(); ?>
\ No newline at end of file
diff --git a/core/module/theme/view/fonts/fonts.php b/core/module/theme/view/fonts/fonts.php
index 000601a9..87c28836 100644
--- a/core/module/theme/view/fonts/fonts.php
+++ b/core/module/theme/view/fonts/fonts.php
@@ -25,7 +25,7 @@
 	</div>
 </div>
 <?php if($module::$fontsDetail): ?>
-  <?php echo template::table([2, 2, 3, 3, 1, 1], $module::$fontsDetail, ['FontId', 'Nom', 'Famille', 'Affectation', 'Origine', '']); ?>
+  <?php echo template::table([2, 2, 3, 2, 1, 1, 1], $module::$fontsDetail, ['FontId', 'Nom', 'Famille', 'Affectation', 'Origine', '', '']); ?>
 <?php else: ?>
   <?php echo template::speech('Aucune fonte !'); ?>
 <?php endif; ?>
\ No newline at end of file

From 9f2fb7732cf7f7884b5b4836b9214b35df809c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 12 Mar 2022 12:00:12 +0100
Subject: [PATCH 22/26] =?UTF-8?q?d=C3=A9faut=20initialisation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/install/ressource/defaultdata.php | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 21b5d70e..546173de 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -91,102 +91,102 @@ class init extends common {
 				'arimo'=> [
 					'name' => 'Arimo',
 					'font-family' => 'Arimo,  sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/arimo'
+					'ressource' => 'https://fonts.cdnfonts.com/css/arimo'
 				],
 				'arvo'=> [
 					'name' => 'Arvo',
 					'font-family' => 'Arvo,  sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/arvo'
+					'ressource' => 'https://fonts.cdnfonts.com/css/arvo'
 				],
 				'dancing-script' => [
 					'name' => 'Dancing Script',
 					'font-family' => '"Dancing Script", sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/dancing-script'
+					'ressource' => 'https://fonts.cdnfonts.com/css/dancing-script'
 				],
 				'droid-sans-2'=> [
 					'name' => 'Droid Sans',
 					'font-family' =>  '"Droid Sans", sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/droid-sans-2'
+					'ressource' => 'https://fonts.cdnfonts.com/css/droid-sans-2'
 				],
 				'droid-serif-2'=> [
 					'name' => 'Droid Serif',
 					'font-family' =>  '"Droid Serif", serif',
-					'url' => 'https://fonts.cdnfonts.com/css/droid-serif-2'
+					'ressource' => 'https://fonts.cdnfonts.com/css/droid-serif-2'
 				],
 				'indie-flower'=> [
 					'name' => 'Indie Flower',
 					'font-family' => '"Indie Flower", sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/indie-flower'
+					'ressource' => 'https://fonts.cdnfonts.com/css/indie-flower'
 				],
 				'liberation-sans'=> [
 					'name' => 'Liberation Sans',
 					'font-family' => '"Liberation Sans", sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/liberation-sans'
+					'ressource' => 'https://fonts.cdnfonts.com/css/liberation-sans'
 				],
 				'liberation-serif'=> [
 					'name' => 'Liberation Serif',
 					'font-family' => '"Liberation Serif", serif',
-					'url' => 'https://fonts.cdnfonts.com/css/liberation-serif'
+					'ressource' => 'https://fonts.cdnfonts.com/css/liberation-serif'
 				],
 				'lobster-2'=> [
 					'name' => 'Lobster',
 					'font-family' => 'Lobster, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/lobster-2'
+					'ressource' => 'https://fonts.cdnfonts.com/css/lobster-2'
 				],
 				'lato'=> [
 					'name' => 'lato',
 					'font-family' => 'Lato, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/lato'
+					'ressource' => 'https://fonts.cdnfonts.com/css/lato'
 				],
 				'lora'=> [
 					'name' => 'Lora',
 					'font-family' => 'Lora, serif',
-					'url' => 'https://fonts.cdnfonts.com/css/lora'
+					'ressource' => 'https://fonts.cdnfonts.com/css/lora'
 				],
 				'old-standard-tt-3'=> [
 					'name' => 'Old Standard TT',
 					'font-family' => '"Old Standard TT", serif',
-					'url' => 'https://fonts.cdnfonts.com/css/old-standard-tt-3'
+					'ressource' => 'https://fonts.cdnfonts.com/css/old-standard-tt-3'
 				],
 				'open-sans' => [
 					'name' => 'Open Sans',
 					'font-family' => '"Open Sans", sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/open-sans'
+					'ressource' => 'https://fonts.cdnfonts.com/css/open-sans'
 				],
 				'oswald-4'=> [
 					'name' => 'Oswald',
 					'font-family' => 'Oswald, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/oswald-4'
+					'ressource' => 'https://fonts.cdnfonts.com/css/oswald-4'
 				],
 				'pt-mono'=> [
 					'name' => 'PT Mono',
 					'font-family' => '"PT Mono", monospace',
-					'url' => 'https://fonts.cdnfonts.com/css/pt-mono'
+					'ressource' => 'https://fonts.cdnfonts.com/css/pt-mono'
 				],
 				'pt-serif'=> [
 					'name' => "PR Serif",
 					'font-family' => '"PT Serif", serif',
-					'url' => 'https://fonts.cdnfonts.com/css/pt-serif'
+					'ressource' => 'https://fonts.cdnfonts.com/css/pt-serif'
 				],
 				'rancho'=> [
 					'name' => 'Rancho',
 					'font-family' => 'Rancho, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/rancho'
+					'ressource' => 'https://fonts.cdnfonts.com/css/rancho'
 				],
 				'roboto'=> [
 					'name' => 'Roboto',
 					'font-family' => 'Roboto, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/roboto'
+					'ressource' => 'https://fonts.cdnfonts.com/css/roboto'
 				],
 				'ubuntu'=> [
 					'name' => 'Ubuntu',
 					'font-family' => 'Ubuntu, sans-serif',
-					'url' => 'https://fonts.cdnfonts.com/css/ubuntu'
+					'ressource' => 'https://fonts.cdnfonts.com/css/ubuntu'
 				],
 				'vollkorn'=> [
 					'name' => 'Vollkorn',
 					'font-family' => 'Vollkorn, serif',
-					'url' => 'https://fonts.cdnfonts.com/css/vollkorn'
+					'ressource' => 'https://fonts.cdnfonts.com/css/vollkorn'
 				]
 			]
 		],

From 827047b8cdb6b291e51a137a19b2fb4705ecad6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 12 Mar 2022 12:28:28 +0100
Subject: [PATCH 23/26] =?UTF-8?q?formulaire=20=C3=A9dition=20de=20fonte=20?=
 =?UTF-8?q?okay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/theme.php                   |  6 +-
 core/module/theme/view/fontAdd/fontAdd.php    |  2 +-
 .../theme/view/fontEdit/fontEdit.js.php       | 32 ---------
 core/module/theme/view/fontEdit/fontEdit.php  | 68 ++++++++++++-------
 4 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index d2c3be20..b7b26ce6 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -590,7 +590,7 @@ class theme extends common {
 					$type,
 					$type !== 'websafe' ? 	template::button('themeFontEdit' . $fontId, [
 												'class' => 'themeFontEdit',
-												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontEdit/' . $fontId . '/' . $_SESSION['csrf'],
+												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontEdit/' .  $type . '/' . $fontId . '/' . $_SESSION['csrf'],
 												'value' => template::ico('pencil'),
 												'disabled' => !empty($fontUsed[$fontId])
 											])
@@ -719,8 +719,8 @@ class theme extends common {
 		}
 		// Valeurs en sortie
 		$this->addOutput([
-			'title' => 'Ajouter une fonte',
-			'view' => 'fontAdd'
+			'title' => 'Editer une fonte',
+			'view' => 'fontEdit'
 		]);
 	}
 
diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index ebe3daf9..804b3674 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -9,7 +9,7 @@
 			]); ?>
 		</div>
 		<div class="col2">
-			<?php echo template::button('pageEditHelp', [
+			<?php echo template::button('fontAddHelp', [
 				'href' => 'https://doc.zwiicms.fr/fontes#add',
 				'target' => '_blank',
 				'ico' => 'help',
diff --git a/core/module/theme/view/fontEdit/fontEdit.js.php b/core/module/theme/view/fontEdit/fontEdit.js.php
index e9105513..dda81719 100644
--- a/core/module/theme/view/fontEdit/fontEdit.js.php
+++ b/core/module/theme/view/fontEdit/fontEdit.js.php
@@ -10,35 +10,3 @@
  */
 
 
-/** 
- * Option par défaut du sélecteur de mode
- */
- $(document).ready(function(){
-    $('input[name=fontAddFontImported]').prop('checked', true);
-    $('input[name=fontAddFontUrl]').prop('checked', false);
-    $('#containerFontAddFile').hide();
-});
-
-
-/**
- * Mode téléchargement en ligne de la fonte ou installation locale
- */
-$("input[name=fontAddFontImported]").on("click", function() {
-    if( $('input[name=fontAddFontImported]').is(':checked') ){
-        $('input[name=fontAddFontFile]').prop('checked', false);
-    } else {
-        $('input[name=fontAddFontFile]').prop('checked', true);
-    }
-    $('#containerFontAddFile').hide();
-    $('#containerFontAddUrl').show();
-});
-
-$("input[name=fontAddFontFile]").on("click", function() {
-    if( $('input[name=fontAddFontFile]').is(':checked') ){
-        $('input[name=fontAddFontImported]').prop('checked', false);
-    } else {
-        $('input[name=fontAddFontImported]').prop('checked', true);
-    }
-    $('#containerFontAddFile').show();
-    $('#containerFontAddUrl').hide();
-});
diff --git a/core/module/theme/view/fontEdit/fontEdit.php b/core/module/theme/view/fontEdit/fontEdit.php
index ebe3daf9..d6a1d2a9 100644
--- a/core/module/theme/view/fontEdit/fontEdit.php
+++ b/core/module/theme/view/fontEdit/fontEdit.php
@@ -1,7 +1,7 @@
-<?php echo template::formOpen('fontAddForm'); ?>
+<?php echo template::formOpen('fontEditForm'); ?>
 	<div class="row">
 		<div class="col2">
-			<?php echo template::button('fontAddBack', [
+			<?php echo template::button('fontEditBack', [
 				'class' => 'buttonGrey',
 				'href' => helper::baseUrl() . 'theme/fonts',
 				'ico' => 'left',
@@ -9,7 +9,7 @@
 			]); ?>
 		</div>
 		<div class="col2">
-			<?php echo template::button('pageEditHelp', [
+			<?php echo template::button('fontEditHelp', [
 				'href' => 'https://doc.zwiicms.fr/fontes#add',
 				'target' => '_blank',
 				'ico' => 'help',
@@ -18,7 +18,7 @@
 			]); ?>
 		</div>
 		<div class="col2 offset6">
-			<?php echo template::submit('fontAddPublish', [
+			<?php echo template::submit('fontEditPublish', [
 				'value' => 'Valider',
 				'uniqueSubmission' => true
 			]); ?>
@@ -30,51 +30,67 @@
 				<h4>Identité de la fonte</h4>
 				<div class="row">
 					<div class="col6">
-							<?php echo template::checkbox('fontAddFontImported', true, 'Fonte en ligne', []); ?>
-					</div>
-					<div class="col6">
-							<?php echo template::checkbox('fontAddFontFile', true,'Fonte installée', []); ?>
+						<?php switch ($this->getUrl(2)) {
+							case 'imported':
+								echo template::checkbox('fontEditFontImported', true, 'Fonte en ligne',[
+									'checked' => true
+								]);
+								break;
+							case 'files':
+								echo template::checkbox('fontEditFontFile', true,'Fonte installée', [
+									'checked' => true
+								]);
+								break;
+						}
+						?>
 					</div>
 				</div>
 				<div class="row">
 					<div class="col6">
-						<?php echo template::text('fontAddFontId', [
+						<?php echo template::text('fontEditFontId', [
 							'autocomplete' => 'off',
 							'label' => 'Identifiant (sans espace ni majuscule)',
-							'placeholder' => 'big-marker-extrude'
+							'value' =>  $this->getUrl(3)
 
 						]); ?>
 					</div>
 					<div class="col6">
-						<?php echo template::text('fontAddFontName', [
+						<?php echo template::text('fontEditFontName', [
 							'autocomplete' => 'off',
 							'label' => 'Nom',
-							'placeholder' => 'Big Marker Extrude'
+							'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'name'])
 						]); ?>
 					</div>
+
 				</div>
 				<div class="row">
 					<div class="col12">
-					<?php echo template::text('fontAddFontFamilyName', [
+					<?php echo template::text('fontEditFontFamilyName', [
 							'autocomplete' => 'off',
 							'label' => 'Famille',
-							'placeholder' =>  "'Big Marker Extrude', sans-serif"
+							'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'font-family'])
 						]); ?>
 					</div>
 				</div>
-				<div class="row" id="containerFontAddFile">
+				<div class="row" id="containerfontEditFile">
 					<div class="col12">
-						<?php echo template::file('fontAddFile', [
-							'label' => 'Fichier de fonte (Format WOFF)'
-						]); ?>
-					</div>
-				</div>
-				<div class="row" id="containerFontAddUrl">
-					<div class="col12">
-						<?php echo template::text('fontAddUrl', [
-							'label' => 'Url du fichier de fonte',
-							'placeholder' => 'https://fonts.cdnfonts.com/css/big-marker-extrude'
-						]); ?>
+						<?php switch ($this->getUrl(2)) {
+								case 'imported':
+									echo template::text('fontEditUrl', [
+										'label' => 'Url du fichier de fonte',
+										'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']),
+										'class' => $this->getUrl(2) === 'imported' ? '' : 'noDisplay'
+									]);
+									break;
+								case 'files':
+									echo template::file('fontEditFile', [
+										'label' => 'Fichier de fonte (Format WOFF)',
+										'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']),
+										'class' => $this->getUrl(2) === 'file' ? '' : 'noDisplay'
+									]);
+									break;
+							}
+						?>
 					</div>
 				</div>
 			</div>

From d6c2cd62d2370c83e0392a8a11dd44339404e79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sat, 12 Mar 2022 14:00:33 +0100
Subject: [PATCH 24/26] =?UTF-8?q?fontEdit=20=C3=A0=20tester?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index b7b26ce6..ef42c2b4 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -656,7 +656,7 @@ class theme extends common {
 
 			// Valeurs en sortie
 			$this->addOutput([
-				'notification' => 'La fonte a été importée',
+				'notification' => 'La fonte a été créée',
 				'redirect' => helper::baseUrl() . 'theme/fonts',
 				'state' => true
 			]);
@@ -676,11 +676,11 @@ class theme extends common {
 		// Soumission du formulaire
 		if ($this->isPost()) {
 			// Type d'import en ligne ou local
-			$type = $this->getInput('fontAddFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'files';
-			$ressource = $type === 'imported' ? $this->getInput('fontAddUrl', helper::FILTER_STRING_SHORT) : $this->getInput('fontAddFile',  helper::FILTER__SHORT_STRING);
-			$fontId = $this->getInput('fontAddFontId',  helper::FILTER_STRING_SHORT, true);
-			$fontName = $this->getInput('fontAddFontName',  helper::FILTER_STRING_SHORT, true);
-			$fontFamilyName = $this->getInput('fontAddFontFamilyName',  helper::FILTER_STRING_SHORT, true);
+			$type = $this->getInput('fontEditFontImported', helper::FILTER_BOOLEAN) ? 'imported' : 'files';
+			$ressource = $type === 'imported' ? $this->getInput('fontEditUrl', helper::FILTER_STRING_SHORT) : $this->getInput('fontEditFile',  helper::FILTER__SHORT_STRING);
+			$fontId = $this->getInput('fontEditFontId',  helper::FILTER_STRING_SHORT, true);
+			$fontName = $this->getInput('fontEditFontName',  helper::FILTER_STRING_SHORT, true);
+			$fontFamilyName = $this->getInput('fontEditFontFamilyName',  helper::FILTER_STRING_SHORT, true);
 
 			// Vérifier l'existence de fontId et validité de family name si usage en ligne de cdnFonts
 
@@ -712,7 +712,7 @@ class theme extends common {
 
 			// Valeurs en sortie
 			$this->addOutput([
-				'notification' => 'La fonte a été importée',
+				'notification' => 'La fonte a été éditée',
 				'redirect' => helper::baseUrl() . 'theme/fonts',
 				'state' => true
 			]);

From 7355b06db4d20c6af6cd2b783076eb8dbd0062c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sun, 13 Mar 2022 10:09:49 +0100
Subject: [PATCH 25/26] fontEdit en mieux

---
 core/core.php                                 |  2 +-
 .../theme/view/fontEdit/fontEdit.js.php       | 32 ++++++++++++
 core/module/theme/view/fontEdit/fontEdit.php  | 52 +++++++------------
 3 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/core/core.php b/core/core.php
index db18c31c..bc8e5f4d 100644
--- a/core/core.php
+++ b/core/core.php
@@ -45,7 +45,7 @@ class common {
 
 	// Numéro de version
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
-	const ZWII_VERSION = '11.3.04';
+	const ZWII_VERSION = '11.4.00';
 	const ZWII_UPDATE_CHANNEL = "v11";
 
 	public static $actions = [];
diff --git a/core/module/theme/view/fontEdit/fontEdit.js.php b/core/module/theme/view/fontEdit/fontEdit.js.php
index dda81719..d702e658 100644
--- a/core/module/theme/view/fontEdit/fontEdit.js.php
+++ b/core/module/theme/view/fontEdit/fontEdit.js.php
@@ -10,3 +10,35 @@
  */
 
 
+/** 
+ * Option par défaut du sélecteur de mode
+ */
+ $(document).ready(function(){
+    $('input[name=fontEditFontImported]').prop('checked', true);
+    $('input[name=fontEditFontUrl]').prop('checked', false);
+    $('#containerfontEditFile').hide();
+});
+
+
+/**
+ * Mode téléchargement en ligne de la fonte ou installation locale
+ */
+$("input[name=fontEditFontImported]").on("click", function() {
+    if( $('input[name=fontEditFontImported]').is(':checked') ){
+        $('input[name=fontEditFontFile]').prop('checked', false);
+    } else {
+        $('input[name=fontEditFontFile]').prop('checked', true);
+    }
+    $('#containerfontEditFile').hide();
+    $('#containerfontEditUrl').show();
+});
+
+$("input[name=fontEditFontFile]").on("click", function() {
+    if( $('input[name=fontEditFontFile]').is(':checked') ){
+        $('input[name=fontEditFontImported]').prop('checked', false);
+    } else {
+        $('input[name=fontEditFontImported]').prop('checked', true);
+    }
+    $('#containerfontEditFile').show();
+    $('#containerfontEditUrl').hide();
+});
diff --git a/core/module/theme/view/fontEdit/fontEdit.php b/core/module/theme/view/fontEdit/fontEdit.php
index d6a1d2a9..33fec58c 100644
--- a/core/module/theme/view/fontEdit/fontEdit.php
+++ b/core/module/theme/view/fontEdit/fontEdit.php
@@ -30,19 +30,14 @@
 				<h4>Identité de la fonte</h4>
 				<div class="row">
 					<div class="col6">
-						<?php switch ($this->getUrl(2)) {
-							case 'imported':
-								echo template::checkbox('fontEditFontImported', true, 'Fonte en ligne',[
-									'checked' => true
-								]);
-								break;
-							case 'files':
-								echo template::checkbox('fontEditFontFile', true,'Fonte installée', [
-									'checked' => true
-								]);
-								break;
-						}
-						?>
+							<?php echo template::checkbox('fontEditFontImported', true, 'Fonte en ligne', [
+								'checked' => $this->getUrl(2) === 'imported' ? true : false
+							]); ?>
+					</div>
+					<div class="col6">
+							<?php echo template::checkbox('fontEditFontFile', true,'Fonte installée', [
+								'checked' => $this->getUrl(2) === 'file' ? true : false
+							]); ?>
 					</div>
 				</div>
 				<div class="row">
@@ -51,7 +46,6 @@
 							'autocomplete' => 'off',
 							'label' => 'Identifiant (sans espace ni majuscule)',
 							'value' =>  $this->getUrl(3)
-
 						]); ?>
 					</div>
 					<div class="col6">
@@ -61,7 +55,6 @@
 							'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'name'])
 						]); ?>
 					</div>
-
 				</div>
 				<div class="row">
 					<div class="col12">
@@ -74,23 +67,18 @@
 				</div>
 				<div class="row" id="containerfontEditFile">
 					<div class="col12">
-						<?php switch ($this->getUrl(2)) {
-								case 'imported':
-									echo template::text('fontEditUrl', [
-										'label' => 'Url du fichier de fonte',
-										'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']),
-										'class' => $this->getUrl(2) === 'imported' ? '' : 'noDisplay'
-									]);
-									break;
-								case 'files':
-									echo template::file('fontEditFile', [
-										'label' => 'Fichier de fonte (Format WOFF)',
-										'value' => $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']),
-										'class' => $this->getUrl(2) === 'file' ? '' : 'noDisplay'
-									]);
-									break;
-							}
-						?>
+						<?php echo template::file('fontEditFile', [
+							'label' => 'Fichier de fonte (Format WOFF)',
+                            'value' => $this->getUrl(2) === 'file' ? $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']) : ''
+						]); ?>
+					</div>
+				</div>
+				<div class="row" id="containerfontEditUrl">
+					<div class="col12">
+						<?php echo template::text('fontEditUrl', [
+							'label' => 'Url du fichier de fonte',
+							'value' => $this->getUrl(2) === 'imported' ? $this->getData(['fonts', $this->getUrl(2), $this->getUrl(3), 'ressource']) : ''
+						]); ?>
 					</div>
 				</div>
 			</div>

From 4964d6b08bd2548e52a62c426080c15c125a0de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Sun, 13 Mar 2022 10:14:56 +0100
Subject: [PATCH 26/26] delete fonte ok

---
 core/module/theme/theme.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index ef42c2b4..613d8513 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -597,7 +597,7 @@ class theme extends common {
 										: '',
 					$type !== 'websafe' ? 	template::button('themeFontDelete' . $fontId, [
 												'class' => 'themeFontDelete buttonRed',
-												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $fontId . '/' . $_SESSION['csrf'],
+												'href' => helper::baseUrl() . $this->getUrl(0) . '/fontDelete/' . $type . '/' . $fontId . '/' . $_SESSION['csrf'],
 												'value' => template::ico('cancel'),
 												'disabled' => !empty($fontUsed[$fontId])
 											])
@@ -712,7 +712,7 @@ class theme extends common {
 
 			// Valeurs en sortie
 			$this->addOutput([
-				'notification' => 'La fonte a été éditée',
+				'notification' => 'La fonte a été actualisée',
 				'redirect' => helper::baseUrl() . 'theme/fonts',
 				'state' => true
 			]);
@@ -729,7 +729,7 @@ class theme extends common {
 	 */
 	public function fontDelete() {
 		// Jeton incorrect
-		if ($this->getUrl(3) !== $_SESSION['csrf']) {
+		if ($this->getUrl(4) !== $_SESSION['csrf']) {
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl()  . 'theme/fonts',
@@ -739,26 +739,19 @@ class theme extends common {
 		// Suppression
 		else {
 
-			// Charger les données des fontes
-			$files = $this->getData(['fonts', 'files']);
-			$imported = $this->getData(['fonts', 'imported']);
+			// Effacer la fonte de la base
+			$this->deleteData(['fonts', $this->getUrl(2), $this->getUrl(3)]);
 
 			// Effacer le fichier existant
-			if ( file_exists(self::DATA_DIR . $files[$this->getUrl(2)]) ) {
-				unlink(self::DATA_DIR . $files[$this->getUrl(2)]);
+			if ( $this->getUrl(2) === 'file' &&
+				file_exists(self::DATA_DIR . $this->getUrl(2)) ) {
+				unlink(self::DATA_DIR . $this->getUrl(2));
 			}
 
-			// Supprimer les entrées
-			unset($files[$this->getUrl(2)]);
-			unset($imported[$this->getUrl(2)]);
-
-			// Mettre à jour le fichier des fontes
-			$this->setData(['fonts', 'files', $files ]);
-			$this->setData(['fonts', 'imported', $imported ]);
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl()  . 'theme/fonts',
-				'notification' => 'Fonte supprimée',
+				'notification' => 'La fonte a été supprimée',
 				'state' => true
 			]);
 		}