From 497ce42637ebaad0c388d309d6b5bbf91db2dfa4 Mon Sep 17 00:00:00 2001 From: Debulois Date: Wed, 9 Mar 2022 19:37:55 +0100 Subject: Mise à jour des fonctions de la bdd avec le nouveau modèle, renommage des fichier pour plus de clarte et ajout des documents et infos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/Includes/en/table.php | 2 +- Views/Includes/en/text.php | 16 +++---- Views/Includes/fr/text.php | 16 +++---- Views/Includes/incl_delete_form.php | 60 -------------------------- Views/Includes/incl_footer.php | 13 ------ Views/Includes/incl_form_delete.php | 60 ++++++++++++++++++++++++++ Views/Includes/incl_form_login.php | 26 +++++++++++ Views/Includes/incl_form_mission.php | 38 +++++++++++++++++ Views/Includes/incl_form_register.php | 28 ++++++++++++ Views/Includes/incl_form_userInfo.php | 76 +++++++++++++++++++++++++++++++++ Views/Includes/incl_global_footer.php | 13 ++++++ Views/Includes/incl_global_header.php | 15 +++++++ Views/Includes/incl_global_message.php | 22 ++++++++++ Views/Includes/incl_global_navbar.php | 59 +++++++++++++++++++++++++ Views/Includes/incl_header.php | 15 ------- Views/Includes/incl_login_form.php | 26 ----------- Views/Includes/incl_message.php | 22 ---------- Views/Includes/incl_mission_form.php | 38 ----------------- Views/Includes/incl_myMission_table.php | 39 ----------------- Views/Includes/incl_navbar.php | 59 ------------------------- Views/Includes/incl_register_form.php | 28 ------------ Views/Includes/incl_table_myMission.php | 39 +++++++++++++++++ Views/Includes/incl_userInfo_form.php | 76 --------------------------------- Views/delete.php | 8 ++-- Views/login.php | 8 ++-- Views/message.php | 8 ++-- Views/mission.php | 12 +++--- Views/myMission.php | 12 +++--- Views/register.php | 8 ++-- Views/userInfo.php | 8 ++-- 30 files changed, 425 insertions(+), 425 deletions(-) delete mode 100644 Views/Includes/incl_delete_form.php delete mode 100644 Views/Includes/incl_footer.php create mode 100644 Views/Includes/incl_form_delete.php create mode 100644 Views/Includes/incl_form_login.php create mode 100644 Views/Includes/incl_form_mission.php create mode 100644 Views/Includes/incl_form_register.php create mode 100644 Views/Includes/incl_form_userInfo.php create mode 100644 Views/Includes/incl_global_footer.php create mode 100644 Views/Includes/incl_global_header.php create mode 100644 Views/Includes/incl_global_message.php create mode 100644 Views/Includes/incl_global_navbar.php delete mode 100644 Views/Includes/incl_header.php delete mode 100644 Views/Includes/incl_login_form.php delete mode 100644 Views/Includes/incl_message.php delete mode 100644 Views/Includes/incl_mission_form.php delete mode 100644 Views/Includes/incl_myMission_table.php delete mode 100644 Views/Includes/incl_navbar.php delete mode 100644 Views/Includes/incl_register_form.php create mode 100644 Views/Includes/incl_table_myMission.php delete mode 100644 Views/Includes/incl_userInfo_form.php (limited to 'Views') 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.
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.
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_delete_form.php deleted file mode 100644 index bc1dc80..0000000 --- a/Views/Includes/incl_delete_form.php +++ /dev/null @@ -1,60 +0,0 @@ - -
- -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - -
'.PHP_EOL); -// Récupération de tous les utilisateurs. -$result = $dbsearch->search_all(); -// Affichage de la table. -echo(" - - - ".PHP_EOL); -// Affichage des en-tête de colonne. -foreach($header[0] as $header) { - echo(" ".PHP_EOL); -} -echo(" ".PHP_EOL); -// Affichage du résultat de la recherche. -foreach ($result as $rows) { - echo(" - ".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") { - echo(" ".PHP_EOL); - } elseif (($key == "isUser" || $key == "isConsultant" || $key == "isAdmin") && $value == "0") { - echo(" ".PHP_EOL); - } else { - echo(" ".PHP_EOL); - } - } - echo(" ".PHP_EOL); -} -echo('
".$header."
".$yes."
".$no."
".$value."
- -
-
'.PHP_EOL); - -?> \ No newline at end of file diff --git a/Views/Includes/incl_footer.php b/Views/Includes/incl_footer.php deleted file mode 100644 index 6aa4014..0000000 --- a/Views/Includes/incl_footer.php +++ /dev/null @@ -1,13 +0,0 @@ - -
- - '.PHP_EOL) -?> \ No newline at end of file diff --git a/Views/Includes/incl_form_delete.php b/Views/Includes/incl_form_delete.php new file mode 100644 index 0000000..99ce216 --- /dev/null +++ b/Views/Includes/incl_form_delete.php @@ -0,0 +1,60 @@ + +
+ +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+
+ + +
'.PHP_EOL); +// Récupération de tous les utilisateurs. +$result = $dbsearch->search_all(); +// Affichage de la table. +echo(" + + + ".PHP_EOL); +// Affichage des en-tête de colonne. +foreach($header[0] as $header) { + echo(" ".PHP_EOL); +} +echo(" ".PHP_EOL); +// Affichage du résultat de la recherche. +foreach ($result as $rows) { + echo(" + ".PHP_EOL); + foreach ($rows as $key => $value) { + // Traduction du résultat si reponse binaire en Oui / Non. + if (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "1") { + echo(" ".PHP_EOL); + } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") { + echo(" ".PHP_EOL); + } else { + echo(" ".PHP_EOL); + } + } + echo(" ".PHP_EOL); +} +echo('
".$header."
".$yes."
".$no."
".$value."
+ +
+
'.PHP_EOL); + +?> \ No newline at end of file diff --git a/Views/Includes/incl_form_login.php b/Views/Includes/incl_form_login.php new file mode 100644 index 0000000..5f76160 --- /dev/null +++ b/Views/Includes/incl_form_login.php @@ -0,0 +1,26 @@ + +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+
+ + + + +
+
'.PHP_EOL) +?> \ No newline at end of file diff --git a/Views/Includes/incl_form_mission.php b/Views/Includes/incl_form_mission.php new file mode 100644 index 0000000..4d6d311 --- /dev/null +++ b/Views/Includes/incl_form_mission.php @@ -0,0 +1,38 @@ + +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+
+ + + + + +
+
'.PHP_EOL); +?> \ No newline at end of file diff --git a/Views/Includes/incl_form_register.php b/Views/Includes/incl_form_register.php new file mode 100644 index 0000000..bb046ce --- /dev/null +++ b/Views/Includes/incl_form_register.php @@ -0,0 +1,28 @@ + +
+ +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+
+ + + + + + + +
+
'.PHP_EOL); +?> \ No newline at end of file diff --git a/Views/Includes/incl_form_userInfo.php b/Views/Includes/incl_form_userInfo.php new file mode 100644 index 0000000..4cc509c --- /dev/null +++ b/Views/Includes/incl_form_userInfo.php @@ -0,0 +1,76 @@ +get_user_info_by_id($_SESSION["userId"]); +if (!$info) { + $info = [ + ["lastname" => "", + "firstname" => "", + "job" => "", + "degree" => "", + "capability" => "", + "description" => "", + "phoneNumber" => "", + "adress" => "", + "zipCode" => "", + "city" => ""] + ]; +} +echo(' +
+ +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+
+ + + + + + + + + + + +
+
') +?> \ No newline at end of file diff --git a/Views/Includes/incl_global_footer.php b/Views/Includes/incl_global_footer.php new file mode 100644 index 0000000..6aa4014 --- /dev/null +++ b/Views/Includes/incl_global_footer.php @@ -0,0 +1,13 @@ + +
+ + '.PHP_EOL) +?> \ No newline at end of file diff --git a/Views/Includes/incl_global_header.php b/Views/Includes/incl_global_header.php new file mode 100644 index 0000000..060340c --- /dev/null +++ b/Views/Includes/incl_global_header.php @@ -0,0 +1,15 @@ + + + + + + + + + +'); +?> \ No newline at end of file diff --git a/Views/Includes/incl_global_message.php b/Views/Includes/incl_global_message.php new file mode 100644 index 0000000..b4b653d --- /dev/null +++ b/Views/Includes/incl_global_message.php @@ -0,0 +1,22 @@ +'); +echo('

'.$message[$_SESSION["messageNumber"]]["title"].'

'); +if ($message[$_SESSION["messageNumber"]]["success"]) { + echo('

'.$success.'

'); +} else { + echo('

'.$error.'

'); +} +echo("

".$message[$_SESSION["messageNumber"]]["info"]."

"); +echo('

'.$redirect.'

'); +echo(''); +if ($message[$_SESSION["messageNumber"]]["timer"]) { + echo(''); +} else { + echo(''); +} +?> \ No newline at end of file diff --git a/Views/Includes/incl_global_navbar.php b/Views/Includes/incl_global_navbar.php new file mode 100644 index 0000000..86241e9 --- /dev/null +++ b/Views/Includes/incl_global_navbar.php @@ -0,0 +1,59 @@ + + '.PHP_EOL); +?> \ No newline at end of file diff --git a/Views/Includes/incl_header.php b/Views/Includes/incl_header.php deleted file mode 100644 index 060340c..0000000 --- a/Views/Includes/incl_header.php +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - -'); -?> \ No newline at end of file diff --git a/Views/Includes/incl_login_form.php b/Views/Includes/incl_login_form.php deleted file mode 100644 index 5f76160..0000000 --- a/Views/Includes/incl_login_form.php +++ /dev/null @@ -1,26 +0,0 @@ - -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - - - -
-
'.PHP_EOL) -?> \ No newline at end of file diff --git a/Views/Includes/incl_message.php b/Views/Includes/incl_message.php deleted file mode 100644 index b4b653d..0000000 --- a/Views/Includes/incl_message.php +++ /dev/null @@ -1,22 +0,0 @@ -'); -echo('

'.$message[$_SESSION["messageNumber"]]["title"].'

'); -if ($message[$_SESSION["messageNumber"]]["success"]) { - echo('

'.$success.'

'); -} else { - echo('

'.$error.'

'); -} -echo("

".$message[$_SESSION["messageNumber"]]["info"]."

"); -echo('

'.$redirect.'

'); -echo(''); -if ($message[$_SESSION["messageNumber"]]["timer"]) { - echo(''); -} else { - echo(''); -} -?> \ No newline at end of file diff --git a/Views/Includes/incl_mission_form.php b/Views/Includes/incl_mission_form.php deleted file mode 100644 index 2fed999..0000000 --- a/Views/Includes/incl_mission_form.php +++ /dev/null @@ -1,38 +0,0 @@ - -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - - - - -
-
'.PHP_EOL); -?> \ No newline at end of file diff --git a/Views/Includes/incl_myMission_table.php b/Views/Includes/incl_myMission_table.php deleted file mode 100644 index 9a50f5c..0000000 --- a/Views/Includes/incl_myMission_table.php +++ /dev/null @@ -1,39 +0,0 @@ -get_all_mission_by_id($_SESSION["id"]); -echo(' -
- -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

- - - '.PHP_EOL); -foreach($header[3] as $header) { - echo(" ".PHP_EOL); -} -echo(" ".PHP_EOL); -foreach ($result as $rows) { - echo(" - ".PHP_EOL); - foreach ($rows as $value) { - echo(" ".PHP_EOL); - } - echo(" ".PHP_EOL); -} -echo('
".$header."
".$value."
- -
-
'.PHP_EOL); -?> \ No newline at end of file diff --git a/Views/Includes/incl_navbar.php b/Views/Includes/incl_navbar.php deleted file mode 100644 index 178f2e6..0000000 --- a/Views/Includes/incl_navbar.php +++ /dev/null @@ -1,59 +0,0 @@ - - '.PHP_EOL); -?> \ No newline at end of file diff --git a/Views/Includes/incl_register_form.php b/Views/Includes/incl_register_form.php deleted file mode 100644 index d95f552..0000000 --- a/Views/Includes/incl_register_form.php +++ /dev/null @@ -1,28 +0,0 @@ - -
- -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - - - - - - -
-
'.PHP_EOL); -?> \ No newline at end of file diff --git a/Views/Includes/incl_table_myMission.php b/Views/Includes/incl_table_myMission.php new file mode 100644 index 0000000..b7e4ba9 --- /dev/null +++ b/Views/Includes/incl_table_myMission.php @@ -0,0 +1,39 @@ +get_all_mission_by_id($_SESSION["userId"]); +echo(' +
+ +
+

'.$text[basename(__FILE__, ".php")]["h2"].'

+ + + '.PHP_EOL); +foreach($header[3] as $header) { + echo(" ".PHP_EOL); +} +echo(" ".PHP_EOL); +foreach ($result as $rows) { + echo(" + ".PHP_EOL); + foreach ($rows as $value) { + echo(" ".PHP_EOL); + } + echo(" ".PHP_EOL); +} +echo('
".$header."
".$value."
+ +
+
'.PHP_EOL); +?> \ No newline at end of file diff --git a/Views/Includes/incl_userInfo_form.php b/Views/Includes/incl_userInfo_form.php deleted file mode 100644 index 200a3f5..0000000 --- a/Views/Includes/incl_userInfo_form.php +++ /dev/null @@ -1,76 +0,0 @@ -get_user_info_by_id($_SESSION["id"]); -if (!$info) { - $info = [ - ["lastname" => "", - "firstname" => "", - "job" => "", - "degree" => "", - "capability" => "", - "description" => "", - "phoneNumber" => "", - "adress" => "", - "zipCode" => "", - "city" => ""] - ]; -} -echo(' -
- -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - - - - - - - - - - -
-
') -?> \ No newline at end of file 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"]) '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ 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"); '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ 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"])) { '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + 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"); '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ 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"); '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ 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"); '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ 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"); '.PHP_EOL); ?> - + ".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - + + + \ No newline at end of file -- cgit v1.2.3