From fdbe5d57fdd00daee72c65841392f574494a2673 Mon Sep 17 00:00:00 2001
From: jfontaine35 <76435797+jfontaine35@users.noreply.github.com>
Date: Tue, 25 Feb 2025 14:46:54 +0100
Subject: [PATCH] Update diag.sh

---
 diag.sh | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/diag.sh b/diag.sh
index d954411..81ad81d 100644
--- a/diag.sh
+++ b/diag.sh
@@ -12,7 +12,6 @@ ADMIN_USER="Administrator"
 SERVER_NAME=$(hostname)
 NTP_SERVER="pool.ntp.org"
 
-
 # Ports requis pour Samba AD
 REQUIRED_PORTS=(
     53    # DNS
@@ -243,40 +242,35 @@ check_time_sync() {
     # Vérifier si ntpd ou chronyd est installé
     if ! command -v ntpstat &> /dev/null && ! command -v chronyc &> /dev/null; then
         time_checks+=("<tr style='background-color: $COLOR_RED;'><td>Service NTP</td><td>Non installé</td></tr>")
+        echo "${time_checks[@]}"
         return
     fi
 
     # Vérifier la synchronisation avec chronyd
     if command -v chronyc &> /dev/null; then
         if chronyc tracking | grep -q "^Leap status.*Normal"; then
-            local offset=$(chronyc tracking | grep "Last offset" | awk '{print $4}')
-           if [ "$(echo "$offset < 1.0" | bc -l)" -eq 1 ]; then
-                time_checks+=("<tr style='background-color: $COLOR_GREEN;'><td>Synchronisation NTP (chronyd)</td><td>Synchronisé (offset: ${offset}s)</td></tr>")
+            # Extraire l'offset et supprimer le signe "+"
+            local offset=$(chronyc tracking | awk '/Last offset/ {print $4}' | sed 's/^+//')
+
+            # Vérifier si l'offset est bien un nombre avant d'utiliser bc
+            if [[ "$offset" =~ ^-?[0-9]+(\.[0-9]+)?$ ]]; then
+                if (( $(echo "$offset < 1.0" | bc -l) )); then
+                    time_checks+=("<tr style='background-color: $COLOR_GREEN;'><td>Synchronisation NTP (chronyd)</td><td>Synchronisé (offset: ${offset}s)</td></tr>")
+                else
+                    time_checks+=("<tr style='background-color: $COLOR_YELLOW;'><td>Synchronisation NTP (chronyd)</td><td>Offset important: ${offset}s</td></tr>")
+                fi
             else
-                time_checks+=("<tr style='background-color: $COLOR_YELLOW;'><td>Synchronisation NTP (chronyd)</td><td>Offset important: ${offset}s</td></tr>")
+                time_checks+=("<tr style='background-color: $COLOR_RED;'><td>Synchronisation NTP (chronyd)</td><td>Erreur: Offset invalide (${offset})</td></tr>")
             fi
         else
             time_checks+=("<tr style='background-color: $COLOR_RED;'><td>Synchronisation NTP (chronyd)</td><td>Non synchronisé</td></tr>")
         fi
     fi
 
-    # Vérifier la synchronisation avec ntpd
-    if command -v ntpq &> /dev/null; then
-        if ntpq -p &> /dev/null; then
-            local offset=$(ntpq -c rv | grep offset | cut -d= -f2)
-            if [ "$(echo "$offset < 1.0" | bc -l)" -eq 1 ]; then
-                time_checks+=("<tr style='background-color: $COLOR_GREEN;'><td>Synchronisation NTP (ntpd)</td><td>Synchronisé (offset: ${offset}ms)</td></tr>")
-            else
-                time_checks+=("<tr style='background-color: $COLOR_YELLOW;'><td>Synchronisation NTP (ntpd)</td><td>Offset important: ${offset}ms</td></tr>")
-            fi
-        else
-            time_checks+=("<tr style='background-color: $COLOR_RED;'><td>Synchronisation NTP (ntpd)</td><td>Non synchronisé</td></tr>")
-        fi
-    fi
-
     echo "${time_checks[@]}"
 }
 
+
 # Vérification des ports UFW
 check_ufw_ports() {
     local ufw_checks=()