From d30839192cdc89fd4daab4a8b10b820d88d3fe6a Mon Sep 17 00:00:00 2001 From: flavien Date: Wed, 22 May 2019 16:41:08 +0200 Subject: [PATCH] put functions in files and created a file that check connection --- WEB/deposerTrajet/depotTrajet.php | 81 +++---------------------------- WEB/profil/admin.php | 8 +-- WEB/ressources/trajet.php | 80 +++++++++++++++++++++++++++++- WEB/ressources/verifconnecte.php | 8 +++ WEB/tableauBord/tableauBord.php | 46 +----------------- 5 files changed, 95 insertions(+), 128 deletions(-) create mode 100644 WEB/ressources/verifconnecte.php diff --git a/WEB/deposerTrajet/depotTrajet.php b/WEB/deposerTrajet/depotTrajet.php index e296b1b..ad06b0e 100644 --- a/WEB/deposerTrajet/depotTrajet.php +++ b/WEB/deposerTrajet/depotTrajet.php @@ -1,67 +1,8 @@ $modele"; - } - -} - -//Afficher les voitures dans un select -function afficherVilles($db) -{ - $villes = getListeVilles($db); - while ($row = pg_fetch_array($villes)) { - $nom = $row['nomville']; - $cp = $row['codepostal']; - echo ""; - } -} - -function printError() -{ - if (isset($_GET['error'])) { - $erreur = getError($_GET['error']); - echo "

$erreur

"; - } -} - -function getError($code) -{ - switch ($code) { - case 1: - return "Erreur lors de la vérification des étapes."; - case 2: - return "Erreur lors de la vérification des dates."; - case 3: - return "Ce compte n'est pas associé à la voiture sélectionnée."; - case 4: - return "Erreur lors de l'enregistrement du trajet."; - - } -} - require_once('../connexionBD.php'); require_once('../ressources/trajet.php'); +require_once ('../ressources/verifconnecte.php'); -session_start(); -//Utilisateur connecté -if (!isset($_SESSION['mail'])) { - header('Location: ../index.php'); - exit(); -} -$mail = $_SESSION['mail']; //Tester que tous les champs ont été renseignés if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST['voiture']) && isset($_POST['villeDepart']) && isset($_POST['nbEtapes']) && isset($_POST['etape1'])) { //Récupérer tous les $_POST en variables @@ -104,9 +45,7 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[ header('Location: depotTrajet.php?error=4'); exit(); } - } - ?> @@ -137,9 +76,7 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[
@@ -147,9 +84,7 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[
@@ -157,9 +92,7 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[
@@ -167,9 +100,7 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[
- +
@@ -177,4 +108,4 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[ - \ No newline at end of file + diff --git a/WEB/profil/admin.php b/WEB/profil/admin.php index 35bb00c..5f16aad 100644 --- a/WEB/profil/admin.php +++ b/WEB/profil/admin.php @@ -2,13 +2,7 @@ session_start(); require_once('../connexionBD.php'); require_once ('../ressources/user.php'); - -$mail = $_SESSION['mail']; - -if (!isset($_SESSION['mail'])) { - header('Location: index.php'); - exit(); -} +require_once ('../ressources/verifconnecte.php'); $user = getUser($db, $mail); diff --git a/WEB/ressources/trajet.php b/WEB/ressources/trajet.php index ff13bd1..03d3aa7 100644 --- a/WEB/ressources/trajet.php +++ b/WEB/ressources/trajet.php @@ -1,5 +1,4 @@ = current_date;", array($mail)); + if ($result) { + $row = pg_fetch_array($result); + return $row[0]; + } + return 0; +} + +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); + return $row[0]; + } + return 0; +} + +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); + $login = $row[0]; + return $login; + } +} + +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) { + $row = pg_fetch_array($result); + $login = $row[0]; + return $login; + } +} + +//Récupérer la liste des voitures concernant un utilisateur +function getListeVoitures($db, $mail){ + $result = pg_query_params($db, "SELECT * FROM Voiture WHERE mail = $1;", array($mail)); + return $result; +} + +//Afficher les voitures dans un select +function afficherVoitures($db, $mail){ + $voitures = getListeVoitures($db, $mail); + while ($row = pg_fetch_array($voitures)) { + $modele = $row['modele']; + $matricule = $row['matricule']; + echo ""; + } +} + +//Afficher les voitures dans un select +function afficherVilles($db){ + $villes = getListeVilles($db); + while ($row = pg_fetch_array($villes)) { + $nom = $row['nomville']; + $cp = $row['codepostal']; + echo ""; + } +} + +function getErrorDepotTrajet($code){ + switch ($code) { + case 1: + return "Erreur lors de la vérification des étapes."; + case 2: + return "Erreur lors de la vérification des dates."; + case 3: + return "Ce compte n'est pas associé à la voiture sélectionnée."; + case 4: + return "Erreur lors de l'enregistrement du trajet."; + } +} +?> diff --git a/WEB/ressources/verifconnecte.php b/WEB/ressources/verifconnecte.php new file mode 100644 index 0000000..fc35589 --- /dev/null +++ b/WEB/ressources/verifconnecte.php @@ -0,0 +1,8 @@ + diff --git a/WEB/tableauBord/tableauBord.php b/WEB/tableauBord/tableauBord.php index 9161a76..238e2c4 100644 --- a/WEB/tableauBord/tableauBord.php +++ b/WEB/tableauBord/tableauBord.php @@ -2,50 +2,8 @@ session_start(); require_once('../connexionBD.php'); require_once ('../ressources/user.php'); - -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); - return $row[0]; - } - return 0; -} - -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); - return $row[0]; - } - return 0; -} - -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); - $login = $row[0]; - return $login; - } -} - -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) { - $row = pg_fetch_array($result); - $login = $row[0]; - return $login; - } -} - -//Si on est pas connecté redirection vers la page de connexion -if (!isset($_SESSION['mail'])) { - header('Location: ../index.php'); - exit(); -} -$mail = $_SESSION['mail']; +require_once ('../ressources/trajet.php'); +require_once ('../ressources/verifconnecte.php'); ?>