20 files changed, 61 insertions, 61 deletions
diff --git a/Views/Includes/en/table.php b/Views/Includes/en/table.php
index 1ce9816..0b778af 100644
--- a/Views/Includes/en/table.php
+++ b/Views/Includes/en/table.php
@@ -39,7 +39,7 @@ $header = [
     ["Subject",
     "Note",
     "Review",
-    "CLient Lastname"]
+    "Client Lastname"]
 ];
 $yes = "Yes";
 $no  = "No";
diff --git a/Views/Includes/en/text.php b/Views/Includes/en/text.php
index 872ca62..7caf330 100644
--- a/Views/Includes/en/text.php
+++ b/Views/Includes/en/text.php
@@ -3,15 +3,15 @@
 // Description: Texte du site
 // ****************************************************************************
 $text = [
-    "incl_delete_form" => [
+    "incl_form_delete" => [
         "h2"     => "Delete an user",
         "id"     => "ID to delete",
         "submit" => "Delete",
     ],
-    "incl_footer" => [
+    "incl_global_footer" => [
         "main" => "Made by Debulois Quentin for my professional folder.<br>December 2021, all rights reserved.",
     ],
-    "incl_userInfo_form" => [
+    "incl_form_userInfo" => [
         "h2"          => "Informations about the user.",
         "lastname"    => "Last name",
         "firstname"   => "First name",
@@ -25,24 +25,24 @@ $text = [
         "city"        => "City",
         "submit"      => "Modify"
     ],
-    "incl_login_form" => [
+    "incl_form_login" => [
         "h2"         => "Login",
         "email"      => "Email",
         "password"   => "Password",
         "rememberMe" => "Remember me",
         "submit"     => "Sign-in"
     ],
-    "incl_mission_form" => [
+    "incl_form_mission" => [
         "h2"           => "Form to register a mission",
         "subject"      => "Subject",
         "review"       => "Review",
         "consultantId" => "Consultant ID",
         "submit"       => "Register"
     ],
-    "incl_myMission_table" => [
+    "incl_table_myMission" => [
         "h2" => "My missions"
     ],
-    "incl_navbar" => [
+    "incl_global_navbar" => [
         "h2"           => "AlphaJob",
         "btnSearch"    => "Search",
         "btnInfos"     => "Modif. infos",
@@ -55,7 +55,7 @@ $text = [
         "lang"         => "Language",
         "btnLang"      => "Select"
     ],
-    "incl_register_form" => [
+    "incl_form register" => [
         "h2"           => "Form to sign-in",
         "email"        => "Email",
         "password"     => "Password",
diff --git a/Views/Includes/fr/text.php b/Views/Includes/fr/text.php
index 7820ea3..8d72f26 100644
--- a/Views/Includes/fr/text.php
+++ b/Views/Includes/fr/text.php
@@ -3,15 +3,15 @@
 // Description: Texte du site
 // ****************************************************************************
 $text = [
-    "incl_delete_form" => [
+    "incl_form_delete" => [
         "h2"     => "Supprimer un utilisateur",
         "id"     => "ID à supprimer",
         "submit" => "Supprimer",
     ],
-    "incl_footer" => [
+    "incl_global_footer" => [
         "main" => "Réalisé par Debulois Quentin pour mon dossier professionel.<br>Decembre 2021, tous droits réservés.",
     ],
-    "incl_userInfo_form" => [
+    "incl_form_userInfo" => [
         "h2"          => "Informations sur l'utilisateur.",
         "lastname"    => "Nom",
         "firstname"   => "Prénom",
@@ -25,24 +25,24 @@ $text = [
         "city"        => "Ville",
         "submit"      => "Modifier"
     ],
-    "incl_login_form" => [
+    "incl_form_login" => [
         "h2"         => "Identification",
         "email"      => "Email",
         "password"   => "Mot de passe",
         "rememberMe" => "Se souvenir de moi",
         "submit"     => "Connection"
     ],
-    "incl_mission_form" => [
+    "incl_form_mission" => [
         "h2"           => "Formulaire pour enregistrer une mission",
         "subject"      => "Sujet",
         "review"       => "Commentaire",
         "consultantId" => "ID du consultant",
         "submit"       => "Enregistrer"
     ],
-    "incl_myMission_table" => [
+    "incl_table_myMission" => [
         "h2" => "Mes missions"
     ],
-    "incl_navbar" => [
+    "incl_global_navbar" => [
         "h2"           => "AlphaJob",
         "btnSearch"    => "Rechercher",
         "btnInfos"     => "Modif. infos",
@@ -55,7 +55,7 @@ $text = [
         "lang"         => "Langue",
         "btnLang"      => "Sélectionner"
     ],
-    "incl_register_form" => [
+    "incl_form_register" => [
         "h2"           => "Formulaire d'inscription",
         "email"        => "Email",
         "password"     => "Mot de passe",
diff --git a/Views/Includes/incl_delete_form.php b/Views/Includes/incl_form_delete.php
index bc1dc80..99ce216 100644
--- a/Views/Includes/incl_delete_form.php
+++ b/Views/Includes/incl_form_delete.php
@@ -20,7 +20,7 @@ echo('        <!-- Separateur -->
             <form class="flex-center" action="../../Wrapper/wrapper.php" method="post">
                 <label class="width-auto">
                     <i class="fas fa-trash-alt"></i>
-                    <input type="text" name="id" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["id"].'">
+                    <input type="text" name="userId" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["id"].'">
                 </label>
                 <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
             </form>'.PHP_EOL);
@@ -42,9 +42,9 @@ foreach ($result as $rows) {
             <tr>".PHP_EOL);
     foreach ($rows as $key => $value) {
         // Traduction du résultat si reponse binaire en Oui / Non.
-        if (($key == "isUser" || $key == "isConsultant" || $key == "isAdmin") && $value == "1") {
+        if (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "1") {
             echo("                <td><pre>".$yes."<prepre></td>".PHP_EOL);
-        } elseif (($key == "isUser" || $key == "isConsultant" || $key == "isAdmin") && $value == "0") {
+        } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") {
             echo("                <td><pre>".$no."<prepre></td>".PHP_EOL);
         } else {
             echo("                <td><pre>".$value."</pre></td>".PHP_EOL);
diff --git a/Views/Includes/incl_login_form.php b/Views/Includes/incl_form_login.php
index 5f76160..5f76160 100644
--- a/Views/Includes/incl_login_form.php
+++ b/Views/Includes/incl_form_login.php
diff --git a/Views/Includes/incl_mission_form.php b/Views/Includes/incl_form_mission.php
index 2fed999..4d6d311 100644
--- a/Views/Includes/incl_mission_form.php
+++ b/Views/Includes/incl_form_mission.php
@@ -30,7 +30,7 @@ echo('        <div class="separator"></div>
                 </label>
                 <label>
                     <i class="fas fa-user-cog"></i>
-                    <input type="text" name="consultantId" placeholder="'.$text[basename(__FILE__, ".php")]["consultantId"].'" maxlength="10" required>
+                    <input type="text" name="proId" placeholder="'.$text[basename(__FILE__, ".php")]["consultantId"].'" maxlength="10" required>
                 </label>
                 <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
             </form>
diff --git a/Views/Includes/incl_register_form.php b/Views/Includes/incl_form_register.php
index d95f552..bb046ce 100644
--- a/Views/Includes/incl_register_form.php
+++ b/Views/Includes/incl_form_register.php
@@ -19,8 +19,8 @@ echo('        <!-- Separateur -->
                     <input type="password" name="password" id="password" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
                 </label>
                 <label class="info flex-center">'.$text[basename(__FILE__, ".php")]["notice"].'</label>
-                <label for="is_user" class="flex-center"><input type="checkbox" name="is_user" id="is_user">'.$text[basename(__FILE__, ".php")]["isUser"].'</label>
-                <label for="is_consultant" class="flex-center"><input type="checkbox" name="is_consultant" id="is_consultant">'.$text[basename(__FILE__, ".php")]["isConsultant"].'</label>
+                <label for="is_user" class="flex-center"><input type="checkbox" name="is_client" id="is_user">'.$text[basename(__FILE__, ".php")]["isUser"].'</label>
+                <label for="is_consultant" class="flex-center"><input type="checkbox" name="is_pro" id="is_consultant">'.$text[basename(__FILE__, ".php")]["isConsultant"].'</label>
                 <label for="is_admin" class="flex-center"><input type="checkbox" name="is_admin" id="is_admin">'.$text[basename(__FILE__, ".php")]["isAdmin"].'</label>
                 <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
             </form>
diff --git a/Views/Includes/incl_userInfo_form.php b/Views/Includes/incl_form_userInfo.php
index 200a3f5..4cc509c 100644
--- a/Views/Includes/incl_userInfo_form.php
+++ b/Views/Includes/incl_form_userInfo.php
@@ -9,7 +9,7 @@ require_once(dirname( __FILE__ )."/../../Database/meth_dbsearch.php");
 // Instanciation de la bdd avec les méthodes de recherche.
 $dbsearch = new DbSearch;
 // Recherches des informations avec l'id de l'utilisateur actuellement connecté.
-$info = $dbsearch->get_user_info_by_id($_SESSION["id"]);
+$info = $dbsearch->get_user_info_by_id($_SESSION["userId"]);
 if (!$info) {
     $info = [
         ["lastname"    => "",
diff --git a/Views/Includes/incl_footer.php b/Views/Includes/incl_global_footer.php
index 6aa4014..6aa4014 100644
--- a/Views/Includes/incl_footer.php
+++ b/Views/Includes/incl_global_footer.php
diff --git a/Views/Includes/incl_header.php b/Views/Includes/incl_global_header.php
index 060340c..060340c 100644
--- a/Views/Includes/incl_header.php
+++ b/Views/Includes/incl_global_header.php
diff --git a/Views/Includes/incl_message.php b/Views/Includes/incl_global_message.php
index b4b653d..b4b653d 100644
--- a/Views/Includes/incl_message.php
+++ b/Views/Includes/incl_global_message.php
diff --git a/Views/Includes/incl_navbar.php b/Views/Includes/incl_global_navbar.php
index 178f2e6..86241e9 100644
--- a/Views/Includes/incl_navbar.php
+++ b/Views/Includes/incl_global_navbar.php
@@ -17,13 +17,13 @@ echo('        <!-- Navbar -->
 if (isset($_SESSION["loggedIn"]) 
     && $_SESSION["loggedIn"] == "1"
     ) {
-    if (isset($_SESSION["isUser"])
-        && $_SESSION["isUser"] == "1"
+    if (isset($_SESSION["isClient"])
+        && $_SESSION["isClient"] == "1"
         ) {
         echo('                <a href="/Views/mission.php"><li><i class="fas fa-plus-square"></i> '.$text[basename(__FILE__, ".php")]["btnMission"].'</li></a>'.PHP_EOL);
     }
-    if (isset($_SESSION["isConsultant"])
-    && $_SESSION["isConsultant"] == "1"
+    if (isset($_SESSION["isPro"])
+    && $_SESSION["isPro"] == "1"
         ) {
         echo('                <a href="/Views/myMission.php"><li><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</li></a>'.PHP_EOL);
     }
diff --git a/Views/Includes/incl_myMission_table.php b/Views/Includes/incl_table_myMission.php
index 9a50f5c..b7e4ba9 100644
--- a/Views/Includes/incl_myMission_table.php
+++ b/Views/Includes/incl_table_myMission.php
@@ -11,7 +11,7 @@ require_once(dirname(__FILE__)."/../../Database/meth_dbsearch.php");
 // Instanciation de la bdd avec les méthodes de recherche.
 $dbsearch = new DbSearch;
 // Recherches des missions avec l'id de l'utilisateur actuellement connecté.
-$result = $dbsearch->get_all_mission_by_id($_SESSION["id"]);
+$result = $dbsearch->get_all_mission_by_id($_SESSION["userId"]);
 echo('        <!-- Separateur -->
         <div class="separator"></div>
         <!-- Mes missions -->
diff --git a/Views/delete.php b/Views/delete.php
index af7c286..c11c768 100644
--- a/Views/delete.php
+++ b/Views/delete.php
@@ -22,14 +22,14 @@ if (!isset($_SESSION["loggedIn"], $_SESSION["isAdmin"])
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_delete_form.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_form_delete.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file
diff --git a/Views/login.php b/Views/login.php
index 19b1a3c..0bdeda3 100644
--- a/Views/login.php
+++ b/Views/login.php
@@ -13,14 +13,14 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("<title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_login_form.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_form_login.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file
diff --git a/Views/message.php b/Views/message.php
index fa90ccd..489d01f 100644
--- a/Views/message.php
+++ b/Views/message.php
@@ -16,14 +16,14 @@ if (!isset($_SESSION["messageNumber"])) {
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_message.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_message.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?>
     </body>
 </html>
 <?php unset($_SESSION["messageNumber"]); ?>
diff --git a/Views/mission.php b/Views/mission.php
index e1dc2ef..4d84777 100644
--- a/Views/mission.php
+++ b/Views/mission.php
@@ -5,9 +5,9 @@
 // Démarrage de la session.
 session_start();
 // Vérification si connecté et si a le statut utilisateur sinon: raise 404
-if (!isset($_SESSION["loggedIn"], $_SESSION["isUser"]) 
+if (!isset($_SESSION["loggedIn"], $_SESSION["isClient"]) 
     || $_SESSION["loggedIn"] == false 
-    || $_SESSION["isUser"] == false
+    || $_SESSION["isClient"] == false
 ) {
     http_response_code(404);
     die();
@@ -21,14 +21,14 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_mission_form.php")?> 
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php")?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_form_mission.php"); ?> 
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file
diff --git a/Views/myMission.php b/Views/myMission.php
index 0c9b6a7..49d7107 100644
--- a/Views/myMission.php
+++ b/Views/myMission.php
@@ -5,9 +5,9 @@
 // Démarrage de la session.
 session_start();
 // Si n'est pas connecté ou n'est pas consultant: raise 404.
-if (!isset($_SESSION["loggedIn"], $_SESSION["isConsultant"]) 
+if (!isset($_SESSION["loggedIn"], $_SESSION["isPro"]) 
     || $_SESSION["loggedIn"] == false 
-    || $_SESSION["isConsultant"] == false
+    || $_SESSION["isPro"] == false
 ) {
     http_response_code(404);
     die();
@@ -21,14 +21,14 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_myMission_table.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_table_myMission.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file
diff --git a/Views/register.php b/Views/register.php
index 3b0605c..5774615 100644
--- a/Views/register.php
+++ b/Views/register.php
@@ -13,14 +13,14 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_register_form.php")?> 
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php")?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_form_register.php")?> 
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php");?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file
diff --git a/Views/userInfo.php b/Views/userInfo.php
index c4e9f8b..0936590 100644
--- a/Views/userInfo.php
+++ b/Views/userInfo.php
@@ -19,14 +19,14 @@ $_SESSION["src"] = basename(__FILE__, ".php");
 <!DOCTYPE html>
 <?php echo('<html lang="'.$_SESSION["lang"].'">'.PHP_EOL); ?>
     <head>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_header.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_header.php"); ?>
 <?php require_once(dirname( __FILE__ )."/Includes/".$_SESSION["lang"]."/title.php"); ?>
 <?php echo("        <title>".$title[basename(__FILE__, ".php")]."</title>".PHP_EOL); ?>
     </head>
     <body>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_navbar.php"); ?>
-<?php require_once(dirname( __FILE__ )."/Includes/incl_userInfo_form.php")?> 
-<?php require_once(dirname( __FILE__ )."/Includes/incl_footer.php")?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_navbar.php"); ?>
+<?php require_once(dirname( __FILE__ )."/Includes/incl_form_userInfo.php")?> 
+<?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php");?>
         <script src="/Statics/Js/main.js"></script>
     </body>
 </html>
 \ No newline at end of file