From af7035fcb137bb99011913d40407622a9accc8ed Mon Sep 17 00:00:00 2001
From: Lucas <lucas.briffon@ensiie.fr>
Date: Thu, 19 Dec 2019 07:59:34 +0100
Subject: [PATCH] modifier user infos

---
 htdocs/account/account.php         | 180 +++++++++++++++++++
 htdocs/account/modifier_mdp.php    |  95 ----------
 htdocs/account/myaccount.php       |  68 -------
 htdocs/connection/connection.php   |   2 +
 htdocs/forms.php                   | 273 ++++++++++++++++++++++++++++-
 htdocs/header.php                  |  16 +-
 htdocs/inscription/inscription.php | 116 ++++++------
 htdocs/matchs/matchs.php           |  70 ++++----
 8 files changed, 555 insertions(+), 265 deletions(-)
 create mode 100644 htdocs/account/account.php
 delete mode 100644 htdocs/account/modifier_mdp.php
 delete mode 100644 htdocs/account/myaccount.php

diff --git a/htdocs/account/account.php b/htdocs/account/account.php
new file mode 100644
index 0000000..e347656
--- /dev/null
+++ b/htdocs/account/account.php
@@ -0,0 +1,180 @@
+<?php
+include("/opt/lampp/htdocs/pima/head_php.php");
+$title = "Mon compte | Adopte un⋅e prof";
+include("/opt/lampp/htdocs/pima/head_html.php");
+?>
+</head>
+
+<?php include("/opt/lampp/htdocs/pima/header.php"); ?>
+
+<section class="wrapper style1">
+    <div class="container">
+        <div id="content">
+            <?php
+            if (!$_SESSION['connected']) {
+                ?>
+                <article>
+                    <header><h2>Accès interdit</h2></header>
+                    <p>Vous devez être authentifié⋅e pour avoir accès à cette page.</p>
+                </article>
+                <?php
+            }
+            else {
+                ?>
+                <article>
+                    <header>
+                        <h2>Mon compte</h2>
+                    </header>
+
+                    <p>
+                        <?php
+                        if (isset($_POST['name'])) {
+                            $type = $_POST['type'];
+                            $firstname = (empty($_POST['firstname'])) ? $_SESSION['currentFirstname'] : $_POST['firstname'];
+                            $name = (empty($_POST['name'])) ? $_SESSION['currentName'] : $_POST['name'];
+                            $mail = (empty($_POST['mail'])) ? $_SESSION['currentMail'] : $_POST['mail'];
+                            $old_mail = $_SESSION['currentMail'];
+
+                            $mailIsUnique = true;
+                            $sql="SELECT * FROM users";
+                            $res = $bdd->query($sql)->fetchAll(\PDO::FETCH_OBJ);
+                            foreach ($res as $r) {
+                                if ($r->mail == $mail) {
+                                    $mailIsUnique = false;
+                                }
+                                if ($r->mail == $old_mail) {
+                                    $id = $r->ID;
+                                }
+                            }
+                            if (!empty($_POST['mail']) && !$mailIsUnique) {
+                                echo "Cette adresse mail est déjà utilisée";
+                                inscription();
+                            }
+                            else {
+                                $sql = "UPDATE users SET firstname=?, name=?, type=?, mail=? WHERE mail=?";
+                                $bdd->prepare($sql)->execute([$firstname, $name, $type, $mail, $old_mail]);
+
+                                $sql = "DELETE FROM subjects WHERE id=?";
+                                $bdd->prepare($sql)->execute([$id]);
+                                if (isset($_POST['math'])) {
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Math']);
+                                }
+                                if (isset($_POST['physique'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Physique']);
+                                }
+                                if (isset($_POST['chimie'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Chimie']);
+                                }
+                                if (isset($_POST['francais'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Français']);
+                                }
+
+                                $sql = "DELETE FROM dispos WHERE id=?";
+                                $bdd->prepare($sql)->execute([$id]);
+                                if (isset($_POST['lundi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Lundi']);
+                                }
+                                if (isset($_POST['mardi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Mardi']);
+                                }
+                                if (isset($_POST['mercredi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Mercredi']);
+                                }
+                                if (isset($_POST['jeudi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Jeudi']);
+                                }
+                                if (isset($_POST['vendredi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Vendredi']);
+                                }
+                                if (isset($_POST['samedi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Samedi']);
+                                }
+                                if (isset($_POST['dimanche'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Dimanche']);
+                                }
+
+                                $_SESSION['currentFirstname'] = $firstname;
+                                $_SESSION['currentName'] = $name;
+                                $_SESSION['currentType'] = $type;
+                                $_SESSION['currentMail'] = $mail;
+                                $users = $userRepository->fetchAll();
+                                foreach($users as $user) {
+                                    if ($user->getMail() == $mail) {
+                                        $_SESSION['currentSubject'] = $user->getSubject();
+                                        $_SESSION['currentDispo'] = $user->getDispo();
+                                    }
+                                }
+
+                                echo 'Modifications effectuées avec succès';
+                                account();
+                            }
+                        }
+                        else {
+                            account();
+                        }
+                        ?>
+                    </p>
+                </article>
+
+                <article>
+                    <header>
+                        <h2>Modifier mon mot de passe</h2>
+                    </header>
+
+                    <p>
+                        <?php
+                        if (isset($_POST['old_mdp'])) {
+                            $mail = $_SESSION['currentMail'];
+                            $old_mdp = $_POST['old_mdp'];
+                            $new_mdp = $_POST['new_mdp'];
+                            $confirm_new_mdp = $_POST['confirm_new_mdp'];
+
+                            $users = $userRepository->fetchAll();
+                            foreach($users as $user) {
+                                if ($mail == $user->getMail()) {
+                                    $mdp = $user->getMdp();
+                                }
+                            }
+
+                            if($mdp == $old_mdp) {
+                                if (($new_mdp == $confirm_new_mdp)) {
+                                    $sql = "UPDATE users SET mdp=? WHERE mail=?";
+                                    $bdd->prepare($sql)->execute([$new_mdp, $mail]);
+
+                                    echo 'Modification du mot de passe effectuée avec succès';
+                                    modifier_mdp();
+                                }
+                                else {
+                                    echo 'Le mot de passe confirmé n\'est pas le même';
+                                    modifier_mdp();
+                                }
+                            }
+                            else {
+                                echo 'Veuillez vérifier votre mot de passe';
+                                modifier_mdp();
+                            }
+                        }
+                        else {
+                            modifier_mdp();
+                        }
+                        ?>
+                    </p>
+                </article>
+                <?php
+            }
+            ?>
+        </div>
+    </div>
+</section>
+<?php include("/opt/lampp/htdocs/pima/footer.php"); ?>
diff --git a/htdocs/account/modifier_mdp.php b/htdocs/account/modifier_mdp.php
deleted file mode 100644
index ba12e22..0000000
--- a/htdocs/account/modifier_mdp.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-include("/opt/lampp/htdocs/pima/head_php.php");
-$title = "Modifier mon mot de passe | Adopte un⋅e prof";
-include("/opt/lampp/htdocs/pima/head_html.php");
-?>
-</head>
-
-<?php include("/opt/lampp/htdocs/pima/header.php"); ?>
-
-<section class="wrapper style1">
-    <div class="container">
-        <div id="content">
-          <?php
-          if (!isset($_POST['old_mdp'])){
-
-          ?>
-              <form action="/pima/account/modifier_mdp.php" method="post">
-                <div class="form-group form-row">
-                    <label for="inputEmail" class="col-sm-2 col-form-label">Adresse Mail</label>
-                    <div class="col-sm-10">
-                        <input type="text" class="form-control" id="inputEmail" name="mail" placeholder="Adresse Mail">
-                    </div>
-                </div>
-                <div class="form-group form-row">
-                    <label for="inputOldPassword" class="col-sm-2 col-form-label">Ancien mot de passe</label>
-                    <div class="col-sm-10">
-                        <input type="password" class="form-control" id="inputOldPassword" name="old_mdp">
-                    </div>
-                </div>
-                <div class="form-group form-row">
-                    <label for="inputNewPassword" class="col-sm-2 col-form-label">Nouveau mot de passe</label>
-                    <div class="col-sm-10">
-                        <input type="password" class="form-control" id="inputNewPassword" name="new_mdp">
-                    </div>
-                </div>
-                <div class="form-group form-row">
-                    <label for="inputConfirmNewPassword" class="col-sm-2 col-form-label">Confirmer mot de passe</label>
-                    <div class="col-sm-10">
-                        <input type="password" class="form-control" id="inputConfirmNewPassword" name="confirm_new_mdp">
-                    </div>
-                </div>
-                <div class="form-group form-row">
-                    <div class="offset-sm-2">
-                        <!-- <button type="submit">S'inscrire</button> -->
-                        <input type="submit" value="Confirmer">
-                    </div>
-                </div>
-            </form>
-
-
-        <?php
-      }
-
-        if (isset($_POST['old_mdp'])){
-          $old_mdp = $_POST['old_mdp'];
-          $new_mdp = $_POST['new_mdp'];
-          $confirm_new_mdp = $_POST['confirm_new_mdp'];
-
-          $users = $userRepository->fetchAll();
-          foreach($users as $user){
-              $mail = $user->getMail();
-              $mdp = $user->getMdp();
-
-              if (($mail == $_POST['mail']))
-              {
-                if($mdp == $old_mdp){
-
-                  if (($new_mdp == $confirm_new_mdp))
-                  {
-                    $sql = "UPDATE users SET mdp=? WHERE mail=?";
-                    $bdd->prepare($sql)->execute([$new_mdp,$mail]);
-                    echo 'Modification du mot de passe effectuée avec succès';
-                    $_SESSION['password']=$new_mdp;
-                  }
-                  else {
-                    echo 'Le mot de passe confirmé n\'est pas le même';
-                  }
-                }
-                else {
-                  echo 'Veuillez vérifier votre adresse email ou votre mot de passe';
-
-                }
-              }
-
-
-          }
-        }
-          ?>
-
-        </div>
-      </div>
-  </section>
-</div>
-</body>
-</html>
diff --git a/htdocs/account/myaccount.php b/htdocs/account/myaccount.php
deleted file mode 100644
index 8223d0c..0000000
--- a/htdocs/account/myaccount.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-include("/opt/lampp/htdocs/pima/head_php.php");
-$title = "Mon compte | Adopte un⋅e prof";
-include("/opt/lampp/htdocs/pima/head_html.php");
-?>
-</head>
-
-<?php include("/opt/lampp/htdocs/pima/header.php"); ?>
-<?php
-function user_info($bdd){
-  if (!isset($_POST['id'])){ ?>
-    <form action="/pima/account/myaccount.php" method="post">
-      <div class="form-group form-row">
-          <label for="inputId" class="col-sm-2 col-form-label">Identifiant</label>
-          <div class="col-sm-10">
-              <input type='text' class="form-control" id="inputId" name='id' placeholder="Identifiant">
-          </div>
-      </div>
-      <div class="form-group form-row">
-          <div class="offset-sm-2">
-              <input type="submit" value="Envoyer">
-          </div>
-      </div>
-    </form>
-    <?php
-  }
-  $userRepository = new \User\UserRepository($bdd);
-  if(isset($_POST['id'])){
-    $users = $userRepository->fetchAll();
-    foreach($users as $user){
-      if ($_POST['id']==$user->getID()){
-        $name = $user->getName();
-        $firstname = $user->getFirstname();
-        $type = $user->getType();
-        $mail = $user->getMail();
-      }
-    }
-    ?>
-    <table class="table table-borderless">
-      <tr>
-        <td>Votre nom</td>
-        <td> <?php echo "$name" ?> </td>
-      </tr>
-      <tr>
-        <td>Votre prénom</td>
-        <td> <?php echo "$firstname" ?></td>
-      </tr>
-      <tr>
-        <td>Votre type</td>
-        <td> <?php echo "$type" ?></td>
-      </tr>
-      <tr>
-        <td>Votre e-mail</td>
-        <td> <?php echo "$mail" ?></td>
-      </tr>
-    </table>
-
-    <?php
-  }
-}
-?>
-<section class="wrapper style1">
-    <div class="container">
-        <div id="content">
-          <?php user_info($bdd); ?>
-        </div>
-    </div>
-</section>
diff --git a/htdocs/connection/connection.php b/htdocs/connection/connection.php
index 06d3fb8..7e8a204 100644
--- a/htdocs/connection/connection.php
+++ b/htdocs/connection/connection.php
@@ -17,6 +17,8 @@ if (isset($_POST['mail'])) {
             $_SESSION['currentFirstname'] = $firstname;
             $_SESSION['currentMail'] = $mail;
             $_SESSION['currentType'] = $user->getType();
+            $_SESSION['currentSubject'] = $user->getSubject();
+            $_SESSION['currentDispo'] = $user->getDispo();
             $_SESSION['currentRequest'] = $user->getRequest();
         }
     }
diff --git a/htdocs/forms.php b/htdocs/forms.php
index ba4d11e..2d0d6c7 100644
--- a/htdocs/forms.php
+++ b/htdocs/forms.php
@@ -36,9 +36,9 @@ function inscription() {
         </div>
 
         <div class="form-group form-row">
-            <label for="inputEmail" class="col-sm-2 col-form-label">Adresse Mail</label>
+            <label for="inputEmail" class="col-sm-2 col-form-label">Adresse mail</label>
             <div class="col-sm-10">
-                <input type="text" class="form-control" id="inputEmail" name="mail" placeholder="Adresse Mail">
+                <input type="text" class="form-control" id="inputEmail" name="mail" placeholder="Adresse mail">
             </div>
         </div>
 
@@ -147,9 +147,9 @@ function connection(){
     ?>
     <form action="/pima/connection/connection.php" method='post'>
         <div class="form-group form-row">
-            <label for="inputMail" class="col-sm-2 col-form-label">Adresse Mail</label>
+            <label for="inputMail" class="col-sm-2 col-form-label">Adresse mail</label>
             <div class="col-sm-10">
-                <input type='text' class="form-control" id="inputMail" name='mail' placeholder="Adresse Mail">
+                <input type='text' class="form-control" id="inputMail" name='mail' placeholder="Adresse mail">
             </div>
         </div>
 
@@ -169,4 +169,269 @@ function connection(){
     <?php
 }
 
+function account() {
+    ?>
+    <form action="/pima/account/account.php" method="post">
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label">Je suis</label>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="radio" id="inlineRadio1" name="type" value="Student"
+                    <?php
+                    if ($_SESSION['currentType'] == 'Student') {
+                        echo "checked";
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineRadio1">Élève</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="radio" id="inlineRadio2" name="type" value="Teacher"
+                    <?php
+                    if ($_SESSION['currentType'] == 'Teacher') {
+                        echo "checked";
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineRadio2">Professeur</label>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <label for="inputFirstName" class="col-sm-2 col-form-label">Prénom</label>
+            <div class="col-sm-10">
+                <input type="text" class="form-control" id="inputFirstName" name="firstname"
+                placeholder="<?php echo $_SESSION['currentFirstname']; ?>">
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <label for="inputName" class="col-sm-2 col-form-label">Nom</label>
+            <div class="col-sm-10">
+                <input type="text" class="form-control" id="inputName" name="name"
+                placeholder="<?php echo $_SESSION['currentName']; ?>">
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <label for="inputEmail" class="col-sm-2 col-form-label">Adresse mail</label>
+            <div class="col-sm-10">
+                <input type="text" class="form-control" id="inputEmail" name="mail"
+                placeholder="<?php echo $_SESSION['currentMail']; ?>">
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label">Matières</label>
+            <?php
+            $subject = $_SESSION['currentSubject'];
+            ?>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="math" name="math"
+                    <?php
+                    foreach ($subject as $s) {
+                        if ($s == "Math") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox1">Maths</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox2" value="physique" name="physique"
+                    <?php
+                    foreach ($subject as $s) {
+                        if ($s == "Physique") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox2">Physique</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox3" value="chimie" name="chimie"
+                    <?php
+                    foreach ($subject as $s) {
+                        if ($s == "Chimie") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox3">Chimie</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox4" value="francais" name="francais"
+                    <?php
+                    foreach ($subject as $s) {
+                        if ($s == "Français") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox4">Français</label>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label">Disponibilités</label>
+            <?php
+            $dispo = $_SESSION['currentDispo'];
+            ?>
+
+            <div class="col-sm-1">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox21" value="lundi" name="lundi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Lundi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox21">Lundi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-1">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox22" value="mardi" name="mardi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Mardi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox22">Mardi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox23" value="mercredi" name="mercredi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Mercredi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox23">Mercredi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-1">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox24" value="jeudi" name="jeudi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Jeudi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox24">Jeudi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox25" value="vendredi" name="vendredi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Vendredi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox25">Vendredi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-1">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox26" value="samedi" name="samedi"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Samedi") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox26">Samedi</label>
+                </div>
+            </div>
+
+            <div class="col-sm-1">
+                <div class="form-check form-check-inline">
+                    <input class="form-check-input" type="checkbox" id="inlineCheckbox27" value="dimanche" name="dimanche"
+                    <?php
+                    foreach ($dispo as $d) {
+                        if ($d == "Dimanche") {
+                            echo "checked";
+                        }
+                    }
+                    ?> >
+                    <label class="form-check-label" for="inlineCheckbox27">Dimanche</label>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <div class="offset-sm-2">
+                <input type="submit" value="Modifier mes informations">
+            </div>
+        </div>
+    </form>
+    <?php
+}
+
+function modifier_mdp() {
+    ?>
+    <form action="/pima/account/account.php" method="post">
+        <div class="form-group form-row">
+            <label for="inputOldPassword" class="col-sm-2 col-form-label">Ancien mot de passe</label>
+            <div class="col-sm-10">
+                <input type="password" class="form-control" id="inputOldPassword" name="old_mdp">
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <label for="inputNewPassword" class="col-sm-2 col-form-label">Nouveau mot de passe</label>
+            <div class="col-sm-10">
+                  <input type="password" class="form-control" id="inputNewPassword" name="new_mdp">
+              </div>
+        </div>
+
+        <div class="form-group form-row">
+            <label for="inputConfirmNewPassword" class="col-sm-2 col-form-label">Confirmer le nouveau mot de passe</label>
+            <div class="col-sm-10">
+                <input type="password" class="form-control" id="inputConfirmNewPassword" name="confirm_new_mdp">
+            </div>
+        </div>
+
+        <div class="form-group form-row">
+            <div class="offset-sm-2">
+                <input type="submit" value="Modifier mon mot de passe">
+            </div>
+        </div>
+    </form>
+    <?php
+}
+
 ?>
diff --git a/htdocs/header.php b/htdocs/header.php
index 15fa49a..472ea37 100644
--- a/htdocs/header.php
+++ b/htdocs/header.php
@@ -47,10 +47,10 @@
                             <li
 
                             <?php
-                            if (basename(getcwd()) == 'student')
+                            if (basename(getcwd()) == 'matchs')
                             echo 'class="current"';
                             ?> >
-                                <a href="/pima/student/matchs.php">Mes matchs</a>
+                                <a href="/pima/matchs/matchs.php">Mes matchs</a>
                             </li>
 
                         <?php }
@@ -82,17 +82,9 @@
 
                         <?php
                         if (basename(getcwd()) == 'account')
-                        echo 'class="drop current"';
-                        else
-                        echo 'class="drop"';
+                        echo 'class="current"';
                         ?> >
-                            <a>Mon compte</a>
-                            <i class="icon solid fa-caret-down"></i>
-                            <ul>
-                                <li>
-                                    <a href="/pima/account/modifier_mdp.php">Changer mon mot de passe</a>
-                                </li>
-                            </ul>
+                            <a href="/pima/account/account.php">Mon compte</a>
                         </li>
 
                         <li
diff --git a/htdocs/inscription/inscription.php b/htdocs/inscription/inscription.php
index e443fc8..e721bc3 100644
--- a/htdocs/inscription/inscription.php
+++ b/htdocs/inscription/inscription.php
@@ -33,67 +33,81 @@ include("/opt/lampp/htdocs/pima/head_html.php");
                             $mail = $_POST['mail'];
                             $mdp = $_POST['mdp'];
 
-                            $sql = "INSERT INTO users(firstname,name,type,mail,mdp) values (?,?,?,?,?)";
-                            $bdd->prepare($sql)->execute([$firstname,$name,$type,$mail,$mdp]);
-
+                            $mailIsUnique = true;
                             $sql="SELECT * FROM users";
                             $res = $bdd->query($sql)->fetchAll(\PDO::FETCH_OBJ);
-                            foreach($res as $r){
-                                $id = $r->ID;
+                            foreach ($res as $r) {
+                                if ($r->mail == $mail) {
+                                    $mailIsUnique = false;
+                                }
                             }
 
-                            if (isset($_POST['math'])){
-                                $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'Math']);
-                            }
-                            if (isset($_POST['physique'])){
-                                $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'Physique']);
-                            }
-                            if (isset($_POST['chimie'])){
-                                $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'Chimie']);
-                            }
-                            if (isset($_POST['francais'])){
-                                $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'Français']);
+                            if (!$mailIsUnique) {
+                                echo "Échec de l'inscription";
+                                inscription();
                             }
+                            else {
+                                $sql = "INSERT INTO users(firstname,name,type,mail,mdp) values (?,?,?,?,?)";
+                                $bdd->prepare($sql)->execute([$firstname,$name,$type,$mail,$mdp]);
 
+                                $sql="SELECT * FROM users";
+                                $res = $bdd->query($sql)->fetchAll(\PDO::FETCH_OBJ);
+                                foreach($res as $r){
+                                    $id = $r->ID;
+                                }
+
+                                if (isset($_POST['math'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Math']);
+                                }
+                                if (isset($_POST['physique'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Physique']);
+                                }
+                                if (isset($_POST['chimie'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Chimie']);
+                                }
+                                if (isset($_POST['francais'])){
+                                    $sql = "INSERT INTO subjects(ID,subject) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Français']);
+                                }
 
-                            if (isset($_POST['lundi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'lundi']);
-                            }
-                            if (isset($_POST['mardi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'mardi']);
-                            }
-                            if (isset($_POST['mercredi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'mercredi']);
-                            }
-                            if (isset($_POST['jeudi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'jeudi']);
-                            }
-                            if (isset($_POST['vendredi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'vendredi']);
-                            }
-                            if (isset($_POST['samedi'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'samedi']);
-                            }
-                            if (isset($_POST['dimanche'])){
-                                $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
-                                $bdd->prepare($sql)->execute([$id,'dimanche']);
-                            }
 
-                            echo "<p>Inscription faite !</p>";
+                                if (isset($_POST['lundi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Lundi']);
+                                }
+                                if (isset($_POST['mardi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Mardi']);
+                                }
+                                if (isset($_POST['mercredi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Mercredi']);
+                                }
+                                if (isset($_POST['jeudi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Jeudi']);
+                                }
+                                if (isset($_POST['vendredi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Vendredi']);
+                                }
+                                if (isset($_POST['samedi'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Samedi']);
+                                }
+                                if (isset($_POST['dimanche'])){
+                                    $sql = "INSERT INTO dispos(ID,dispo) values (?,?)";
+                                    $bdd->prepare($sql)->execute([$id,'Dimanche']);
+                                }
+
+                                echo "<p>Inscription faite !</p>";
+                            }
                         }
                     }
-
-                    if (!isset($_POST['name'])) {
+                    else {
                         inscription();
                     }
                     ?>
diff --git a/htdocs/matchs/matchs.php b/htdocs/matchs/matchs.php
index e475647..936050c 100644
--- a/htdocs/matchs/matchs.php
+++ b/htdocs/matchs/matchs.php
@@ -10,45 +10,44 @@ include("/opt/lampp/htdocs/pima/head_html.php");
 <section class="wrapper style1">
     <div class="container">
         <div id="content">
-            <article>
-                <?php
-                if (!isset($_SESSION['currentMail'])) {
-                    ?>
-
+            <?php
+            if (!$_SESSION['connected']) {
+                ?>
+                <article>
                     <header><h2>Accès interdit</h2></header>
                     <p>Vous devez être authentifié⋅e pour avoir accès à cette page.</p>
-
+                </article>
+                <?php
+            }
+            else {
+                if ($_SESSION['currentType'] != 'Student') {
+                    ?>
+                    <article>
+                        <header><h2>Accès interdit</h2></header>
+                        <p>Vous devez être authentifié⋅e en tant qu'élève pour avoir accès à cette page.</p>
+                    </article>
                     <?php
                 }
                 else {
-                    if ($_SESSION['currentType'] != 'Student') {
-                        ?>
-
-                        <header><h2>Accès interdit</h2></header>
-                        <p>Vous devez être authentifié⋅e en tant qu'élève pour avoir accès à cette page.</p>
-
-                        <?php
-                    }
-                    else {
-                        $students = $userRepository->fetchStudent();
-                        foreach($students as $student) {
-                            if ($_SESSION['currentMail'] == $student->getMail()) {
-                                $matchs = match_script($student, $userRepository);
-                                if (isset($_POST['nbMatchs'])) {
-                                    for ($i=0; $i < $_POST['nbMatchs']; $i++) {
-                                        if (isset($_POST["match$i"])) {
-                                            $teacher = $matchs[$i]["teacher"];
-                                            $subject = $matchs[$i]["subject"];
-                                            $dispo = $matchs[$i]["dispo"];
-                                            $sql = "INSERT INTO requests(student, teacher, dispo, subject, accepted) values (?, ?, ?, ?, ?)";
-                                            $bdd->prepare($sql)->execute([$student->getID(), $teacher->getID(), $dispo, $subject, 0]);
-                                        }
+                    $students = $userRepository->fetchStudent();
+                    foreach($students as $student) {
+                        if ($_SESSION['currentMail'] == $student->getMail()) {
+                            $matchs = match_script($student, $userRepository);
+                            if (isset($_POST['nbMatchs'])) {
+                                for ($i=0; $i < $_POST['nbMatchs']; $i++) {
+                                    if (isset($_POST["match$i"])) {
+                                        $teacher = $matchs[$i]["teacher"];
+                                        $subject = $matchs[$i]["subject"];
+                                        $dispo = $matchs[$i]["dispo"];
+                                        $sql = "INSERT INTO requests(student, teacher, dispo, subject, accepted) values (?, ?, ?, ?, ?)";
+                                        $bdd->prepare($sql)->execute([$student->getID(), $teacher->getID(), $dispo, $subject, 0]);
                                     }
                                 }
-                                $idMatch = 0;
-                                $requests = $student->getRequest();
-                                ?>
-
+                            }
+                            $idMatch = 0;
+                            $requests = $student->getRequest();
+                            ?>
+                            <article>
                                 <header><h2>Mes matchs</h2></header>
 
                                 <p>
@@ -93,12 +92,13 @@ include("/opt/lampp/htdocs/pima/head_html.php");
                                         </div>
                                     </form>
                                 </p>
-                                <?php
-                            }
+                            </article>
+                            <?php
                         }
                     }
                 }
-                ?>
+            }
+            ?>
         </div>
     </div>
 </section>
-- 
GitLab