From 3a00f1bb9908f78732c5d357536610df61716697 Mon Sep 17 00:00:00 2001
From: "remi.biette" <remi.biette98@outlook.fr>
Date: Sat, 25 May 2019 20:11:30 +0200
Subject: [PATCH] Ajout commentaires

---
 WEB/deposer_avis/deposer_avis.php |   3 +
 WEB/index.php                     |   1 +
 WEB/inscription/inscription.php   | 103 +++++++++++++++---------------
 WEB/profil/profil.php             |   4 +-
 WEB/recherche/recherche.js        |  14 ++--
 WEB/ressources/trajet.php         |   7 ++
 WEB/ressources/user.php           |   5 ++
 7 files changed, 75 insertions(+), 62 deletions(-)

diff --git a/WEB/deposer_avis/deposer_avis.php b/WEB/deposer_avis/deposer_avis.php
index f801959..b4a1647 100755
--- a/WEB/deposer_avis/deposer_avis.php
+++ b/WEB/deposer_avis/deposer_avis.php
@@ -1,5 +1,6 @@
 <?php
 
+//Verifier qu'un avis n'a pas déja été envoyer avec le compte $mail pour le trajet $codetrajet
 function checkAvis($db, $mail, $codetrajet)
 {
     $result = pg_query_params($db, "SELECT COUNT(*) FROM avis WHERE mailEmetteur = $1 AND codetrajet = $2;", array($mail, $codetrajet));
@@ -7,6 +8,7 @@ function checkAvis($db, $mail, $codetrajet)
     return $row[0] == 0;
 }
 
+//Verifier que le trajet à bien été fait par l'utilisateur $mail
 function checkCodeTrajetAvis($db, $mail, $codetrajet)
 {
     $result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE tr.codetrajet = $1 AND tr.codetrajet = re.codetrajet AND re.mailutilisateur = $2;", array($codetrajet, $mail));
@@ -30,6 +32,7 @@ if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['
     $note = $_POST['note'];
     $codetrajet = intval($_POST['codetrajet']);
     $date = date('Y-m-d H:i:s');
+    //Verifier que l'utilisateur a bien participé au trajet et qu'il n'en a pas déjà poster un
     if (checkAvis($db, $mail, $codetrajet) && checkCodeTrajetAvis($db, $mail, $codetrajet)) {
         $requete = "INSERT INTO avis (mailemetteur, codetrajet, commentaire, dateavis, note, estlu) VALUES ($1,$2,$3,$4,$5, false);";
         $envoi = pg_query_params($db, $requete, array($mail, $codetrajet, $avis, $date, $note));
diff --git a/WEB/index.php b/WEB/index.php
index d959a89..10d873e 100644
--- a/WEB/index.php
+++ b/WEB/index.php
@@ -8,6 +8,7 @@ if(!isset($_SESSION['mail'])){
 
         $mail = strtolower(htmlentities(pg_escape_string ($_POST['mail_field'])));
         $password = htmlentities(pg_escape_string($_POST['password']));
+        //Vérification des information d'authentification
         $result = authentification($db, $mail, $password);
         if($result) {
             $_SESSION['mail'] = $mail;
diff --git a/WEB/inscription/inscription.php b/WEB/inscription/inscription.php
index e431f2d..b691ba6 100644
--- a/WEB/inscription/inscription.php
+++ b/WEB/inscription/inscription.php
@@ -3,61 +3,60 @@ session_start();
 require_once('../connexionBD.php');
 require_once('../ressources/user.php');
 
-if (!isset($_SESSION['mail'])){
-  if (isset($_POST['login']) || isset($_FILES['avatar'])){
-    if (isset($_POST['login']) && isset($_POST['password']) && isset($_POST['confirmation']) && isset($_POST['prenom']) && isset($_POST['nom']) && isset($_POST['phone'])){
-      $login = htmlentities(pg_escape_string($_POST['login']));
-      $password = htmlentities(pg_escape_string($_POST['password']));
-      $prenom = htmlentities(pg_escape_string($_POST['prenom']));
-      $nom = htmlentities(pg_escape_string($_POST['nom']));
-      $dateN = htmlentities(pg_escape_string($_POST['dateN']));
-      $mail = strtolower(htmlentities(pg_escape_string($_POST['mail'])));
-      $phone = htmlentities(pg_escape_string($_POST['phone']));
+if (!isset($_SESSION['mail'])) {
+    if (isset($_POST['login']) || isset($_FILES['avatar'])) {
+        if (isset($_POST['login']) && isset($_POST['password']) && isset($_POST['confirmation']) && isset($_POST['prenom']) && isset($_POST['nom']) && isset($_POST['phone'])) {
+            $login = htmlentities(pg_escape_string($_POST['login']));
+            $password = htmlentities(pg_escape_string($_POST['password']));
+            $prenom = htmlentities(pg_escape_string($_POST['prenom']));
+            $nom = htmlentities(pg_escape_string($_POST['nom']));
+            $dateN = htmlentities(pg_escape_string($_POST['dateN']));
+            $mail = strtolower(htmlentities(pg_escape_string($_POST['mail'])));
+            $phone = htmlentities(pg_escape_string($_POST['phone']));
+            //Verifier que le format du mail est correct
+            if (!filter_var($mail, FILTER_VALIDATE_EMAIL)) {
+                header('Location: inscription.php?error=1');
+                exit();
+            } //Verifie qu'un compte n'a pas déjà été créé avec ce mail
+            elseif (!isMailUnique($db, $mail)) {
+                header('Location: inscription.php?error=2');
+                exit();
+            } //Verifie que le login entré est unique
+            elseif (!isLoginUnique($db, $login)) {
+                header('Location: inscription.php?error=3');
+                exit();
+            } else {
 
-      if (!filter_var($mail, FILTER_VALIDATE_EMAIL)){
-        header('Location: inscription.php?error=1');
-        exit();
-      }
-      elseif (!isMailUnique($db, $mail)){
-        header('Location: inscription.php?error=2');
-        exit();
-      }
-      elseif (!isLoginUnique($db, $login)){
-        header('Location: inscription.php?error=3');
-        exit();
-      }
-      else {
-        if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) {
-        $fic = $_FILES['avatar'];
-        $res = uploadAvatar($mail, $fic);
-        switch ($res){
-          case -1:
-          header('Location: inscription.php?error=4');
-          exit();
-          case -2:
-          header('Location: inscription.php?error=5');
-          exit();
-          case -3:
-          header('Location: inscription.php?error=6');
-          exit();
+                if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) {
+                    $fic = $_FILES['avatar'];
+                    //Charger l'avatar sur le serveur
+                    $res = uploadAvatar($mail, $fic);
+                    switch ($res) {
+                        case -1:
+                            header('Location: inscription.php?error=4');
+                            exit();
+                        case -2:
+                            header('Location: inscription.php?error=5');
+                            exit();
+                        case -3:
+                            header('Location: inscription.php?error=6');
+                            exit();
+                    }
+                }
+                $result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN);
+                if ($result) {
+                    header('Location: ../index.php');
+                    exit();
+                } else {
+                    header('Location: inscription.php?error=6');
+                    exit();
+                }
+            }
         }
-      }
-      $result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN);
-      if ($result) {
-        header('Location: ../index.php');
-        exit();
-      }
-      else{
-        header('Location: inscription.php?error=6');
-        exit();
-      }
     }
-  }
-}
-}
-else {
-  header('Location: ../tableauBord/tableauBord.php');
-  exit();
+} else {
+    header('Location: ../tableauBord/tableauBord.php');
+    exit();
 }
 ?>
 <!DOCTYPE html>
diff --git a/WEB/profil/profil.php b/WEB/profil/profil.php
index 0695e1b..39fd493 100644
--- a/WEB/profil/profil.php
+++ b/WEB/profil/profil.php
@@ -58,7 +58,7 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
         $prenom = htmlentities(pg_escape_string($_POST['prenom']));
         $nom = htmlentities(pg_escape_string($_POST['nom']));
         $phone = htmlentities(pg_escape_string($_POST['phone']));
-
+        //Si le login a change on le modifie
         if (loginChange($user, $login)) {
             if (!isLoginUniqueModifier($db, $mail, $login)) {
                 header('Location: profil.php?error=1');
@@ -75,7 +75,7 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
             header('Location: profil.php?error=2');
             exit();
         }
-
+        //Modifier l'utilisateur et afficher un message d'erreur si erreur
         if (!modifierUtilisateur($db, $mail, $prenom, $nom, $password, $phone)) {
             header('Location: profil.php?error=6');
             exit();
diff --git a/WEB/recherche/recherche.js b/WEB/recherche/recherche.js
index 5f47871..c0212ba 100644
--- a/WEB/recherche/recherche.js
+++ b/WEB/recherche/recherche.js
@@ -1,25 +1,23 @@
 $(document).ready(function () {
-    //copy options
+    //Copier les options
     let options = $('#villeDepart option').clone();
-    //react on keyup in textbox
     $('#villeDepartText').keyup(function () {
         let val = $(this).val().toString().toLowerCase();
         $('#villeDepart').empty();
-        //take only the options containing your filter text or all if empty
+        //Récuperer les option filtrées ou toutes les options si vide
         options.filter(function (idx, el) {
             return val === '' || $(el).text().toLowerCase().indexOf(val) >= 0;
-        }).appendTo('#villeDepart');//add it to list
+        }).appendTo('#villeDepart');//ajouter à la liste
     });
 
-    //copy options
+    //Copier les options
     let optionsArrive = $('#villeArrive option').clone();
-    //react on keyup in textbox
     $('#villeArriveText').keyup(function () {
         let val = $(this).val().toString().toLowerCase();
         $('#villeArrive').empty();
-        //take only the options containing your filter text or all if empty
+        //Récuperer les option filtrées ou toutes les options si vide
         optionsArrive.filter(function (idx, el) {
             return val === '' || $(el).text().toLowerCase().indexOf(val) >= 0;
-        }).appendTo('#villeArrive');//add it to list
+        }).appendTo('#villeArrive');//ajouter à la liste
     });
 });
\ No newline at end of file
diff --git a/WEB/ressources/trajet.php b/WEB/ressources/trajet.php
index 39d6e56..304cdb5 100644
--- a/WEB/ressources/trajet.php
+++ b/WEB/ressources/trajet.php
@@ -86,6 +86,7 @@ function checkVoiture($db, $mail, $matricule)
     return !strcmp($matricule, $row[0]);
 }
 
+//Recuperer le nombre de trajets restant proposés par l'utilisateur $mail
 function getTrajetsProposes($db, $mail)
 {
     $result = pg_query_params($db, "SELECT COUNT(*) from Trajet WHERE mailProposition = $1 AND estAnnule = false AND datedepart >= $2;", array($mail, date('Y-m-d H:i:s')));
@@ -96,6 +97,7 @@ function getTrajetsProposes($db, $mail)
     return 0;
 }
 
+//Recuperer le nombre de trajets restant reservés par l'utilisateur $mail
 function getTrajetsReserves($db, $mail)
 {
     $result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE re.codetrajet = tr.codetrajet AND mailutilisateur = $1 AND tr.estannule = false AND re.estannule = false AND tr.datedepart >= $2;", array($mail, date('Y-m-d H:i:s')));
@@ -156,6 +158,7 @@ function afficherVilles($db)
     }
 }
 
+//Récuperer la ville de départ du trajet $codetrajet
 function getDepart($db, $codetajet)
 {
     $result = pg_query_params($db, "SELECT * FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MIN(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet));
@@ -166,6 +169,7 @@ function getDepart($db, $codetajet)
     return $return;
 }
 
+//Récuperer la ville d'arrivée du trajet $codetrajet
 function getFin($db, $codetajet)
 {
     $result = pg_query_params($db, "SELECT * FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MAX(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet));
@@ -176,11 +180,13 @@ function getFin($db, $codetajet)
     return $return;
 }
 
+//Annuler le trajet $codetrajet
 function annulerTrajet($db, $codetrajet){
     $result = pg_query_params($db, "UPDATE Trajet SET estannule = true WHERE codetrajet = $1;", array($codetrajet));
     return $result;
 }
 
+//Annuler la reservation pour le tajet $codetrajet de l'utilisateur $mail
 function annulerReservation($db, $mail,$codetrajet){
     $result = pg_query_params($db, "DELETE FROM reserver WHERE codetrajet = $1 AND mailutilisateur = $2;", array($codetrajet, $mail));
     return $result;
@@ -200,6 +206,7 @@ function getErrorDepotTrajet($code)
     }
 }
 
+//Verifie l'existance d'un avis pour le trajet $codetrajet émit par l'utilisateur $mail
 function avisExiste($db, $mail, $codetrajet){
     $result = pg_query_params($db, "SELECT COUNT(*) FROM Avis WHERE mailemetteur = $1 AND codetrajet = $2;", array($mail, $codetrajet));
     if(!$result){
diff --git a/WEB/ressources/user.php b/WEB/ressources/user.php
index c7e6ebd..7522b4e 100644
--- a/WEB/ressources/user.php
+++ b/WEB/ressources/user.php
@@ -111,6 +111,7 @@ function getLogin($db, $mail)
 
 function getPathImgProfilTableau($mail)
 {
+    //Récuperer le fichier contenant $mail dans son nom
     $list = scandir("../imageProfil");
     foreach ($list as $entry) {
         if (strpos($entry, $mail) !== false) {
@@ -122,6 +123,7 @@ function getPathImgProfilTableau($mail)
 
 function getPathImgProfil($mail)
 {
+    //Récuperer le fichier contenant $mail dans son nom
     $list = scandir("../imageProfil");
     foreach ($list as $entry) {
         if (strpos($entry, $mail) !== false) {
@@ -133,6 +135,7 @@ function getPathImgProfil($mail)
 
 function supprimerAvatar($mail)
 {
+    //Supprimer le fichier contenant $mail dans son nom
     $list = scandir("../imageProfil");
     foreach ($list as $entry) {
         if (strpos($entry, $mail) !== false) {
@@ -188,6 +191,7 @@ function uploadAvatar($mail, $fic)
 
 function deluser($db, $delmail)
 {
+    //Remplacer le mail de l'utilisateur à supprimer par l'utilisateur utilisateur_supprime@local
     $requete = "UPDATE trajet SET mailproposition = $1 WHERE mailproposition = $2;";
     $result1 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail));
     $requete = "UPDATE reserver SET mailutilisateur = $1 WHERE mailutilisateur = $2;";
@@ -196,6 +200,7 @@ function deluser($db, $delmail)
     $result3 = pg_query_params($db, $requete, array($delmail));
     $requete = "UPDATE voiture SET mail = $1 WHERE mail = $2;";
     $result4 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail));
+    //Supprimer l'utilisateur $mail
     $requete = "DELETE FROM utilisateur WHERE mail = $1;";
     $result5 = pg_query_params($db, $requete, array($delmail));
     return $result1 && $result2 && $result3 && $result4 && $result5;