From 34837f0f8018bb91bc994fa55d0049eedbe6d555 Mon Sep 17 00:00:00 2001
From: grouille <guillaume.rouille@polytech-lille.net>
Date: Mon, 27 Apr 2020 14:20:50 +0200
Subject: [PATCH] MAJ

---
 site/remove.php    | 33 ++++++++++++++++++++++++++++-----
 site/removeRpi.php | 32 ++++++++++++++++++++++++++++----
 site/stop.php      | 37 +++++++++++++++++++++++++++++++++++--
 3 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/site/remove.php b/site/remove.php
index a5aa83b..1644082 100644
--- a/site/remove.php
+++ b/site/remove.php
@@ -46,13 +46,36 @@ session_start();
 						$ini = $ini.$raspberry." capteur=".$numero."-".$version." setup=0\n";
 						file_put_contents('upload/inventaire.ini', $ini);
 
-						//exec("super cmd.sh");
+						/*$retour = array();
+						$statut;
+						exec("super cmd.sh", $retour, $statut);
+
+						if($statut == 0)
+						{
+							$message = "Le capteur a bien été supprimé !";
+							$color = "alert-success";
+						}
+						else
+						{
+							$ansible = "Code retour : ".$statut."<br/>";
+							$message = "Echec lors de la suppression !";
+							$color = "alert-danger";
+						}
+
+						$size = count($retour);
+						for($i = 0; $i<$size; $i++)
+						{
+							$ansible = $ansible.$retour[$i]."<br/>";
+						}
+
 						?>
-						<div class="alert alert-success" role="alert">
-					     		Le capteur a bien été supprimé !
+						<div class="alert <?php echo $color;?>" role="alert">
+							<?php echo $message;?>
 						</div>
-						<meta http-equiv="Refresh" content="3;url=accueil.php" />
-						<?php
+						<div class="alert alert-secondary" role="alert">
+							<?php echo $ansible;?>
+						</div>
+						<?php*/
 					}
 					else
 					{
diff --git a/site/removeRpi.php b/site/removeRpi.php
index 031d835..abe723d 100644
--- a/site/removeRpi.php
+++ b/site/removeRpi.php
@@ -60,12 +60,36 @@ session_start();
 					if(removeRpi($_POST['ip']))
 					{
 						file_put_contents('upload/inventaire.ini', $ini);
-						//exec("super cmd.sh");
+						/*$retour = array();
+						$statut;
+						exec("super cmd.sh", $retour, $statut);
+
+						if($statut == 0)
+						{
+							$message = "Le Raspberry Pi a bien été supprimé !";
+							$color = "alert-success";
+						}
+						else
+						{
+							$ansible = "Code retour : ".$statut."<br/>";
+							$message = "Echec lors de la suppression !";
+							$color = "alert-danger";
+						}
+
+						$size = count($retour);
+						for($i = 0; $i<$size; $i++)
+						{
+							$ansible = $ansible.$retour[$i]."<br/>";
+						}
+
 						?>
-						<div class="alert alert-success" role="alert">
-					     		La Raspberry a bien été supprimée !
+						<div class="alert <?php echo $color;?>" role="alert">
+							<?php echo $message;?>
 						</div>
-						<?php
+						<div class="alert alert-secondary" role="alert">
+							<?php echo $ansible;?>
+						</div>
+						<?php*/
 					}
 					else
 					{
diff --git a/site/stop.php b/site/stop.php
index 41bc2a9..b850a1d 100644
--- a/site/stop.php
+++ b/site/stop.php
@@ -1,5 +1,6 @@
 <?php
 require_once("accesBase.php");
+include("date.php");
 
 $arduino_simple = "[Arduino_stop]\r\n";
 $arduino_spi = "[Arduino_stop]\r\n";
@@ -25,6 +26,38 @@ $raspberry = getRaspberry($_POST['nom']);
 $ini = $ini.$raspberry." capteur=".$numero."-".$version." setup=0\n";
 file_put_contents('upload/inventaire.ini', $ini);
 
-//exec("super cmd.sh");
-header("Location: data.php");
+/*
+$retour = array();
+$statut;
+exec("super cmd.sh", $retour, $statut);
+
+if($statut == 0)
+{
+	$message = "Le capteur a bien été arrêté !";
+	$color = "alert-success";
+}
+else
+{
+	$ansible = "Code retour : ".$statut."<br/>";
+	$message = "Echec lors de l'arrêt !";
+	$color = "alert-danger";
+}
+
+$size = count($retour);
+for($i = 0; $i<$size; $i++)
+{
+	$ansible = $ansible.$retour[$i]."<br/>";
+}
+
+?>
+<div class="alert <?php echo $color;?>" role="alert">
+	<?php echo $message;?>
+</div>
+<div class="alert alert-secondary" role="alert">
+	<?php echo $ansible;?>
+</div>
+
+<?php
+*/
+//header("Location: data.php");
 ?>
--
libgit2 0.21.2