From 57d15fc646f568ca203dd3f643fe53d07215adfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Thu, 17 Feb 2022 15:23:18 +0100 Subject: [PATCH] url cdnfonts en https --- CHANGES.md | 3 ++- core/core.php | 4 ++-- core/module/theme/view/admin/admin.js.php | 4 ++-- core/module/theme/view/fonts/fonts copy.php | 2 +- core/module/theme/view/footer/footer.js.php | 2 +- core/module/theme/view/header/header.js.php | 2 +- core/module/theme/view/menu/menu.js.php | 2 +- core/module/theme/view/site/site.js.php | 4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1650d285..c15a9a6d 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,8 +2,9 @@ ## Version 11.3.01 -### Correction : +### Corrections : - Gestionnaire de fichier, chevauchement d'icônes en multi sélection et aides non traduites. + - Fontes : utilisation d'une adresse d'import de fonte HTTPS ## Version 11.3.00 diff --git a/core/core.php b/core/core.php index de50ba14..e1e9a755 100644 --- a/core/core.php +++ b/core/core.php @@ -2324,7 +2324,7 @@ class core extends common { */ foreach ($fonts as $fontId) { if (!array_key_exists($fontId, $localFonts) ) { - $css .= '@import url("http://fonts.cdnfonts.com/css/' . $fontId . '");'; + $css .= '@import url("https://fonts.cdnfonts.com/css/' . $fontId . '");'; // Supprimer l'élément des fontes chargées en ligne unset($fonts[$fontId]); } @@ -2550,7 +2550,7 @@ class core extends common { */ foreach ($fonts as $fontId) { if (!array_key_exists($fontId, $localFonts) ) { - $css .= '@import url("http://fonts.cdnfonts.com/css/' . $fontId . '");'; + $css .= '@import url("https://fonts.cdnfonts.com/css/' . $fontId . '");'; // Supprimer l'élément des fontes chargées en ligne unset($fonts[$fontId]); } diff --git a/core/module/theme/view/admin/admin.js.php b/core/module/theme/view/admin/admin.js.php index 7855fb23..e9f30094 100644 --- a/core/module/theme/view/admin/admin.js.php +++ b/core/module/theme/view/admin/admin.js.php @@ -17,8 +17,8 @@ $("input, select").on("change", function() { var titleFont = $("#adminFontTitle").val(); var textFont = $("#adminFontText").val(); - var css = "@import url('http://fonts.cdnfonts.com/css/" + titleFont + "');"; - var css = "@import url('http://fonts.cdnfonts.com/css/" + textFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + titleFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + textFont + "');"; var colors = core.colorVariants($("#adminBackgroundColor").val()); var css = "#site{background-color:" + colors.normal + ";}"; css += "body, .row > div {font:" + $("#adminFontTextSize").val() + " '" + textFont + "', sans-serif;}"; diff --git a/core/module/theme/view/fonts/fonts copy.php b/core/module/theme/view/fonts/fonts copy.php index b7d4590b..bc736604 100644 --- a/core/module/theme/view/fonts/fonts copy.php +++ b/core/module/theme/view/fonts/fonts copy.php @@ -5,7 +5,7 @@ $doc->loadHTMLFile($filefont, LIBXML_NOERROR); $elements = $doc->getElementsByTagName('i'); var_dump ($elements); foreach($elements as $element) { - if ($element->$textContent === 'http://fonts.cdnfonts.com/css/sketched') { + if ($element->$textContent === 'https://fonts.cdnfonts.com/css/sketched') { var_dump( $element['textContent'] ); } } \ No newline at end of file diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index d96ededa..fde76c07 100644 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -19,7 +19,7 @@ $("input, select").on("change", function() { // Import des polices de caractères var footerFont = $("#themeFooterFont :selected").val(); var footerFontText = $("#themeFooterFont :selected").text(); - var css = "@import url('http://fonts.cdnfonts.com/css/" + footerFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + footerFont + "');"; // Couleurs du pied de page var colors = core.colorVariants($("#themeFooterBackgroundColor").val()); var textColor = $("#themeFooterTextColor").val(); diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 03ef71df..7cc85e53 100644 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -82,7 +82,7 @@ $("input, select").on("change", function() { // Import des polices de caractères var headerFont = $("#themeHeaderFont :selected").val(); var headerFontText = $("#themeHeaderFont :selected").text(); - var css = "@import url('http://fonts.cdnfonts.com/css/" + headerFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + headerFont + "');"; css += "header{text-align:" + $("#themeHeaderTextAlign").val() + ";"; if ($("#themeHeaderImage").val()) { diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index ecb065f8..958960e9 100644 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -42,7 +42,7 @@ $("input, select").on("change", function() { // Import des polices de caractères var menuFont = $("#themeMenuFont :selected").val(); var menuFontText = $("#themeMenuFont :selected").text(); - var css = "@import url('http://fonts.cdnfonts.com/css/" + menuFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + menuFont + "');"; var colors = core.colorVariants($("#themeMenuBackgroundColor").val()); // Couleurs du menu css += "nav,nav.navLevel1 a{background-color:" + colors.normal + "}"; diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index a13c7582..3ff25012 100644 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -38,8 +38,8 @@ $("input, select").on("change",function() { var textFont = $("#themeTextFont :selected").val(); var textFontText = $("#themeTextFont :selected").text(); console.log(textFontText); - var css = "@import url('http://fonts.cdnfonts.com/css/" + titleFont + "');"; - var css = "@import url('http://fonts.cdnfonts.com/css/" + textFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + titleFont + "');"; + var css = "@import url('https://fonts.cdnfonts.com/css/" + textFont + "');"; // Couleurs des boutons var colors = core.colorVariants($("#themeButtonBackgroundColor").val()); css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}";