From 6565e6592d0bc4e89e5872c32ce8e5da320a90e8 Mon Sep 17 00:00:00 2001
From: Mysaa <mysaa@myssian.home>
Date: Tue, 12 Oct 2021 11:55:15 +0200
Subject: [PATCH] (petite) restructuration de la bdd.

---
 .gitignore     |  2 +-
 api/salles.php | 40 ++++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e94829..4db36b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 svg-pan-zoom.min.js
 tinycolor-min.js
 
-bddpass.php
+api/dbinit.php
diff --git a/api/salles.php b/api/salles.php
index 8ab2dfd..9faaed2 100644
--- a/api/salles.php
+++ b/api/salles.php
@@ -1,18 +1,13 @@
 <?php
 
-// Connection à la BDD:
+// Active les erreurs PHP.
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 error_reporting(E_ALL);
 
-include 'bddpass.php';
-try {
-  $conn = new PDO("mysql:host=localhost;dbname=savrillo", "savrillo", $bddpass, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-  // set the PDO error mode to exception
-  $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-} catch(PDOException $e) {
-  echo "Connection failed: " . $e->getMessage();
-}
+// Se connecte à la BDD (identifiants cachés)
+include 'dbinit.php';
+
 
 
 if(isset($_GET["salle"])) {
@@ -28,9 +23,18 @@ if(isset($_GET["salle"])) {
 	for($i=0;$i<count($resA);$i++)
 		$aliaz[$i] = $resA[$i]['nom'];
 	
+	$fichiers = array();
+	
+	$stmt = $conn->prepare("SELECT fichier FROM salleFichier WHERE salleID=?");
+	$stmt->execute([$idSalle]);
+	$resF = $stmt->fetchAll();
+	
+	for($i=0;$i<count($resF);$i++)
+		$fichiers[$i] = $resF[$i]['fichier'];
+	
 	$locataires = array();
 	
-	$stmt = $conn->prepare("SELECT personne FROM locataires WHERE salle=?");
+	$stmt = $conn->prepare("SELECT personne FROM locataires WHERE salleID=?");
 	$stmt->execute([$idSalle]);
 	$resP = $stmt->fetchAll();
 	
@@ -38,7 +42,7 @@ if(isset($_GET["salle"])) {
 		$locataires[$i] = $resP[$i]['personne'];
 	
 	
-	$stmt = $conn->prepare("SELECT id, nom, description FROM salles WHERE id=?");
+	$stmt = $conn->prepare("SELECT id, description FROM salles WHERE id=?");
 	$stmt->execute([$idSalle]);
 	$resS = $stmt->fetchAll();
 	
@@ -46,7 +50,7 @@ if(isset($_GET["salle"])) {
 	if(count($resS)==0){
 		echo "404";
 	}else {
-		$out = array("id" => $resS[0]["id"], "nom" => $resS[0]["nom"], "description" => $resS[0]["description"], "aliaz" => $aliaz, "locataires" => $locataires);
+		$out = array("id" => $resS[0]["id"], "description" => $resS[0]["description"], "aliaz" => $aliaz, "locataires" => $locataires, "fichiers" => $fichiers);
 		echo (json_encode($out));
 	}
 	
@@ -54,14 +58,14 @@ if(isset($_GET["salle"])) {
 	
 	$salleNameSearch = $_GET["salleNameSearch"];
 	
-	$stmt = $conn->prepare("(SELECT id, nom FROM `salles`  WHERE MATCH nom AGAINST (? IN BOOLEAN MODE)) UNION (SELECT salleID, nom FROM salleAlias  WHERE MATCH nom AGAINST (? IN BOOLEAN MODE))");
-	$stmt->execute([$salleNameSearch, $salleNameSearch]);
+	$stmt = $conn->prepare("SELECT salleID, nom FROM salleAlias  WHERE MATCH nom AGAINST (? IN BOOLEAN MODE)");
+	$stmt->execute([$salleNameSearch]);
 	$res = $stmt->fetchAll();
 	
 	$out = array();
 	
 	for($i=0;$i<count($res);$i++)
-		$out[$i] = array("id" => $res[$i]['id'], "nom" => $res[$i]["nom"]);
+		$out[$i] = array("salleID" => $res[$i]['salleID'], "nom" => $res[$i]["nom"]);
 	
 	echo (json_encode($out));
 	
@@ -69,17 +73,17 @@ if(isset($_GET["salle"])) {
 
 	$salleLocSearch = $_GET["salleLocSearch"];
 	
-	$stmt = $conn->prepare("SELECT salle, personne FROM `locataires` WHERE MATCH personne AGAINST (? IN BOOLEAN MODE)");
+	$stmt = $conn->prepare("SELECT salleID, personne FROM `locataires` WHERE MATCH personne AGAINST (? IN BOOLEAN MODE)");
 	$stmt->execute([$salleLocSearch]);
 	$res = $stmt->fetchAll();
 	
 	$out = array();
 	
 	for($i=0;$i<count($res);$i++)
-		$out[$i] = array("salle" => $res[$i]['salle'], "personne" => $res[$i]["personne"]);
+		$out[$i] = array("salleID" => $res[$i]['salleID'], "personne" => $res[$i]["personne"]);
 	
 	echo (json_encode($out));
-
+	
 }else {
 	echo "Je ne connais pas cette commande ...";
 }