From 580fb250033ebcd3bdcf97a7c01b9ccd3b34862d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Bousqui=C3=A9?= <jerome@bousquie.fr>
Date: Tue, 4 Dec 2018 15:36:56 +0100
Subject: [PATCH] info ping sur formulaire machine

---
 admin/connexions.php |  6 ++++--
 admin/machine.php    | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/admin/connexions.php b/admin/connexions.php
index 4f0f11d..f2c751d 100644
--- a/admin/connexions.php
+++ b/admin/connexions.php
@@ -31,10 +31,12 @@ function Machines() {
     //$machines = array() ;
     $db = db_connect();
 
-    $req = 'SELECT machine_id, salle, os, os_sp, os_version, adresse_ip, marque, modele, type_systeme, mac, mac_description, ram, procSpeed, diskSize, freeSpace FROM machines ORDER BY salle, machine_id';
+    global $mode_ping;
+
+    $req = 'SELECT machines.machine_id, salle, os, os_sp, os_version, adresse_ip, marque, modele, type_systeme, mac, mac_description, ram, procSpeed, diskSize, freeSpace, ping_timestamp FROM machines LEFT OUTER JOIN ping ON machines.machine_id = ping.machine_id ORDER BY salle, machine_id';
     $res = db_query($db, $req);
     while ($mac = db_fetch_row($res)) {
-        $machines[$mac[0]] = array($mac[1], $mac[2], $mac[3], $mac[4], $mac[5], $mac[6], $mac[7], $mac[8], $mac[9], $mac[10], $mac[11], $mac[12], $mac[13], $mac[14]);
+        $machines[$mac[0]] = array($mac[1], $mac[2], $mac[3], $mac[4], $mac[5], $mac[6], $mac[7], $mac[8], $mac[9], $mac[10], $mac[11], $mac[12], $mac[13], $mac[14], $mac[15]);
         }
     db_free($res);
     return $machines;
diff --git a/admin/machine.php b/admin/machine.php
index be08ef7..202a1a7 100644
--- a/admin/machine.php
+++ b/admin/machine.php
@@ -37,6 +37,7 @@ $ram = $machine[10];
 $procSpeed = $machine[11];
 $diskSize = $machine[12];
 $freeSpace = $machine[13];
+$ping_timestamp = $machine[14];
 
 $mac_json = json_encode(array($mac_addr));
 
@@ -60,6 +61,19 @@ $mac_json = json_encode(array($mac_addr));
             sp : <?php echo($os_sp); ?><br/> 
             version <?php echo($os_version) ?>
         </td>
+        <td>
+        <?php 
+            if ($mode_ping) {
+                if (is_null($ping_timestamp)) {
+                    echo("Ping : indisponible<br/>");
+                }
+                else {
+                    echo("Dernier ping &nbsp;&nbsp;&nbsp;&nbsp;: $ping_timestamp<br/>");
+                    echo("Heure actuelle : " . date("Y-m-d H:i:s") ."<br/>");
+                }
+            }
+        ?>
+        </td>
     </tr>
     <tr class="materiel_ligne2">
          <td>