Mise à jour avec branche bandeau

6 years ago · 3ac061f06f
parent eda70327ac 17aba86405
commit 3ac061f06f
24 changed files with 370 additions and 404 deletions
--- a/WEB/Recherche.php
+++ b/WEB/Recherche.php
@ -1,53 +1,18 @@
 <!DOCTYPE html>
-
 <html>
-
 <head>
-	
  <meta charset="utf-8"/>
  <link rel="stylesheet" href="Recherche.css"/>
-        
-		
 </head>
-
-
 <body>
-
  <div class="global bord">
-
    <p class="fort">Rechercher un trajet</p>
-
    <form method="post" action="Liste.php">
-
-	       <p>
-	
-	          <input name="lieu_depart" type="text" placeholder="Lieu de départ" class="centrage">
-	
-	        </p>
-	
-	        <p>
-	
-	          <input name="lieu_arrivée" type="text" placeholder="Lieu d'arrivée" class="centrage" >
-	
-	        </p>
-	
-	        <p>
-	
-	          <input name="date_heure" type="text" placeholder="Date et heure de départ" class="centrage" >
-	
-	        </p>
-	
-	
-	        <p>
-			
-	          <input name="submit" type="submit" value="Rechercher" class="centrage">
-			  
-	        </p>
-	
+      <p><input name="lieu_depart" type="text" placeholder="Lieu de départ" class="centrage"></p>
+      <p><input name="lieu_arrivée" type="text" placeholder="Lieu d'arrivée" class="centrage"></p>
+      <p><input name="date_heure" type="text" placeholder="Date et heure de départ" class="centrage"></p>
+      <p><input name="submit" type="submit" value="Rechercher" class="centrage"></p>
    </form>
-
  </div>
-	   
 </body>
-	
 </html>
--- a/WEB/connexionBD.php
+++ b/WEB/connexionBD.php
@ -0,0 +1,7 @@
+<?php
+
+    $host = "localhost";
+    $dbname = "projet";
+    $user = "utilisateur";
+    $pass = "-stri-";
+    $db = pg_connect("host=$host port=5432 dbname=$dbname user=$user password=$pass") or die("Erreur lors de la connexion à la base de données.");
--- a/WEB/deconnexion.php
+++ b/WEB/deconnexion.php
@ -1,21 +1,11 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: REMI
- * Date: 19/04/2019
- * Time: 10:10
- */

-require 'connectionBD.php';
-$db = connexionBD();
-init();
+require_once ('connexionBD.php');

-function init(){
 session_start();
+
 if (isset($_SESSION['mail'])){
    session_unset();
    session_destroy();
 }
 header('Location: index.php');
-    exit();
-}
--- a/WEB/index.php
+++ b/WEB/index.php
@ -1,48 +1,15 @@
 <?php

-require("connectionBD.php");
-$db = connexionBD();
-init();
+require_once("connexionBD.php");

-function printError(){
-    if(isset($_GET['error'])){
-        $erreur = getError($_GET['error']);
-        echo "<p class = 'error'>$erreur</p>";
-    }
-}
-
-function getError($code){
-    switch ($code){
-        case 1:
-            return "Adresse mail ou mot de passe invalide.";
-    }
-}
-
-function authentification($mail, $password){
-    global $db;
-    $result = pg_query_params($db, "SELECT * FROM Utilisateur WHERE mail = $1;", array($mail));
-    if ($result){
-        $row = pg_fetch_array($result);
-        return (strcmp($row["passwd"], $password)) == 0;
-    }
-    return false;
-}
-
-function init(){
-    global $db;
 session_start();

-    /*if(isset($_COOKIE['mail']) && isset($_COOKIE['password'])){
-        if (authentification($_COOKIE['mail'], $_COOKIE['mail'])){
-            $_SESSION['mail'] = $_COOKIE['mail'];
-        }
-    }*/
 if(!isset($_SESSION['mail'])){
    if (isset($_POST['mail_field'])){

        $mail = strtolower(htmlentities(pg_escape_string ($_POST['mail_field'])));
        $password = htmlentities(pg_escape_string($_POST['password']));
-            $result = authentification($mail, $password);
+        $result = authentification($db, $mail, $password);
        if($result) {
            $_SESSION['mail'] = $mail;
            header('Location: tableauBord/tableauBord.php');
@ -58,6 +25,28 @@ function init(){
    header('Location: tableauBord/tableauBord.php');
    exit();
 }
+
+function printError(){
+    if(isset($_GET['error'])){
+        $erreur = getError($_GET['error']);
+        echo "<p class = 'error'>$erreur</p>";
+    }
+}
+
+function getError($code){
+    switch ($code){
+        case 1:
+            return "Adresse mail ou mot de passe invalide.";
+    }
+}
+
+function authentification($db, $mail, $password){
+    $result = pg_query_params($db, "SELECT * FROM Utilisateur WHERE mail = $1;", array($mail));
+    if ($result){
+        $row = pg_fetch_array($result);
+        return (strcmp($row["passwd"], $password)) == 0;
+    }
+    return false;
 }

 ?>
--- a/WEB/inscription.php
+++ b/WEB/inscription.php
@ -1,17 +1,57 @@
 <?php

-require ('connectionBD.php');
-$db = connexionBD();
-init();
+require_once('connexionBD.php');

-function printError(){
+session_start();
+
+if (!isset($_SESSION['mail'])) {
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST) && empty($_FILES) && $_SERVER['CONTENT_LENGTH'] > 0) {
+        echo "<p class='error'>PHP a ignoré les données POST à cause d'une requête dépassant post_max_size (" . ini_get('post_max_size') . ").</p>";
+        exit();
+    }
+    if (isset($_POST['mail_field'])) {
+        $login = htmlentities(pg_escape_string($_POST['login_field']));
+        $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_field'])));
+        $phone = htmlentities(pg_escape_string($_POST['phone']));
+
+        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 {
+            uploadAvatar($mail);
+            $result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN);
+            if ($result) {
+                header('Location: index.php');
+            } else {
+                header('Location: inscription.php?error=6');
+            }
+        }
+
+    }
+} else {
+    header('Location: tableauBord/tableauBord.php');
+}
+
+function printError()
+{
    if (isset($_GET['error'])) {
        $erreur = getError($_GET['error']);
        echo "<p class = 'error'>$erreur</p>";
    }
 }

-function getError($code){
+function getError($code)
+{
    switch ($code) {
        case 1:
            return "L'adresse mail est invalide.";
@ -29,8 +69,8 @@ function getError($code){
    }
 }

-function isMailUnique($mail){
-    global $db;
+function isMailUnique($db, $mail)
+{
    $result = pg_query_params($db, "SELECT * FROM Utilisateur WHERE mail = $1;", array($mail));
    if ($result) {
        $row = pg_fetch_array($result);
@ -39,8 +79,8 @@ function isMailUnique($mail){
    return false;
 }

-function isLoginUnique($login){
-    global $db;
+function isLoginUnique($db, $login)
+{
    $result = pg_query_params($db, "SELECT * FROM Utilisateur WHERE login = $1;", array($login));
    if ($result) {
        $row = pg_fetch_array($result);
@ -49,13 +89,14 @@ function isLoginUnique($login){
    return false;
 }

-function creerUtilisateur($mail, $password, $prenom, $nom, $login, $phone, $dateN){
-    global $db;
+function creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN)
+{
    $result = pg_query_params($db, "INSERT INTO Utilisateur VALUES ($1, $2, $3, $4, $5, $6, to_date($7, 'YYYY/MM/DD'), false);", array($mail, $password, $prenom, $nom, $login, $phone, $dateN));
    return $result;
 }

-function uploadAvatar($mail){
+function uploadAvatar($mail)
+{
    if (isset($_FILES['avatar']) and $_FILES['avatar']['name'] != "") {
        $target_file = "imageProfil/$mail.png";
        $file_tmp = $_FILES['avatar']['tmp_name'];
@ -64,64 +105,15 @@ function uploadAvatar($mail){
        if ($check === false or !in_array($extension, array('png'))) {
            header('Location: inscription.php?error=4');
            exit();
-        }
-        else if ($_FILES['avatar']['size'] > 2 * 1024 * 1024){
+        } else if ($_FILES['avatar']['size'] > 2 * 1024 * 1024) {
            header('Location: inscription.php?error=5');
            exit();
-        }
-        else{
+        } else {
            move_uploaded_file($file_tmp, $target_file);
        }
    }
 }

-
-function init(){
-    session_start();
-    if(!isset($_SESSION['mail'])){
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST) && empty($_FILES) && $_SERVER['CONTENT_LENGTH'] > 0 ){
-            echo "<p class='error'>PHP a ignoré les données POST à cause d'une requête dépassant post_max_size (".ini_get('post_max_size').").</p>";
-            exit();
-        }
-        if(isset($_POST['mail_field'])){
-            $login = htmlentities(pg_escape_string ($_POST['login_field']));
-            $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_field'])));
-            $phone = htmlentities(pg_escape_string ($_POST['phone']));
-
-            if(!filter_var($mail, FILTER_VALIDATE_EMAIL)){
-                header('Location: inscription.php?error=1');
-                exit();
-            }
-            elseif(!isMailUnique($mail)){
-                header('Location: inscription.php?error=2');
-                exit();
-            }
-            elseif(!isLoginUnique($login)){
-                header('Location: inscription.php?error=3');
-                exit();
-            }
-            else{
-                uploadAvatar($mail);
-                $result = creerUtilisateur($mail, $password, $prenom, $nom, $login, $phone, $dateN);
-                if($result){
-                    header('Location: index.php');
-                }
-                else{
-                    header('Location: inscription.php?error=6');
-                }
-            }
-
-        }
-    }
-    else{
-        header('Location: tableauBord/tableauBord.php');
-    }
-}
-
 ?>
 <!DOCTYPE html>
 <html lang="fr">
--- a/WEB/ressources/navbarhtml.css
+++ b/WEB/ressources/navbarhtml.css
@ -0,0 +1,39 @@
+#menuDiv{
+    width: 100%;
+    display: block;
+}
+
+#menuDiv a{
+    font-family: "Arial";
+    font-size: 1em;
+}
+
+#menu {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+    background-color: rgb(65, 154, 28);
+}
+
+.menuItem {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: center;
+    color: white;
+    width: 10%;
+    min-width: 5em;
+    font-weight: bold;
+    text-decoration: none;
+    padding: 0.8em;
+    border-bottom: 4px solid rgb(65, 154, 28);
+    border-top: 4px solid rgb(65, 154, 28);
+    font-size: 1.1em;
+    text-align: center;
+}
+
+.menuItem:hover{
+    cursor: pointer;
+    border-bottom: 4px solid orange;
+}
--- a/WEB/ressources/navbarhtml.php
+++ b/WEB/ressources/navbarhtml.php
@ -0,0 +1,19 @@
+<?php
+    $protocol = "https";
+    if (!isset($_SERVER['HTTPS_HOST'])){
+        $protocol = "http";
+    }
+    $path = "$protocol://".$_SERVER['HTTP_HOST'];
+?>
+<div id="menuDiv">
+    <nav id="menu">
+        <a class="menuItem" href="<?php echo $path ; ?>/tableauBord/tableauBord.php">Tableau de bord</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/inscription.php">Trajets publiés</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/inscription.php">Trajets réservés</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/inscription.php">Messagerie</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/inscription.php">Avis reçus</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/inscription.php">Avis laissés</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/profil.php">Profil</a>
+        <a class="menuItem" href="<?php echo $path ; ?>/deconnexion.php">Se déconnecter</a>
+    </nav>
+</div>
--- a/WEB/tableauBord/tableauBord.php
+++ b/WEB/tableauBord/tableauBord.php
@ -1,9 +1,13 @@
 <?php
+require_once('../connexionBD.php');
+session_start();

-    require ('../connectionBD.php');
-    $mail = null;
-    $db = connexionBD();
-    init();
+//Si on est pas connecté redirection vers la page de connexion
+if(!isset($_SESSION['mail'])){
+    header('Location: ../index.php');
+    exit();
+}
+$mail = $_SESSION['mail'];

 $matricule = isset($_POST['matricule']) ? $_POST['matricule'] : NULL; //recuperation valeur formulaire, isset pour eviter l'erreur "Notice: Undefined index"
 $marque = isset($_POST['marque']) ? $_POST['marque'] : NULL;
@ -11,34 +15,17 @@
 $nbplaces = isset($_POST['nbplaces']) ? $_POST['nbplaces'] : NULL;
 $anneefab = isset($_POST['anneefab']) ? $_POST['anneefab'] : NULL;

-    if(isset($_POST['submitadd']))
-    {
-       addVoiture($matricule, $marque, $modele, $nbplaces, $anneefab);
-    }
-    if(isset($_POST['submitchange']))
-    {
-       changeVoiture($matricule, $marque, $modele, $nbplaces, $anneefab);
-    }
-    if(isset($_POST['submitshow']))
-    {
-       showVoiture();
+if(isset($_POST['submitadd'])){
+  addVoiture($db, $matricule, $marque, $modele, $nbplaces, $anneefab);
 }
-
-    function init(){
-        session_start();
-        global $mail;
-        //Si on est pas connecté redirection vers la page de connexion
-        if(!isset($_SESSION['mail'])){
-            header('Location: ../index.php');
-            exit();
-        }
-        else{
-            $mail = $_SESSION['mail'];
+if(isset($_POST['submitchange'])){
+  changeVoiture($db, $matricule, $marque, $modele, $nbplaces, $anneefab);
 }
+if(isset($_POST['submitshow'])){
+  showVoiture($db);
 }

-    function getPrenom($mail){
-        global $db;
+function getPrenom($db, $mail){
  $result = pg_query_params($db, "SELECT prenom from Utilisateur WHERE mail = $1;", array($mail));
  if($result){
    $row = pg_fetch_array($result);
@ -48,8 +35,7 @@
  return null;
 }

-    function getLogin($mail){
-        global $db;
+function getLogin($db, $mail){
  $result = pg_query_params($db, "SELECT login from Utilisateur WHERE mail = $1;", array($mail));
  if($result){
    $row = pg_fetch_array($result);
@ -59,8 +45,7 @@
  return null;
 }

-    function getTrajetsProposes($mail){
-        global $db;
+function getTrajetsProposes($db, $mail){
  $result = pg_query_params($db, "SELECT COUNT(*) from Trajet WHERE mailProposition = $1 AND estAnnule = false AND datedepart >= current_date;", array($mail));
  if($result){
    $row = pg_fetch_array($result);
@ -69,8 +54,7 @@
  return 0;
 }

-    function getTrajetsReserves($mail){
-        global $db;
+function getTrajetsReserves($db, $mail){
  $result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver r WHERE r.codetrajet = tr.codetrajet AND mailutilisateur = $1 AND etatres != 'Annulée' AND estAnnule = false AND datedepart >= current_date;", array($mail));
  if($result){
    $row = pg_fetch_array($result);
@ -79,8 +63,7 @@
  return 0;
 }

-    function getMessagesNonLus($mail){
-        global $db;
+function getMessagesNonLus($db, $mail){
  $result = pg_query_params($db, "SELECT COUNT(*) from Message WHERE mailRecepteur = $1 AND estLu = FALSE;", array($mail));
  if($result){
    $row = pg_fetch_array($result);
@ -89,7 +72,7 @@
  }
 }

-    function getAvisNonLus($mail){
+function getAvisNonLus($db, $mail){
  global $db;
  $result = pg_query_params($db, "SELECT COUNT(tr.mailProposition) FROM Trajet tr, Avis av WHERE tr.codeTrajet = av.codeTrajet AND av.estLu = false AND tr.mailProposition = $1;", array($mail));
  if($result){
@ -106,21 +89,18 @@
  return "../imageProfil/default.svg";
 }

-    function addVoiture($matricule, $marque, $modele, $nbplaces, $anneefab){
-      global $db;
+function addVoiture($db, $matricule, $marque, $modele, $nbplaces, $anneefab){
  $requete = "INSERT INTO public.voiture (matricule, marque, modele, nbplaces, anneefab, mail) VALUES ('".$matricule."','".$marque."','".$modele."','".$nbplaces."','".$anneefab."','".$_SESSION['mail']."');";
  pg_query($db, $requete);
 }

-    function changeVoiture($matricule, $marque, $modele, $nbplaces, $anneefab){
-      global $db;
+function changeVoiture($db, $matricule, $marque, $modele, $nbplaces, $anneefab){
  $requete = "UPDATE public.voiture SET (matricule, marque, modele, nbplaces, anneefab) = ('".$matricule."','".$marque."','".$modele."','".$nbplaces."','".$anneefab."') WHERE mail = '".$_SESSION['mail']."';";
  echo "requete =".$requete;
  pg_query($db, $requete);
 }

-    function showVoiture(){
-      global $db;
+function showVoiture($db){
  $requete = "SELECT * FROM public.voiture WHERE voiture.mail = '".$_SESSION['mail']."';";
  if($donnees = pg_query($db, $requete)){
    while($res = pg_fetch_assoc($donnees)){
@ -132,16 +112,16 @@
    }
  }
 }
-
 ?>
-
 <!DOCTYPE html>
 <html lang="fr">
 <head>
  <meta charset="UTF-8">
-    <link rel="stylesheet" href="tableauBord.css">
-    <link rel="icon" type="image/png" href="" />
+  <link rel="stylesheet" href="tableauBord.css"><link rel="icon" type="image/png" href=""/>
  <title>Tableau de bord</title>
+</head>
+<body>
+  <?php require ('../ressources/navbarhtml.php'); ?>
  <script type="text/javascript">
    function ShowTab (E){
      document.getElementById("addVoiture").style.display = (E == 1) ? 'block' : 'none';
@ -149,21 +129,9 @@
      document.getElementById("showVoiture").style.display = (E == 3) ? 'block' : 'none';
    }
  </script>
-    <nav class="menu">
-        <a class="menuItem" href="./../inscription.php">Tableau de bord</a>
-        <a class="menuItem" href="../inscription.php">Trajets publiés</a>
-        <a class="menuItem" href="../inscription.php">Trajets réservés</a>
-        <a class="menuItem" href="../inscription.php">Messagerie</a>
-        <a class="menuItem" href="../inscription.php">Avis reçus</a>
-        <a class="menuItem" href="../inscription.php">Avis laissés</a>
-        <a class="menuItem" href="../inscription.php">Profil</a>
-        <a class="menuItem" href="../deconnexion.php">Se déconnecter</a>
-    </nav>
-</head>
-<body>
  <div id="content">
    <div id="tableauBord">
-        <h1>Bienvenue <?php echo getLogin($mail); ?></h1>
+      <h1>Bienvenue <?php echo getLogin($db, $mail); ?></h1>
      <div id="divImgProfil">
        <img id="imgProfil" src="<?php echo getPathImgProfil($mail); ?>">
      </div>
@ -174,19 +142,19 @@
      <div id="recap">
        <div class="recapLine">
          <img class="recapIcon" src="../car.png">
-                <p>Vous avez <?php echo getTrajetsProposes($mail); ?> trajets proposés à effectuer.</p>
+          <p>Vous avez <?php echo getTrajetsProposes($db, $mail); ?> trajets proposés à effectuer.</p>
        </div>
        <div class="recapLine">
          <img class="recapIcon" src="../car.png">
-                <p>Vous avez <?php echo getTrajetsReserves($mail); ?> trajets réservés à effectuer.</p>
+          <p>Vous avez <?php echo getTrajetsReserves($db, $mail); ?> trajets réservés à effectuer.</p>
        </div>
        <div class="recapLine">
          <img class="recapIcon" src="../mail.svg">
-                <p>Vous avez <?php echo getMessagesNonLus($mail); ?> messages non lus.</p>
+          <p>Vous avez <?php echo getMessagesNonLus($db, $mail); ?> messages non lus.</p>
        </div>
        <div class="recapLine">
          <img class="recapIcon" src="../star.png">
-                <p>Vous avez <?php echo getAvisNonLus($mail); ?> avis non lus.</p>
+          <p>Vous avez <?php echo getAvisNonLus($db, $mail); ?> avis non lus.</p>
        </div>
      </div>
      <form id="choixFormeTestVoiture">
@ -196,7 +164,6 @@
          <input type="radio" name="TabCheck" onclick="ShowTab(3)"/>Afficher ma voiture
        </div>
      </form>
-
      <div id="addVoiture" style="display: none;">
        <h1>Ajouter une voiture</h1>
        <fieldset>
@ -212,7 +179,6 @@
          </form>
        </fieldset>
      </div>
-
      <div id="changeVoiture" style="display: none;">
        <h1>Modifier une voiture</h1>
        <fieldset>
@ -228,7 +194,6 @@
          </form>
        </fieldset>
      </div>
-
      <div id="showVoiture" style="display: none;">
        <h1>Afficher ma voiture</h1>
        <fieldset>
--- a/doc/54255712_405391970020373_6737760332493619200_n.jpg
+++ b/doc/54255712_405391970020373_6737760332493619200_n.jpg
--- a/doc/Cahier_des_charges_G1_E.pdf
+++ b/doc/Cahier_des_charges_G1_E.pdf
--- a/doc/Dossier_de_Conception_G1_E.pdf
+++ b/doc/Dossier_de_Conception_G1_E.pdf
--- a/mars.docx
+++ b/mars.docx
--- a/mcd.docx
+++ b/mcd.docx
--- a/années/Rapport_du_projet_UML_Co-voiturage_2017.pdf
+++ b/années/Rapport_du_projet_UML_Co-voiturage_2017.pdf
--- a/d'activité.pdf
+++ b/d'activité.pdf
--- a/doc/diagrammeSequenceDetailleClient.pdf
+++ b/doc/diagrammeSequenceDetailleClient.pdf
--- a/doc/diagrammeSequenceDetailleClient.png
+++ b/doc/diagrammeSequenceDetailleClient.png
--- a/doc/idees.docx
+++ b/doc/idees.docx
--- a/doc/mcd.mcd
+++ b/doc/mcd.mcd
--- a/doc/mcd.png
+++ b/doc/mcd.png
--- a/doc/mld.png
+++ b/doc/mld.png
--- a/doc/partie.docx
+++ b/doc/partie.docx
--- a/doc/projet
+++ b/doc/projet
--- a/doc/repartition.txt
+++ b/doc/repartition.txt