From a33f9ac26256ae06b2af59082d6b6ade4cc25f38 Mon Sep 17 00:00:00 2001
From: root <root@projets>
Date: Wed, 18 Mar 2020 10:39:27 +0000
Subject: [PATCH] MAJ connexion site

---
 site/connecter.php         | 61 +++++++++++++++++++++++++++++--------------------------------
 site/upload/inventaire.ini |  5 +----
 2 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/site/connecter.php b/site/connecter.php
index 37669c9..c131722 100644
--- a/site/connecter.php
+++ b/site/connecter.php
@@ -1,6 +1,17 @@
 <?php 
 session_start();
 require("accesBase.php") ;
+
+if(verifPwd($_POST["id"], $_POST["pwd"]))
+{
+	$_SESSION['Login'] = $_POST['id'];
+	$_SESSION['Password'] = $_POST['pwd'];
+	$connect = true;
+}
+else
+{
+	$connect = false;
+}
 ?>
 
 <!DOCTYPE html>
@@ -15,41 +26,27 @@ require("accesBase.php") ;
 		<?php include("header.php"); ?>
 
 		<!-- Centre de la page -->
-		<div class="container-fluid">
-			<div class="row">
 
-				<!-- Contenu de la page -->
-					<!-- Connexion -->
-					<div class="row syst">
-						<div class="connect">
-							<?php
-							if (verifPwd($_POST["id"], $_POST["pwd"])){
-								$_SESSION['Login'] = $_POST['id'];
-								$_SESSION['Password'] = $_POST['pwd'];
-								?><meta http-equiv="Refresh" content="0;url=accueil.php" /><?php
-							}
-							else
-							{
-								?>
-								<div class="row">
-								     <div class="col-4 col-md-4 offset-4 offset-md-4">
-								     	  <br/>
-								     	  <div class="alert <?php echo $color;?>" role="alert">
-								     	       Identifiant ou mot de passe incorrect !
-			 					     	  </div>
-								     </div>
-								</div>
-								<meta http-equiv="Refresh" content="5;url=accueil.php" />
-								<?php
-							}
-							?>
-						</div>
-					</div>
-					<!-- fin connexion -->
+		<?php
+		if($connect)
+		{
+			?><meta http-equiv="Refresh" content="0;url=accueil.php" /><?php
+		}
+		else
+		{
+		?>
+		<div class="row">
+			<div class="col-4 col-md-4 offset-4 offset-md-4">
+				<br/>
+				<div class="alert alert-danger" role="alert">
+					Identifiant ou mot de passe incorrect !
 				</div>
-				<!-- fin contenu de la page -->
 			</div>
 		</div>
-		<!-- fin centre de la page -->
+		<!-- <meta http-equiv="Refresh" content="5;url=accueil.php" /> -->
+		<?php
+			include("formConnexion.php");
+		}
+		?>
 	</body>
 </html>
diff --git a/site/upload/inventaire.ini b/site/upload/inventaire.ini
index dd2a1ca..3c5bb1f 100644
--- a/site/upload/inventaire.ini
+++ b/site/upload/inventaire.ini
@@ -1,6 +1,3 @@
 [Arduino]
-172.26.145.112 capteur=1-0
-
-[Arduino_spi]
-172.26.145.111 capteur=1-1
+172.26.145.111 capteur=2-0
 
--
libgit2 0.21.2

