From 2082e016e0f25ee40fd14ab214a73074bc51fb3f Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 8 Aug 2021 07:01:19 +0200 Subject: [PATCH] 11005 Sitemap : update, bug et option disallow --- CHANGES.md | 6 +++++- README.md | 2 +- core/class/sitemap/SitemapGenerator.class.php | 2 +- core/core.php | 12 ++++++++---- core/module/config/config.php | 3 +++ core/module/config/view/advanced/advanced.js.php | 2 +- core/module/config/view/advanced/advanced.php | 9 ++++++++- core/module/install/ressource/defaultdata.php | 5 ++++- core/module/page/view/edit/edit.js.php | 2 +- core/module/page/view/edit/edit.php | 2 +- 10 files changed, 33 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d916e304..d90ca1b3 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ # Changelog -## Version 11.0.03 +## Version 11.0.05 - Modifications : - Intégration de la classe layout dans la classe core - Gestion multi-langues @@ -17,6 +17,10 @@ - Suppression de l'option articles par pages désormais intégrées aux modules. - Suppression de l'option de backup individuel des fichiers de données, pour l'activer manuellement, créez un fichier vide .backup dans site/data - Nouvelle option permettant de transférer les fichiers de sauvegarde automatiques dans le gestionnaire de fichiers. + - Référencement : + - Mise à jour du générateur de siteMap 4.3.2 + - Correction d'un bug avec la génération du site map + - Ajout d'une option de configuration autorisant le référencement du site par les moteurs de recherche. - Module News 3.4 : - Changement de nom, Actualités -> News - La version abrégée des articles dépend du nombre de caractères au lieu de la hauteur de la div. L'effet flou inutile est aussi supprimé. diff --git a/README.md b/README.md index 0b0878be..be2ba42e 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# ZwiiCMS 11.0.00 +# ZwiiCMS 11.0.05 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. diff --git a/core/class/sitemap/SitemapGenerator.class.php b/core/class/sitemap/SitemapGenerator.class.php index 17fb78aa..bf9b5076 100644 --- a/core/class/sitemap/SitemapGenerator.class.php +++ b/core/class/sitemap/SitemapGenerator.class.php @@ -100,7 +100,7 @@ class SitemapGenerator * @var string * @access private */ - private $classVersion = "4.3.2"; + private $classVersion = "4.3.1"; /** * Search engines URLs * @var array of strings diff --git a/core/core.php b/core/core.php index 40cfcc20..b2a26978 100755 --- a/core/core.php +++ b/core/core.php @@ -45,7 +45,7 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '11.0.04'; + const ZWII_VERSION = '11.0.05'; const ZWII_UPDATE_CHANNEL = "v11"; public static $actions = []; @@ -835,8 +835,8 @@ class common { $outputDir = getcwd(); $sitemap = new \Icamys\SitemapGenerator\SitemapGenerator(helper::baseurl(false),$outputDir); - // will create also compressed (gzipped) sitemap - $sitemap->enableCompression(); + // will create also compressed (gzipped) sitemap : option buguée + // $sitemap->enableCompression(); // determine how many urls should be put into one file // according to standard protocol 50000 is maximum value (see http://www.sitemaps.org/protocol.html) @@ -900,7 +900,11 @@ class common { $sitemap->finalize(); // Update robots.txt file in output directory or create a new one - $sitemap->updateRobots(); + if ($this->getData(['config','seo', 'robots']) === true) { + $sitemap->updateRobots(); + } else { + copy('core/module/install/ressource/robots.txt', 'robots.txt'); + } // Submit your sitemaps to Google, Yahoo, Bing and Ask.com if (empty ($this->getData(['config','proxyType']) . $this->getData(['config','proxyUrl']) . ':' . $this->getData(['config','proxyPort'])) ) { diff --git a/core/module/config/config.php b/core/module/config/config.php index b83c9f12..1cee16fd 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -474,6 +474,9 @@ class config extends common { 'password' =>helper::encrypt($this->getData(['config','smtp','username']),$this->getInput('configAdvancedSmtpPassword')), 'sender' => $this->getInput('configAdvancedSmtpSender',helper::FILTER_MAIL) ], + 'seo' => [ + 'robots' => $this->getInput('configAdvancedSeoRobots',helper::FILTER_BOOLEAN) + ], 'connect' => [ 'attempt' => $this->getInput('configAdvancedConnectAttempt',helper::FILTER_INT), 'timeout' => $this->getInput('configAdvancedConnectTimeout',helper::FILTER_INT), diff --git a/core/module/config/view/advanced/advanced.js.php b/core/module/config/view/advanced/advanced.js.php index 903e0fc5..34cdb188 100644 --- a/core/module/config/view/advanced/advanced.js.php +++ b/core/module/config/view/advanced/advanced.js.php @@ -39,7 +39,7 @@ $( document).ready(function() { * Initialisation des blocs */ - var i = [ "social", "ceo", "network", "smtp", "login", "logs", "script" ]; + var i = [ "social", "seo", "network", "smtp", "login", "logs", "script" ]; $.each(i,function(e) { if (getCookie(i[e]) === "true") { $("#" + i[e]).find(".zwiico-plus-circled").hide(); diff --git a/core/module/config/view/advanced/advanced.php b/core/module/config/view/advanced/advanced.php index a4c307fe..4e90680d 100644 --- a/core/module/config/view/advanced/advanced.php +++ b/core/module/config/view/advanced/advanced.php @@ -238,7 +238,7 @@
-
+

Référencement

+
+
+ $this->getData(['config', 'seo','robots']) + ]); ?> +
+
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 159fcb9a..e8dc4d6b 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -25,7 +25,10 @@ class init extends common { 'proxyPort' => '', 'proxyType' => 'tcp://', 'smtp' => [ - 'enable' => false, + 'enable' => true, + ], + 'seo' => [ + 'seo' => false ], 'connect' => [ 'timeout' => 600, diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index c73b5f66..8efa1c53 100644 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -56,7 +56,7 @@ $( document ).ready(function() { * Initialisation des blocs */ - var i = ["info", "layout", "setup", "location", "advanced", "ceo" ]; + var i = ["info", "layout", "setup", "location", "advanced", "seo" ]; $.each(i,function(e) { if (getCookie(i[e]) === "true") { $("#" + i[e]).find(".zwiico-plus-circled").hide(); diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 923ae399..4c99a212 100644 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -251,7 +251,7 @@ echo template::formOpen('pageEditForm');
-
+

Permission et référencement