diff --git a/CHANGES.md b/CHANGES.md index 92502a8f..6896f092 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ # Changelog ## version 10.6.03 + +- Correction : + - Module actualités (news), version 3.3, le flux RSS affiche l'ensemble des articles plutôt que ceux de la page courante. - Modification : - Livraison des fichiers de thème lors d'une primo installation avec site de test dans une archive. Désormais, le dossier site ne contiendra que les fichiers de sécurité htaccess. Cette procédure permettra de ne plus différencier les archives d'installation et de mise à jour. diff --git a/core/core.php b/core/core.php index 90c0d6ca..3144a376 100755 --- a/core/core.php +++ b/core/core.php @@ -45,7 +45,7 @@ class common { // Numéro de version const ZWII_VERSION = '10.6.03'; - const ZWII_UPDATE_CHANNEL = 'v10'; + const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; public static $coreModuleIds = [ diff --git a/module/blog/blog.php b/module/blog/blog.php index e9959dfb..dd1284a5 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -15,7 +15,7 @@ class blog extends common { - const VERSION = '5.0'; + const VERSION = '5.1'; const REALNAME = 'Blog'; const DELETE = true; const UPDATE = '0.0'; @@ -142,8 +142,8 @@ class blog extends common { // Corps des articles $articleIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'); $articleIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'state', 'SORT_DESC'); - foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) { - if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) { + foreach( $articleIdsPublishedOns as $articleId => $articlePublishedOn ) { + if( $articlePublishedOn <= time() AND $articleIdsStates[$articleId] ) { // Miniature $parts = explode('/',$this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture'])); $thumb = str_replace ($parts[(count($parts)-1)],'mini_' . $parts[(count($parts)-1)], $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture'])); @@ -163,11 +163,13 @@ class blog extends common { $newsArticle->setAuthor($author,'no@mail.com'); $newsArticle->setId(helper::baseUrl() .$this->getUrl(0) . '/' . $articleId); $newsArticle->setDate(date('r', $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']))); - $imageData = getimagesize(helper::baseUrl(false) . self::FILE_DIR . 'thumb/' . $thumb); + if ( file_exists($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'picture'])) ) { + $imageData = getimagesize(helper::baseUrl(false) . self::FILE_DIR . 'thumb/' . $thumb); $newsArticle->addEnclosure( helper::baseUrl(false) . self::FILE_DIR . 'thumb/' . $thumb, $imageData[0] * $imageData[1], $imageData['mime'] - ); + ); + } $feeds->addItem($newsArticle); } } diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php index 319d7a54..30baca8a 100755 --- a/module/blog/view/index/index.php +++ b/module/blog/view/index/index.php @@ -4,21 +4,21 @@ $article): ?>
- makeThumb( self::FILE_DIR . 'source/' . $article['picture'], - self::FILE_DIR . 'thumb/' . $thumb, - self::THUMBS_WIDTH); - } - - ?> + + makeThumb( self::FILE_DIR . 'source/' . $article['picture'], + self::FILE_DIR . 'thumb/' . $thumb, + self::THUMBS_WIDTH); + } + ?> <?php echo $article['picture']; ?> +

diff --git a/module/news/news.php b/module/news/news.php index d8c0d94d..e3b74254 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -15,7 +15,7 @@ class news extends common { - const VERSION = '3.2'; + const VERSION = '3.3'; const REALNAME = 'Actualités'; const DELETE = true; const UPDATE = '0.0'; @@ -101,8 +101,6 @@ class news extends common { $feeds->addGenerator(); // Corps des articles $newsIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'); - // Articles de la première page uniquement - $newsIdsPublishedOns = array_slice($newsIdsPublishedOns, 0, $this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) ); $newsIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'state', 'SORT_DESC'); foreach($newsIdsPublishedOns as $newsId => $newsPublishedOn) { if($newsPublishedOn <= time() AND $newsIdsStates[$newsId]) {