From a0f8f60ed29f08d63d4bc8c022a5c186366f3935 Mon Sep 17 00:00:00 2001
From: lwadbled <louis.wadbled@laposte.net>
Date: Fri, 7 Jan 2022 11:16:18 +0100
Subject: [PATCH] fix(): ajustements sur les redirections lors de mauvais accès+correction de la réservation de créneaux déjà passés

---
 html/ajoutAppareil.php      |  2 ++
 html/gestionAppareil.php    |  4 ++--
 html/gestionBanc.php        |  4 ++--
 html/gestionReservation.php |  4 ++--
 html/reservation.php        | 31 +++++++++++++++++++++++++++++++
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/html/ajoutAppareil.php b/html/ajoutAppareil.php
index dcc497f..c758ad9 100644
--- a/html/ajoutAppareil.php
+++ b/html/ajoutAppareil.php
@@ -18,6 +18,8 @@
 			if(isset($_SESSION['identifiant'])){
 				$login = $_SESSION['identifiant'];
 				echo "Vous etes : $login <br>";
+			}else{
+				echo "<meta http-equiv=\"refresh\" content=\"0;url=index.html\">";
 			}
 			include("connexion.php");
 			if(isset($_POST['banc']) && isset($_POST['ip']) && isset($_POST['name']) && isset($_POST['type'])){
diff --git a/html/gestionAppareil.php b/html/gestionAppareil.php
index 83f1337..1ff176f 100644
--- a/html/gestionAppareil.php
+++ b/html/gestionAppareil.php
@@ -18,10 +18,10 @@
 		</form>
 		<?php
 			session_start();
-			if(isset($_SESSION['identifiant'])=="admin"){
+			if(isset($_SESSION['identifiant']) && $_SESSION['identifiant']=="admin"){
 				$identifiant = $_SESSION['identifiant'];
 			}else{
-				echo "<meta http-equiv=\"refresh\" content=\"0;url=index.html\">";
+				echo "<meta http-equiv=\"refresh\" content=\"0;url=menu.php\">";
 			}
 			include("connexion.php");
 			$requete = "SELECT * FROM equipement";
diff --git a/html/gestionBanc.php b/html/gestionBanc.php
index bee0d2e..891f75a 100644
--- a/html/gestionBanc.php
+++ b/html/gestionBanc.php
@@ -18,10 +18,10 @@
 		</form>
 		<?php
 			session_start();
-			if(isset($_SESSION['identifiant'])=="admin"){
+			if(isset($_SESSION['identifiant']) && $_SESSION['identifiant']=="admin"){
 				$identifiant = $_SESSION['identifiant'];
 			}else{
-				echo "<meta http-equiv=\"refresh\" content=\"0;url=index.html\">";
+				echo "<meta http-equiv=\"refresh\" content=\"0;url=menu.php\">";
 			}
 			include("connexion.php");
 			$requete = "SELECT * FROM banc";
diff --git a/html/gestionReservation.php b/html/gestionReservation.php
index 8b1ca66..ae3aff1 100644
--- a/html/gestionReservation.php
+++ b/html/gestionReservation.php
@@ -18,10 +18,10 @@
 		</form>
 		<?php
 			session_start();
-			if(isset($_SESSION['identifiant'])){
+			if(isset($_SESSION['identifiant']) && $_SESSION['identifiant']=="admin"){
 				$identifiant = $_SESSION['identifiant'];
 			}else{
-				echo "<meta http-equiv=\"refresh\" content=\"0;url=index.html\">";
+				echo "<meta http-equiv=\"refresh\" content=\"0;url=menu.php\">";
 			}
 			include("connexion.php");
 			$requete = "SELECT * FROM banc ORDER BY numero";
diff --git a/html/reservation.php b/html/reservation.php
index 988aa8e..8d39ac7 100644
--- a/html/reservation.php
+++ b/html/reservation.php
@@ -133,6 +133,36 @@
 				var xhttp = new XMLHttpRequest();
 				var params = "date="+realDate+"&banc="+realBanc;
 				console.log(params);
+				/* Enleve les creneaux deja passes dans la journee pour ne plus pouvoir les reserver */ 
+				var horaire = new Date();
+				var mois = parseInt(horaire.getMonth())+1;
+				if(mois<10){
+					var nouvMois = "0"+mois;
+				}else{
+					var nouvMois = mois;
+				}
+				var jour = horaire.getDate();
+				if(jour<10){
+					var nouvJour = "0"+jour;
+				}else{
+					var nouvJour = jour;
+				}
+				var laDate = nouvJour+"/"+nouvMois+"/"+horaire.getFullYear();
+				console.log(laDate);
+				console.log(realDate);
+				if(laDate==realDate){
+					var heure = horaire.getHours();
+						for(var i=0;i<parseInt(heure);i++){
+						var chgt = document.getElementById(i);
+						chgt.disabled=true;
+						console.log(chgt.value);
+						chgt.color="red";
+					}
+					var chgt = document.getElementById(heure);
+					chgt.selected=true;
+					calcul_fin();
+				}
+				/* */
 				xhttp.onreadystatechange=function(){
 					if(xhttp.readyState==4){
 						// Si requete faite, on modifie les horaires non dispo
@@ -158,6 +188,7 @@
 						}
 					}
 				}
+				
 				xhttp.open('POST','dispoCreneau.php',true);
 				xhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
 				xhttp.send(params);
--
libgit2 0.21.2