diff --git a/core/core.php b/core/core.php index f06ee2a..8f2499a 100644 --- a/core/core.php +++ b/core/core.php @@ -51,7 +51,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.10.00'; + const ZWII_VERSION = '1.10.01'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; diff --git a/module/blog/blog.php b/module/blog/blog.php index 8953705..c6fa2f3 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -16,7 +16,7 @@ class blog extends common { - const VERSION = '7.6'; + const VERSION = '7.8'; const REALNAME = 'Blog'; const DELETE = true; const UPDATE = '0.0'; @@ -196,9 +196,9 @@ class blog extends common $feeds = new \FeedWriter\RSS2(); // En-tête - $feeds->setTitle($this->getData(['page', $this->getUrl(0), 'title'])); + $feeds->setTitle($this->getData(['page', $this->getUrl(0), 'title']) ? $this->getData(['page', $this->getUrl(0), 'title']): ''); $feeds->setLink(helper::baseUrl() . $this->getUrl(0)); - $feeds->setDescription($this->getData(['page', $this->getUrl(0), 'metaDescription'])); + $feeds->setDescription($this->getData(['page', $this->getUrl(0), 'metaDescription']) ? $this->getData(['page', $this->getUrl(0), 'metaDescription']): ''); $feeds->setChannelElement('language', 'fr-FR'); $feeds->setDate(date('r', time())); $feeds->addGenerator(); @@ -361,7 +361,7 @@ class blog extends common self::$dateFormat = $this->getData(['module', $this->getUrl(0), 'config', 'dateFormat']); self::$timeFormat = $this->getData(['module', $this->getUrl(0), 'config', 'timeFormat']); self::$comments[] = [ - helper::dateUTF8(self::$dateFormat, $comment['createdOn']) . ' - ' . helper::dateUTF8(self::$timeFormat, $comment['createdOn']), + helper::dateUTF8(self::$dateFormat, $comment['createdOn'], self::$i18nUI) . ' - ' . helper::dateUTF8(self::$timeFormat, $comment['createdOn'], self::$i18nUI), $comment['content'], $comment['userId'] ? $this->getData(['user', $comment['userId'], 'firstname']) . ' ' . $this->getData(['user', $comment['userId'], 'lastname']) : $comment['author'], $buttonApproval, @@ -530,7 +530,7 @@ class blog extends common '' . $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'title']) . '', - helper::dateUTF8(self::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])) . ' - ' . helper::dateUTF8(self::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), + helper::dateUTF8(self::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']), self::$i18nUI) . ' - ' . helper::dateUTF8(self::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']), self::$i18nUI), self::$states[$this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'state'])], // Bouton pour afficher les commentaires de l'article template::button('blogConfigComment' . $articleIds[$i], [ diff --git a/module/blog/changes.md b/module/blog/changes.md index d5e5fa9..b25646a 100755 --- a/module/blog/changes.md +++ b/module/blog/changes.md @@ -1,3 +1,8 @@ + +# Version 7.8 +- Le flux RSS ne fonctionne pas si les méta de la page sont vides. +# Version 7.7 +- Contrôle de la variable de session liée au contenu. Evite des erreurs lorsque plusieurs onglets sont ouverts. # Version 7.6 - Mise à jour RSS Feed # Version 7.5 diff --git a/module/blog/ressource/feed-icon-16.gif b/module/blog/ressource/feed-icon-16.gif old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/ATOM.php b/module/blog/vendor/FeedWriter/ATOM.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/Feed.php b/module/blog/vendor/FeedWriter/Feed.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/InvalidOperationException.php b/module/blog/vendor/FeedWriter/InvalidOperationException.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/Item.php b/module/blog/vendor/FeedWriter/Item.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/README.md b/module/blog/vendor/FeedWriter/README.md old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/RSS1.php b/module/blog/vendor/FeedWriter/RSS1.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/FeedWriter/RSS2.php b/module/blog/vendor/FeedWriter/RSS2.php old mode 100644 new mode 100755 diff --git a/module/blog/vendor/furl/LICENSE b/module/blog/vendor/furl/LICENSE old mode 100644 new mode 100755 diff --git a/module/blog/vendor/furl/README.md b/module/blog/vendor/furl/README.md old mode 100644 new mode 100755 diff --git a/module/blog/vendor/furl/inc.json b/module/blog/vendor/furl/inc.json old mode 100644 new mode 100755 diff --git a/module/blog/vendor/furl/jquery.furl.js b/module/blog/vendor/furl/jquery.furl.js old mode 100644 new mode 100755 diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css old mode 100644 new mode 100755 diff --git a/module/blog/view/add/add.js.php b/module/blog/view/add/add.js.php old mode 100644 new mode 100755 diff --git a/module/blog/view/add/add.php b/module/blog/view/add/add.php old mode 100644 new mode 100755 diff --git a/module/blog/view/article/article.css b/module/blog/view/article/article.css old mode 100644 new mode 100755 diff --git a/module/blog/view/article/article.js.php b/module/blog/view/article/article.js.php old mode 100644 new mode 100755 diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css old mode 100644 new mode 100755 diff --git a/module/blog/view/comment/comment.js.php b/module/blog/view/comment/comment.js.php old mode 100644 new mode 100755 diff --git a/module/blog/view/comment/comment.php b/module/blog/view/comment/comment.php old mode 100644 new mode 100755 diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css old mode 100644 new mode 100755 diff --git a/module/blog/view/config/config.js.php b/module/blog/view/config/config.js.php old mode 100644 new mode 100755 diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php old mode 100644 new mode 100755 diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css old mode 100644 new mode 100755 diff --git a/module/blog/view/edit/edit.js.php b/module/blog/view/edit/edit.js.php old mode 100644 new mode 100755 diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php old mode 100644 new mode 100755 diff --git a/module/blog/view/index/index.css b/module/blog/view/index/index.css old mode 100644 new mode 100755 diff --git a/module/blog/view/option/option.css b/module/blog/view/option/option.css old mode 100644 new mode 100755 diff --git a/module/blog/view/rss/rss.php b/module/blog/view/rss/rss.php old mode 100644 new mode 100755 diff --git a/module/form/changes.md b/module/form/changes.md index 5aebcec..11c7f51 100644 --- a/module/form/changes.md +++ b/module/form/changes.md @@ -1,3 +1,5 @@ +# Version 4.3 +- Contrôle de la variable de session liée au contenu. Evite des erreurs lorsque plusieurs onglets sont ouverts. # Version 4.2 - Termes des commandes de profils # Version 4.1 diff --git a/module/form/form.php b/module/form/form.php index 2c97042..46a0e41 100644 --- a/module/form/form.php +++ b/module/form/form.php @@ -17,7 +17,7 @@ class form extends common { - const VERSION = '4.2'; + const VERSION = '4.3'; const REALNAME = 'Formulaire'; const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json) diff --git a/module/form/vendor/html-sortable/html-sortable.min.js b/module/form/vendor/html-sortable/html-sortable.min.js old mode 100644 new mode 100755 diff --git a/module/form/vendor/html-sortable/inc.json b/module/form/vendor/html-sortable/inc.json old mode 100644 new mode 100755 diff --git a/module/form/vendor/html-sortable/lisezmoi.txt b/module/form/vendor/html-sortable/lisezmoi.txt old mode 100644 new mode 100755 diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css old mode 100644 new mode 100755 diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php index dc3520f..b594e5f 100644 --- a/module/form/view/config/config.php +++ b/module/form/view/config/config.php @@ -53,7 +53,7 @@