remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Validité des fontes

Browse Source
This commit is contained in:
Fred Tempez 2022-05-09 17:25:59 +02:00
parent 66cb645700
commit bd1a174272
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## Version 11.4.02
### Modifications :
- Liste des aperçus de fontes, contrôle de validité amélioré.
## Version 11.4.01 ## Version 11.4.01
### Corrections : ### Corrections :
- Défaut de chargement des fontes locales (ex: fichiers woff). - Défaut de chargement des fontes locales (ex: fichiers woff).

7
core/module/theme/theme.php
View File

@ -1190,6 +1190,8 @@ class theme extends common {
*/ */
$gf = false; $gf = false;
$fileContent = '<!-- Fontes personnalisées -->'; $fileContent = '<!-- Fontes personnalisées -->';
if ( is_array($this->getData(['fonts', 'imported'])) &&
!empty($this->getData(['fonts', 'imported'])) ) {
foreach ($this->getData(['fonts', 'imported']) as $fontId => $fontValue) { foreach ($this->getData(['fonts', 'imported']) as $fontId => $fontValue) {
if ( if (
( $scope === 'user' && in_array($fontId, $fontsInstalled) ) ( $scope === 'user' && in_array($fontId, $fontsInstalled) )
@ -1202,6 +1204,7 @@ class theme extends common {
$gf = strpos($fontValue['resource'], 'fonts.googleapis.com') === false ? $gf || false : $gf || true; $gf = strpos($fontValue['resource'], 'fonts.googleapis.com') === false ? $gf || false : $gf || true;
} }
} }
}
// Ajoute le préconnect des fontes Googles. // Ajoute le préconnect des fontes Googles.
$fileContent = $gf ? '<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>' . $fileContent $fileContent = $gf ? '<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>' . $fileContent
@ -1213,6 +1216,9 @@ class theme extends common {
* Fontes installées localement * Fontes installées localement
*/ */
$fileContentCss = ''; $fileContentCss = '';
$fileContent = '<!-- Fontes personnalisées -->';
if ( is_array($this->getData(['fonts', 'files'])) &&
!empty($this->getData(['fonts', 'files'])) ) {
foreach ($this->getData(['fonts', 'files']) as $fontId => $fontValue) { foreach ($this->getData(['fonts', 'files']) as $fontId => $fontValue) {
if ( if (
( $scope === 'user' && in_array($fontId, $fontsInstalled) ) ( $scope === 'user' && in_array($fontId, $fontsInstalled) )
@ -1231,6 +1237,7 @@ class theme extends common {
} }
} }
} }
}
// Enregistre la personnalisation // Enregistre la personnalisation
file_put_contents(self::DATA_DIR.'fonts/fonts.html', $fileContent); file_put_contents(self::DATA_DIR.'fonts/fonts.html', $fileContent);