From f4bff1b460fd3d30e248cbce5fe7d8abec65668f Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 26 Mar 2021 10:25:11 +0100
Subject: [PATCH] =?UTF-8?q?Store=20install=C3=A9=20=20ou=20pas=20code=20co?=
 =?UTF-8?q?uleur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/addon/addon.php            | 38 ++++++++++++--------------
 core/module/addon/view/store/store.php |  2 +-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index cd35e11e..1071d435 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -230,30 +230,30 @@ class addon extends common {
 			}
 			// Parcourir les données des modules
 			foreach ($store as $key=>$value) {
+				// Module non installé
+				$ico = template::ico('download');
+				$class = '';
+				// Le module est installé
+				if (array_key_exists($key,$infoModules) === true) {
+					$class = 'buttonGreen';
+					$ico = template::ico('update');
+				}
+				// Le module est installé et utilisé
+				if (in_array($key,$inPages) === true) {
+					$class = 'buttonRed';
+					$ico =  template::ico('update');
+				}
 				self::$storeList [] = [
 					'<a href="' . helper::baseurl() . $this->getUrl(0) . '/item/' . $key . '">'.$store[$key]['title'].'</a>',
 					$store[$key]['fileVersion'],
 					mb_detect_encoding(strftime('%d %B %Y', $store[$key]['fileDate']), 'UTF-8', true)
 					? strftime('%d %B %Y', $store[$key]['fileDate'])
 					: utf8_encode(strftime('%d %B %Y', $store[$key]['fileDate'])),
-					/**
-					 * 					template::button('moduleExport' . $key, [
-					 *			'class' => 'buttonBlue',
-					 *			'href' => helper::baseUrl(). $this->getUrl(0) . '/storeDownload/' . $key.'/' . $_SESSION['csrf'],// appel de fonction vaut exécution, utiliser un paramètre
-					 *			'value' => template::ico('download')
-					 *			])
-					 *];
-					 */
-					 implode(', ',array_keys($inPages,$key)) === ''
-						? template::button('moduleExport' . $key, [
-							'class' => 'buttonBlue',
+					implode(', ', array_keys($inPagesTitle,$key)),
+					template::button('moduleExport' . $key, [
+							'class' => $class,
 							'href' => helper::baseUrl(). $this->getUrl(0) . '/installModule/' . $key.'/' . $_SESSION['csrf'],// appel de fonction vaut exécution, utiliser un paramètre
-							'value' => template::ico('download')
-							])
-						: template::button('moduleExport' . $key, [
-							'class' => 'buttonBlue',
-							'href' => helper::baseUrl(). $this->getUrl(0) . '/installModule/' . $key.'/' . $_SESSION['csrf'],// appel de fonction vaut exécution, utiliser un paramètre
-							'value' => template::ico('update')
+							'value' => $ico
 							])
 					 ];
 
@@ -308,7 +308,7 @@ class addon extends common {
 				$infoModules[$key]['realName'],
 				$infoModules[$key]['version'],
 				implode(', ', array_keys($inPagesTitle,$key)),
-				//array_key_exists('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) === ''
+				//|| ('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) === ''
 				$infoModules[$key]['delete'] === true  && implode(', ',array_keys($inPages,$key)) === ''
 											? template::button('moduleDelete' . $key, [
 													'class' => 'moduleDelete buttonRed',
@@ -318,14 +318,12 @@ class addon extends common {
 											: '',
 				is_array($infoModules[$key]['dataDirectory']) && implode(', ',array_keys($inPages,$key)) !== ''
 											? template::button('moduleExport' . $key, [
-												'class' => 'buttonBlue',
 												'href' => helper::baseUrl(). $this->getUrl(0) . '/export/' . $key,// appel de fonction vaut exécution, utiliser un paramètre
 												'value' => template::ico('download')
 												])
 											: '',
 				is_array($infoModules[$key]['dataDirectory']) && implode(', ',array_keys($inPages,$key)) === ''
 											? template::button('moduleExport' . $key, [
-												'class' => 'buttonBlue',
 												'href' => helper::baseUrl(). $this->getUrl(0) . '/import/' . $key.'/' . $_SESSION['csrf'],// appel de fonction vaut exécution, utiliser un paramètre
 												'value' => template::ico('upload')
 												])
diff --git a/core/module/addon/view/store/store.php b/core/module/addon/view/store/store.php
index 0d7a05b5..66dc9e28 100644
--- a/core/module/addon/view/store/store.php
+++ b/core/module/addon/view/store/store.php
@@ -15,7 +15,7 @@
 	</div>
 </div>
 <?php if($module::$storeList): ?>
-	<?php echo template::table([4, 3, 4, 1], $module::$storeList, ['Module', 'Version', 'Date', 'Télécharger']); ?>
+	<?php echo template::table([4, 2, 2, 3, 1], $module::$storeList, ['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