From cc1a3760efd25d54ecb9753fef5633973e253f68 Mon Sep 17 00:00:00 2001
From: "thomas.millot" <thomas.millot@sio211-07.sio.lan>
Date: Mon, 18 Oct 2021 17:54:25 +0200
Subject: [PATCH 1/2] Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
---
 src/java/com/test/servlets/AuthentifServlet.java | 13 ++++++++++++-
 web/WEB-INF/AuthentificationJSP.jsp              | 11 ++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/java/com/test/servlets/AuthentifServlet.java b/src/java/com/test/servlets/AuthentifServlet.java
index 80ed961..1e78fd0 100644
--- a/src/java/com/test/servlets/AuthentifServlet.java
+++ b/src/java/com/test/servlets/AuthentifServlet.java
@@ -5,6 +5,7 @@
  */
 package com.test.servlets;
 
+import com.test.forms.AuthentifForm;
 import java.io.IOException;
 import java.io.PrintWriter;
 import jakarta.servlet.ServletException;
@@ -71,7 +72,17 @@ public class AuthentifServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        // Création de l'objet leControle de type AuthentifForm
+         AuthentifForm leControle = new AuthentifForm();
+        // Appel de la méthode controlerAdmin
+         boolean isAdmin = leControle.controlerAdmin(request);
+        // Création de 2 attributs de requête (isAdmin et leControle) 
+         request.setAttribute("isAdmin", isAdmin);
+         request.setAttribute("controlForm", leControle);
+             
+         // Affichage de la JSP
+         getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
+                 .forward(request, response); 
     }
 
     /**
diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp
index ff45a8c..71b5650 100644
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -4,19 +4,24 @@
     Author     : Chelloug.Eliass
 --%>
 <%@include file="jspf/enteteJSPF.jspf" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
+<%@page import="com.test.forms.AuthentifForm" %>
+
+
+<!-- Affichage du formulaire si l'utilisateur ne s'est pas encore authentifié -->
 <div id="contenu">
     <h2>Merci de vous identifier pour acceder aux dossiers</h2>
-    <form name="frmIdentification" method="POST" action="">  
+    <form name="frmIdentification" method="POST">  
         <c:choose>
             <c:when test="${empty param.ztPseudo}">
                 <fieldset><legend>Identification utilisateur</legend>
                     <br /><br />
                     <label for="nom">Nom du compte</label>
-                    <input id="login" 	type="text" 	name="login"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
+                    <input type="text" 	name="ztPseudo"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
                     </p>
                     <p>
                         <label for="mdp">Mot de passe</label>
-                        <input id="mdp" 	type="password"  name="mdp" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
+                        <input type="password"  name="ztMDP" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
                     </p><br /><br />
                     <input type="submit" 	name="valider"		value="Valider">
                     <input type="reset" 	name="annuler" 		value="Annuler">

From caf65f4bfefce88572bba5283cb2d2f53bfd64e5 Mon Sep 17 00:00:00 2001
From: "thomas.millot" <thomas.millot@sio211-07.sio.lan>
Date: Tue, 19 Oct 2021 08:51:43 +0200
Subject: [PATCH 2/2] Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
---
 src/java/bdd/PompierMysql.java                |  2 +-
 src/java/com/test/servlets/ProfilServlet.java |  7 +++---
 web/WEB-INF/AuthentificationJSP.jsp           |  9 ++++---
 web/WEB-INF/ModifProfilJSP.jsp                |  2 +-
 web/WEB-INF/ProfilJSP.jsp                     | 24 +------------------
 5 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/src/java/bdd/PompierMysql.java b/src/java/bdd/PompierMysql.java
index 74381f4..52f1006 100644
--- a/src/java/bdd/PompierMysql.java
+++ b/src/java/bdd/PompierMysql.java
@@ -155,5 +155,5 @@ public class PompierMysql {
         }
         return id;
     }
-
+    
 }
diff --git a/src/java/com/test/servlets/ProfilServlet.java b/src/java/com/test/servlets/ProfilServlet.java
index 93d91b2..5a37f1a 100644
--- a/src/java/com/test/servlets/ProfilServlet.java
+++ b/src/java/com/test/servlets/ProfilServlet.java
@@ -35,10 +35,10 @@ public class ProfilServlet extends HttpServlet {
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");
-            out.println("<title>Servlet ProfilServlet</title>");
+            out.println("<title>Servlet ProfilServlets</title>");
             out.println("</head>");
             out.println("<body>");
-            out.println("<h1>Servlet ProfilServlet at " + request.getContextPath() + "</h1>");
+            out.println("<h1>Servlet ProfilServlets at " + request.getContextPath() + "</h1>");
             out.println("</body>");
             out.println("</html>");
         }
@@ -71,7 +71,8 @@ public class ProfilServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
+                 .forward(request, response);
     }
 
     /**
diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp
index 71b5650..c83f4d3 100644
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -1,17 +1,16 @@
 <%-- 
     Document   : authentificationJSP
     Created on : 18 oct. 2021, 11:09:26
-    Author     : Chelloug.Eliass
+    Author     : Millot.Thomas
 --%>
 <%@include file="jspf/enteteJSPF.jspf" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
 <%@page import="com.test.forms.AuthentifForm" %>
 
-
 <!-- Affichage du formulaire si l'utilisateur ne s'est pas encore authentifié -->
 <div id="contenu">
     <h2>Merci de vous identifier pour acceder aux dossiers</h2>
-    <form name="frmIdentification" method="POST">  
+    <form name="frmIdentification" method="POST" action="Profil">
         <c:choose>
             <c:when test="${empty param.ztPseudo}">
                 <fieldset><legend>Identification utilisateur</legend>
@@ -38,4 +37,4 @@
     </form>
     <br /><br/>
 </div>
-
+</html>
diff --git a/web/WEB-INF/ModifProfilJSP.jsp b/web/WEB-INF/ModifProfilJSP.jsp
index f85a6a3..b4df2f8 100644
--- a/web/WEB-INF/ModifProfilJSP.jsp
+++ b/web/WEB-INF/ModifProfilJSP.jsp
@@ -1,7 +1,7 @@
 <%-- 
     Document   : ModifProfilJSP
     Created on : 18 oct. 2021, 11:10:01
-    Author     : Chelloug.Eliass
+    Author     : Millot.thomas
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
diff --git a/web/WEB-INF/ProfilJSP.jsp b/web/WEB-INF/ProfilJSP.jsp
index 714de37..9d059b0 100644
--- a/web/WEB-INF/ProfilJSP.jsp
+++ b/web/WEB-INF/ProfilJSP.jsp
@@ -1,25 +1,3 @@
-<%-- 
-    Document   : authentificationJSP
-    Created on : 18 oct. 2021, 11:09:26
-    Author     : Chelloug.Eliass
---%>
-<%@include file="jspf/enteteJSPF.jspf" %>
 <div id="contenu">
-      <h2>Merci de vous identifier pour acceder aux dossiers</h2>
-	<form name="frmIdentification" method="POST" action="Profil">    
-        <fieldset><legend>Identification utilisateur</legend>
-            <br /><br />
-               <label for="nom">Nom du compte</label>
-               <input id="login" 	type="text" 	name="login"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
-            </p>
-            <p>
-                <label for="mdp">Mot de passe</label>
-                <input id="mdp" 	type="password"  name="mdp" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
-            </p><br /><br />
-                <input type="submit" 	name="valider"		value="Valider">
-                <input type="reset" 	name="annuler" 		value="Annuler">
-            </p>
-        </fieldset>
-	</form>
-    <br /><br />
+      <h2>Merci de vous identifier pour acceder aux dossiers</h2>           
 </div>