From c6e1ef2aebd274a733b4c6587c02c77efdd4808f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Fri, 11 Mar 2022 15:56:06 +0100 Subject: [PATCH] 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 .= ''; + $fontFile .= ''; // 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 .= ''; + $fontFile .= ''; // 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(); });