From 3177faf3f7cbef844d741a420b435dceda762d3b Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Wed, 20 Apr 2022 17:03:54 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Supprime=20la=20propri=C3=A9t=C3=A9?=
 =?UTF-8?q?=20fonts=20du=20template=20select"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e4b84b024fb57f1abe0bdff4a2820872a5b251ad.
---
 core/class/template.class.php            | 11 +++++++++--
 core/module/theme/theme.php              |  5 ++---
 core/module/theme/view/admin/admin.php   |  6 ++++--
 core/module/theme/view/footer/footer.php |  3 ++-
 core/module/theme/view/header/header.php |  3 ++-
 core/module/theme/view/menu/menu.php     |  3 ++-
 core/module/theme/view/site/site.php     |  6 ++++--
 7 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 7f623221..a0f64982 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -611,7 +611,8 @@ class template {
             'id' => $nameId,
             'label' => '',
             'name' => $nameId,
-            'selected' => ''
+            'selected' => '',
+            'fonts' => false
         ], $attributes);
         // Sauvegarde des données en cas d'erreur
         if($attributes['before'] AND array_key_exists($attributes['id'], common::$inputBefore)) {
@@ -637,7 +638,13 @@ class template {
             helper::sprintAttributes($attributes)
         );
         foreach($options as $value => $text) {
-            $html .= sprintf(
+            $html .=   $attributes['fonts'] === true ? sprintf(
+                    '<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
+                    $text,
+                    $text
+                ) : sprintf(
                     '<option value="%s"%s>%s</option>',
                         $value,
                         $attributes['selected'] == $value ? ' selected' : '', // Double == pour ignorer le type de variable car $_POST change les types en string
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 71c2c557..edaff96c 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -571,6 +571,7 @@ class theme extends common {
 		];
 
 		// Récupérer le détail des fontes installées
+		//$f = $this->getFonts();
 		$f ['files'] =  $this->getData(['fonts', 'files']);
 		$f ['imported'] =  $this->getData(['fonts', 'imported']);
 		$f ['websafe'] = self::$fontsWebSafe;
@@ -1124,8 +1125,7 @@ class theme extends common {
 
 	// Retourne un tableau simple des fonts installées idfont avec le nom
 	// Cette fonction est utile aux sélecteurs de fonts dans les formulaires.
-	// Génère une feuille de style pour l'aperçu des sélecteurs
-	private function enumFonts() {
+	public function enumFonts() {
 		// Récupère la liste des fontes installées
 		$f ['files'] =  $this->getData(['fonts', 'files']);
 		$f ['imported'] =  $this->getData(['fonts', 'imported']);
@@ -1140,7 +1140,6 @@ class theme extends common {
 		}
 		ksort($fonts);
 		self::$fontsList = $fonts;
-
 	}
 
 }
diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php
index b03ebf50..8dcfaf98 100644
--- a/core/module/theme/view/admin/admin.php
+++ b/core/module/theme/view/admin/admin.php
@@ -130,7 +130,8 @@
 						<div class="col4">
 							<?php echo template::select('adminFontText', $module::$fontsList, [
 								'label' => 'Police du texte',
-								'selected' => $this->getData(['admin', 'fontText'])
+								'selected' => $this->getData(['admin', 'fontText']),
+								'fonts' => true
 							]); ?>
 						</div>
 						<div class="col4">
@@ -142,7 +143,8 @@
 						<div class="col4">
 							<?php echo template::select('adminFontTitle', $module::$fontsList, [
 								'label' => 'Police des titres',
-								'selected' => $this->getData(['admin', 'fontTitle'])
+								'selected' => $this->getData(['admin', 'fontTitle']),
+								'fonts' => true
 							]); ?>
 						</div>
 					</div>
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index 104dd092..f5e3af4a 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -173,7 +173,8 @@
                 <div class="col3">
                     <?php echo template::select('themeFooterFont', $module::$fontsList, [
 							'label' => 'Fonte',
-							'selected' => $this->getData(['theme', 'footer', 'font'])
+							'selected' => $this->getData(['theme', 'footer', 'font']),
+							'fonts' => true
 						]); ?>
                 </div>
                 <div class="col3">
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index ae2c82bc..a0f86b11 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -108,7 +108,8 @@
                 <div class="col4">
                     <?php echo template::select('themeHeaderFont', $module::$fontsList, [
 							'label' => 'Fonte',
-							'selected' => $this->getData(['theme', 'header', 'font'])
+							'selected' => $this->getData(['theme', 'header', 'font']),
+							'fonts' => true
 						]); ?>
                 </div>
                 <div class="col4">
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index f11c7a96..161813f2 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -185,7 +185,8 @@
                 <div class="col6">
                     <?php echo template::select('themeMenuFont', $module::$fontsList, [
 								'label' => 'Fonte',
-								'selected' => $this->getData(['theme', 'menu', 'font'])
+								'selected' => $this->getData(['theme', 'menu', 'font']),
+                                'fonts' => true
 							]); ?>
                 </div>
                 <div class="col6">
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index f9e46d91..4157c3d4 100644
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -160,7 +160,8 @@
 					<div class="col6">
 						<?php echo template::select('themeTextFont', $module::$fontsList, [
 							'label' => 'Fonte',
-							'selected' => $this->getData(['theme', 'text', 'font'])
+							'selected' => $this->getData(['theme', 'text', 'font']),
+							'fonts' => true
 						]); ?>
 					</div>
 					<div class="col6">
@@ -180,7 +181,8 @@
 					<div class="col4">
 						<?php echo template::select('themeTitleFont', $module::$fontsList, [
 							'label' => 'Fonte',
-							'selected' => $this->getData(['theme', 'title', 'font'])
+							'selected' => $this->getData(['theme', 'title', 'font']),
+							'fonts' => true
 						]); ?>
 					</div>
 					<div class="col4">