From dc70015ccd988338b7926529a5715ced6d5a39fc Mon Sep 17 00:00:00 2001
From: grouille <guillaume.rouille@polytech-lille.net>
Date: Mon, 20 Apr 2020 19:28:12 +0200
Subject: [PATCH] Correction site

---
 site/accesBase.php | 42 ++++++------------------------------------
 site/add.php       |  2 +-
 site/addSensor.php |  5 -----
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/site/accesBase.php b/site/accesBase.php
index e78f8db..7e9577d 100644
--- a/site/accesBase.php
+++ b/site/accesBase.php
@@ -111,23 +111,6 @@
 		$tab = pg_fetch_all($result);
 		return $tab;
 	}
-	
-	/*function upload($index,$maxsize=FALSE,$extensions=FALSE)
-	{
-		//Test1: fichier correctement uploadé
-		if (!isset($_FILES[$index]) OR $_FILES[$index]['error'] > 0) return FALSE;
-		//Test2: taille limite
-		if ($maxsize !== FALSE AND $_FILES[$index]['size'] > $maxsize) return FALSE;
-		//Test3: extension
-		$ext = substr(strrchr($_FILES[$index]['name'],'.'),1);
-		if ($extensions !== FALSE AND !in_array($ext,$extensions)) return FALSE;
-		$name = "main";
-		$extension_upload = strtolower(  substr(  strrchr($_FILES['fichier']['name'], '.')  ,1)  );
-		$dossier = "upload/";
-		$fichier = $name.".".$extension_upload;
-		//$fichier = basename($_FILES[$index]['name']);
-		return move_uploaded_file($_FILES['fichier']['tmp_name'],$dossier.$fichier);
-	}*/
 
 	function load($tmp_name, $name)
 	{
@@ -144,24 +127,6 @@
 		return False;
 	}
 
-	function update_values()
-	{
-		$rep = 'data';
-		$fichiers = array_diff(scandir($rep), array('..', '.'));
-		$db = connexion();
-		foreach($fichiers as $fichier) {
-			$parametres = simplexml_load_file('data/'.$fichier);
-			list($ip_address) = $parametres->xpath("parametre[@name='ip_address']");
-			list($numero) = $parametres->xpath("parametre[@name='numero']");
-			list($name) = $parametres->xpath("parametre[@name='name']");
-       	        	list($data) = $parametres->xpath("parametre[@name='data']");
-
-			$query = "UPDATE capteurs SET value='$data' WHERE raspberry='$ip_address' and  numero='$numero' and nom='$name'";
-			$result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
-		}
-		deconnexion($db);
-	}
-
 	function update_bdd($ip_address, $numero, $data, $date)
 	{
 		$name = getSensorName($ip_address, $numero);
@@ -287,9 +252,14 @@
 		}
 	}
 
-	function add($nom, $type, $raspberry, $numero, $unite, $version)
+	function add($nom, $type, $raspberry, $unite, $version)
 	{
 		$db = connexion();
+		$query = "SELECT MAX(numero) as numero FROM capteurs WHERE raspberry = '$raspberry'";
+		$result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
+		$tab = pg_fetch_assoc($result);
+		$numero = $tab['numero'] +1;
+		if($numero > 4) return False;
 		$query = "SELECT * FROM capteurs WHERE nom = '$nom' OR (raspberry = '$raspberry' AND numero = '$numero')";
 		$result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
 		if (pg_affected_rows($result)!=0){
diff --git a/site/add.php b/site/add.php
index 3abf74e..ad513bc 100644
--- a/site/add.php
+++ b/site/add.php
@@ -20,7 +20,7 @@ session_start();
                 			<br/>
                 			<h1 style="margin-bottom:20px; margin-top:70px; border-bottom:1px solid #CCC; padding-bottom:20px;"><i class="fas fa-history"></i> Historique</h1>
 					<?php
-						if(add($_POST['nom'], $_POST['type'], $_POST['raspberry'], $_POST['numero'], $_POST['unite'], $_POST['version']))
+					if(add($_POST['nom'], $_POST['type'], $_POST['raspberry'], $_POST['unite'], $_POST['version']))
 					{
 						$arduino_simple = "[Arduino_init]\r\n";
 						$arduino_spi = "[Arduino_spi_init]\r\n";
diff --git a/site/addSensor.php b/site/addSensor.php
index ec89e2d..bf78f8e 100644
--- a/site/addSensor.php
+++ b/site/addSensor.php
@@ -34,11 +34,6 @@ $raspberrys = getRaspberrys();
 					</tr>
 
 					<tr>
-						<td><label for="numero">Numéro du capteur : </label></td>
-						<td><input type="text" id="numero" name="numero" /></td>
-					</tr>
-
-					<tr>
 						<td><label for="unite">Unite de mesure : </label></td>
 						<td><input type="text" id="unite" name="unite" /></td>
 					</tr>
--
libgit2 0.21.2