From dba24b8c18aed84a71c3169b2df5598d62deab06 Mon Sep 17 00:00:00 2001
From: polo <ordipolo@gmx.fr>
Date: Sun, 17 Aug 2025 19:46:20 +0200
Subject: =?UTF-8?q?classe=20FormValidation=20et=20am=C3=A9lioration=20des?=
 =?UTF-8?q?=20envois=20d'e-mail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/UserEditBuilder.php       |  8 ++++++--
 src/view/templates/form.php        |  8 ++++----
 src/view/templates/login.php       |  1 +
 src/view/templates/user_create.php |  1 +
 src/view/templates/user_edit.php   | 15 ++++++++-------
 5 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/view')

diff --git a/src/view/UserEditBuilder.php b/src/view/UserEditBuilder.php
index 63bbfad..3604e91 100644
--- a/src/view/UserEditBuilder.php
+++ b/src/view/UserEditBuilder.php
@@ -31,8 +31,8 @@ class UserEditBuilder extends AbstractBuilder
             'same_password_as_before' => 'Nouveau mot de passe identique au précédent.'
         ];
 
-        $error_username = isset($_GET['error_login']) ? $error_messages[$_GET['error_login']] : '';
-        $success_username = (isset($_GET['success_login']) && $_GET['success_login']) ? 'Identifiant modifié avec succès.' : '';
+        $error_username = isset($_GET['error_username']) ? $error_messages[$_GET['error_username']] : '';
+        $success_username = (isset($_GET['success_username']) && $_GET['success_username']) ? 'Identifiant modifié avec succès.' : '';
         $error_password = isset($_GET['error_password']) ? $error_messages[$_GET['error_password']] : '';
         $success_password = (isset($_GET['success_password']) && $_GET['success_password']) ? 'Mot de passe modifié avec succès.' : '';
 
@@ -51,6 +51,10 @@ class UserEditBuilder extends AbstractBuilder
         isset($_GET['from']) ? $link_exit->addParams(['page' => $_GET['from'] ]) : '';
         isset($_GET['id']) ? $link_exit->addParams(['id' => $_GET['id']]) : '';
 
+        $link_logout = new URL(['action' => 'deconnection']);
+        isset($_GET['from']) ? $link_logout->addParams(['from' => $_GET['from'] ]) : '';
+        isset($_GET['id']) ? $link_logout->addParams(['id' => $_GET['id']]) : '';
+
 		ob_start();
         require $viewFile;
         $this->html = ob_get_clean(); // nouveau contenu
diff --git a/src/view/templates/form.php b/src/view/templates/form.php
index bcde2f4..25446c1 100644
--- a/src/view/templates/form.php
+++ b/src/view/templates/form.php
@@ -4,13 +4,13 @@
 	<h3><?= $title ?></h3>
 	<div class="form_inputs">
 		<label for="email_name">Votre nom</label>
-		<input id="email_name" type="text" name="email_name" value="" required>
+		<input id="email_name" type="text" name="email_name" value="">
 		
 		<label for="email_address">Votre e-mail</label>
-		<input id="email_address" type="email" name="email_address" placeholder="mon-adresse@email.fr" value="" required>
+		<input id="email_address" type="email" name="email_address" placeholder="mon-adresse@email.fr" value="" onchange="checkCase()">
 
 		<label for="email_message">Votre message</label>
-		<textarea id="email_message" type="text" name="email_message" rows="4" required></textarea>
+		<textarea id="email_message" type="text" name="email_message" rows="4"></textarea>
 
 		<div class="full_width_column">
 			<label for="captcha" >Montrez que vous n'êtes pas un robot</label>
@@ -18,7 +18,7 @@
 
 		<label for="email_captcha" >Combien font <?= $captcha->getA() ?> fois <?= $captcha->getB() ?>?</label>
 		<div>
-			<input id="email_captcha" type="text" name="email_captcha" size="1" required>
+			<input id="email_captcha" type="text" name="email_captcha" size="1" autocomplete="off">
 		</div>
 
 		<input id="form_id_hidden" type="hidden" name="form_id_hidden" value="">
diff --git a/src/view/templates/login.php b/src/view/templates/login.php
index 766c114..c40b3a7 100644
--- a/src/view/templates/login.php
+++ b/src/view/templates/login.php
@@ -9,6 +9,7 @@
 				        <input id="login" type="text" name="login" autofocus required></p>
 				    <p><label for="password" >Mot de passe:</label>
 				        <input id="password" type="password" name="password" required></p>
+				    <input type="hidden" name="connection_hidden">
 
 				    <p>Montrez que vous n'êtes pas un robot.<br>
 	                    <label for="captcha" >Combien font <?= $captcha->getA() ?> fois <?= $captcha->getB() ?>?</label>
diff --git a/src/view/templates/user_create.php b/src/view/templates/user_create.php
index dd17547..68e115c 100644
--- a/src/view/templates/user_create.php
+++ b/src/view/templates/user_create.php
@@ -5,6 +5,7 @@ $error_messages = [
     'error_non_valid_captcha' => 'Erreur au test anti-robot, veuillez saisir un nombre entier.',
     'captcha_server_error' => 'captcha_server_error',
     'bad_solution_captcha' => 'Erreur au test anti-robot, veuillez réessayer.',
+    'bad_login_or_password' => 'Mauvais identifiant ou mot de passe, veuillez réessayer.',
     'different_passwords' => 'Les deux mots de passe saisis sont différents',
     'forbidden_characters' => 'Caractères interdits: espaces, tabulations, sauts CR/LF.'
 ];
diff --git a/src/view/templates/user_edit.php b/src/view/templates/user_edit.php
index b4b35ed..77cd9f2 100644
--- a/src/view/templates/user_edit.php
+++ b/src/view/templates/user_edit.php
@@ -14,8 +14,8 @@
 		            <p style="color: red; font-style: italic;"><?= $error_username ?></p>
 		            <p style="color: green; font-style: italic;"><?= $success_username ?></p>
 					<form class="connexionFormulaire" method="post" action="<?= $link_user_form ?>" >
-					    <p><label for="old_login" >Ancien nom:</label>
-					        <input id="old_login" type="text" name="old_login" required></p>
+					    <p><label for="login" >Ancien nom:</label>
+					        <input id="login" type="text" name="login" required></p>
 					    <p><label for="password" >Mot de passe:</label>
 		                	<input id="password" type="password" name="password" required ></p>
 		                <p><label for="new_login" >Nouveau nom:</label>
@@ -37,8 +37,8 @@
 					<form class="connexionFormulaire" method="post" action="<?= $link_password_form ?>" >
 						<p><label for="login" >Nom:</label>
 					        <input id="login" type="text" name="login" required></p>
-					    <p><label for="old_password" >Ancien mot de passe:</label>
-		                	<input id="old_password" type="password" name="old_password" required ></p>
+					    <p><label for="password" >Ancien mot de passe:</label>
+		                	<input id="password" type="password" name="password" required ></p>
 		                <p><label for="new_password" >Nouveau mot de passe:</label>
 		                <input id="new_password" type="password" name="new_password" required autocomplete="off"></p>
 		                <input type="hidden" name="modify_password_hidden">
@@ -54,9 +54,10 @@
 			</div>
 			<div class="login_form">
 				<p class="connexionP connexionFooter" >
-				    <a href="<?= $link_exit ?>" >
-				        <button>Retour au site</button>
-				    </a>
+					<a href="<?= $link_exit ?>">
+						<button>Retour au site</button></a>
+					<a href="<?= $link_logout ?>">
+						<button>Déconnexion</button></a>
 				</p>
 			</div>
 		</section>
\ No newline at end of file
-- 
cgit v1.2.3