From 4f9e555e82e0f93c04a8c9b6d51e5742d6d60ee8 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 10 Feb 2022 08:25:23 +0100
Subject: [PATCH] =?UTF-8?q?Check=20de=20valiait=C3=A9=20sur=20le=20nom=20d?=
 =?UTF-8?q?e=20la=20fonte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/theme.php                | 13 +++++++------
 core/module/theme/view/fontAdd/fontAdd.php | 10 +---------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 5b09a03b..338d77a5 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -610,18 +610,19 @@ class theme extends common {
 			// Vérifier l'existence de fontId et validité de family namesi usage en ligne de cdnFonts
 			$data = helper::urlGetContents('https://www.cdnfonts.com/' . $fontId . '.font');
 
-/*			if ( strpos($data, 'No results found.') >= 0
-				 //|| strpos($data, $fontName) === false 
-				&& empty($filePath)
+			if ( $filePath === ''
+				 && strpos($data, $fontName) === false
 			) {
+
 				// Valeurs en sortie
 				$this->addOutput([
-					'notification' => 'Le fichie de police étant absent,<br/>la fonte doit exister sur le serveur https://cdnfonts.com<br>et le nom de la fonte doit correspondre (family name)<br>',
+					'notification' => 'Erreur de nom ou d\'identifiant',
 					'redirect' => helper::baseUrl() . 'theme/fontAdd',
 					'state' => false
 				]);
 			} else {
-*/				// Charger les données des fontes
+
+				// Charger les données des fontes
 				$files = $this->getData(['fonts', 'files']);
 				$imported = $this->getData(['fonts', 'imported']);
 
@@ -646,7 +647,7 @@ class theme extends common {
 					'redirect' => helper::baseUrl() . 'theme/fonts',
 					'state' => true
 				]);
-//			}
+			}
 		}
 		// Valeurs en sortie
 		$this->addOutput([
diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index 6af4651b..62747c7d 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -41,13 +41,6 @@
 						]); ?>
 					</div>
 				</div>
-			</div>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Source</h4>
 				<div class="row">
 					<div class="col12">
 						<?php echo template::file('fontAddFile', [
@@ -58,6 +51,5 @@
 				</div>
 			</div>
 		</div>
-		</div>
-					
+	</div>
 <?php echo template::formClose(); ?>
\ No newline at end of file