From b2a73203ed49db90fc3ab2b3df35a6c4410962e3 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Tue, 8 Aug 2023 20:55:42 +0200
Subject: [PATCH] Introduit le tableau de bord sans le publier

---
 core/module/dashboard/dashboard.php        | 15 +++++
 core/module/dashboard/view/index/index.php | 78 +++++++++++-----------
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/core/module/dashboard/dashboard.php b/core/module/dashboard/dashboard.php
index dd2bd27a..e2f4e6a9 100644
--- a/core/module/dashboard/dashboard.php
+++ b/core/module/dashboard/dashboard.php
@@ -20,11 +20,26 @@ class dashboard extends common
         'index' => self::GROUP_ADMIN,
     ];
 
+
+
+    public static $infos = [];
+
     /**
      * Dashboard
      */
     public function index()
     {
+
+        self::$infos['webserver'] = $_SERVER['SERVER_SOFTWARE'];
+        self::$infos['php']['version'] =  phpversion();
+        self::$infos['php']['extension'] = get_loaded_extensions();
+
+        self::$infos['system']['memory'] = memory_get_usage() . ' octets';
+        self::$infos['system']['peek'] 	= 'Pic de mémoire utilisée : ' . memory_get_peak_usage() . ' octets';
+
+        $loadAverage = sys_getloadavg();
+        self::$infos['system']['charge'] =  'Charge moyenne (1 min / 5 min / 15 min) : ' . implode(' / ', $loadAverage) . '</P>';
+
         // Valeurs en sortie
 		$this->addOutput([
 			'title' => helper::translate('Tableau de bord'),
diff --git a/core/module/dashboard/view/index/index.php b/core/module/dashboard/view/index/index.php
index 8d092987..cd2b8e52 100644
--- a/core/module/dashboard/view/index/index.php
+++ b/core/module/dashboard/view/index/index.php
@@ -10,45 +10,45 @@
 </div>
 <div class="row">
 	<div class="col12">
-		<?php echo 'Version de PHP : ' . phpversion(); ?>
-		<?php
-		$extensions = get_loaded_extensions();
-
-		echo '<p>Extensions activées :</p>';
-		foreach ($extensions as $extension) {
-			echo $extension . ' - ';
-		}
-		?>
-		<?php
-		$serverSoftware = $_SERVER['SERVER_SOFTWARE'];
-		echo '<p>';
-		if (stripos($serverSoftware, 'apache') !== false) {
-			echo 'Serveur web : Apache';
-		} elseif (stripos($serverSoftware, 'nginx') !== false) {
-			echo 'Serveur web : Nginx';
-		} elseif (stripos($serverSoftware, 'tomcat') !== false) {
-			echo 'Serveur web : Tomcat';
-		} else {
-			echo 'Serveur web non identifié : ' . $serverSoftware;
-
-		}
-		echo '</p>';
-		?>
-
-		<?php
-		echo 'Mémoire utilisée : ' . memory_get_usage() . ' octets</p>';
-		echo 'Pic de mémoire utilisée : ' . memory_get_peak_usage() . ' octets</p>';
-		?>
-
-		<?php
-		$loadAverage = sys_getloadavg();
-		echo 'Charge moyenne (1 min / 5 min / 15 min) : ' . implode(' / ', $loadAverage) . '</P>';
-		?>
-
-		<?php
-		$diskSpace = shell_exec('df -h'); // Linux example
-		echo 'Espace disque :</p>' . $diskSpace;
-		?>
+		<div class="block">
+			<h4>
+				<?php echo helper::translate('Système'); ?>
+			</h4>
+			<div class="row">
+				<div class="col6">
+					<p>
+						<?php echo helper::translate('Serveur Web'); ?>
+					</p>
+					<p>
+						<?php echo $module::$infos['webserver']; ?>
+					</p>
+				</div>
+				<div class="col6">
+					<p>
+						<?php echo helper::translate('PHP') . ' ' . $module::$infos['php']['version']; ?>
+					</p>
+					<p>
+						<?php echo implode(' - ', $module::$infos['php']['extension']); ?>
+					</p>
+				</div>
+			</div>
 
+			<div class="row">
+				<div class="col12">
+					<p>
+						<?php echo helper::translate('Mémoire'); ?>
+					</p>
+					<p>
+						<?php echo $module::$infos['system']['memory']; ?>
+					</p>
+					<p>
+						<?php echo $module::$infos['system']['charge']; ?>
+					</p>
+					<p>
+						<?php echo $module::$infos['system']['peek']; ?>
+					</p>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>
\ No newline at end of file