From 09048e97a25bb0669dd3c68d9ab561faccff32d4 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Mon, 30 Aug 2021 22:40:13 +0200
Subject: [PATCH] =?UTF-8?q?Cat=C3=A9goris=20dans=20le=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/addon/addon.php            | 1 +
 core/module/addon/view/store/store.php | 2 +-
 module/download/download.php           | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index 88b12523..2be1ccb6 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -310,6 +310,7 @@ class addon extends common {
 					$ico =  template::ico('update');
 				}
 				self::$storeList [] = [
+					$store[$key]['category'],
 					'<a href="' . self::BASEURL_STORE . self::MODULE_STORE . $key . '" target="_blank" >'.$store[$key]['title'].'</a>',
 					$store[$key]['version'],
 					mb_detect_encoding(strftime('%d %B %Y', $store[$key]['versionDate']), 'UTF-8', true)
diff --git a/core/module/addon/view/store/store.php b/core/module/addon/view/store/store.php
index 5ed010b6..182d1068 100644
--- a/core/module/addon/view/store/store.php
+++ b/core/module/addon/view/store/store.php
@@ -9,7 +9,7 @@
 	</div>
 </div>
 <?php if($module::$storeList): ?>
-	<?php echo template::table([4, 2, 2, 3, 1], $module::$storeList, ['Module', 'Version', 'Date', 'Pages', 'Télécharger']); ?>
+	<?php echo template::table([2, 2, 1, 2, 2, 2, 1], $module::$storeList, ['Catégorie', 'Module', 'Version', 'Date', 'Pages', 'Télécharger']); ?>
 <?php else: ?>
 	<?php echo template::speech('Le catalogue est vide.'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/module/download/download.php b/module/download/download.php
index 28a75d95..730607ca 100644
--- a/module/download/download.php
+++ b/module/download/download.php
@@ -14,7 +14,7 @@
 
 class download extends common {
 
-	const VERSION = '2.1';
+	const VERSION = '2.2';
 	const REALNAME = 'Téléchargement';
 	const DELETE = true;
 	const UPDATE = '0.0';
@@ -1048,7 +1048,9 @@ class download extends common {
 				'versionDate'   =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'versionDate']),
 				'author'   =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'author']),
 				'license'   => $this->getData(['module', $this->getUrl(0), 'items', $key, 'license']),
-				'category' => $this->getData(['module', $this->getUrl(0), 'items', $key, 'category'])
+				'category' =>  $this->getData(['module', $this->getUrl(0),'categories',
+								$this->getData(['module', $this->getUrl(0), 'items', $key, 'category'])
+							])
 			];
 		}
 		$this->addOutput([