diff --git a/registry/scripts/registry.sh b/registry/scripts/registry.sh index ce2f0dea9e38f8211b268b169bfcb5759aaa385b..725cf1e45f3cecfd38e0eab803e8928e14afab3f 100755 --- a/registry/scripts/registry.sh +++ b/registry/scripts/registry.sh @@ -46,12 +46,12 @@ do then date=$(date +%Y%m%d) rIP=$(echo $line | cut -d ' ' -f 3) - line=$(echo $line | cut -d ' ' -f 1-2) - res=$(grep "$line" $conf_file) + sline=$(echo $line | cut -d ' ' -f 1-2) + res=$(grep "$sline" $conf_file) if [ ! -z "$res" ] then # Update - sed -i -e "s/^.*$line$/$date $line/" $conf_file + sed -i -e "s/^.*$sline$/$date $line/" $conf_file else # Add echo "$date $line" >> $conf_file diff --git a/wol/www/index.php b/wol/www/index.php index 2597973b4981d709489f868631f7ef89c6bc0e58..ef085d5a6d523b0efd17d5340ed07b8ce27b2b7e 100644 --- a/wol/www/index.php +++ b/wol/www/index.php @@ -35,7 +35,22 @@ extract($_POST); if(!isset($action)){ $lines=explode(PHP_EOL, shell_exec("../scripts/get_registry.sh")); ?> - <p> <?php echo count($lines); ?> postes sont inscrits sur ce serveur </p> + <p> + <?php + $n=count($lines); + if(empty($lines)){ + echo "Impossible de récupérer le registre"; + ob_start(); + shell_exec("../scripts/get_registry.sh"); + $lines=ob_get_clean(); + echo "$lines"; + }else if ($n == 1){ + echo "$n poste est enregistré sur ce serveur"; + }else{ + echo "$n postes sont enregistrés sur ce serveur"; + } +?> + </p> <h2> Actions globables </h2> <form action="index.php" method="post"> <input type="hidden" name="action" value="upgradeAll">