Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot 2021-10-19 09:45:57 +02:00
parent 94db0015ee
commit 2d81cde4a8
3 changed files with 12 additions and 9 deletions

View File

@ -24,15 +24,15 @@ public class AuthentifForm {
this.resultat = resultat; this.resultat = resultat;
} }
public boolean controlerAdmin(HttpServletRequest request) { public String AuthentifPompier(HttpServletRequest request) {
String userSaisi = request.getParameter("ztPseudo"); String userSaisi = request.getParameter("ztPseudo");
String mdpSaisi = request.getParameter("ztMDP"); String mdpSaisi = request.getParameter("ztMDP");
String mdpChiffre = MD5.encode(mdpSaisi); String mdpChiffre = MD5.encode(mdpSaisi);
String sql= String sql= "Select login, mdp FROM pompier";
return ; return sql;
} }

View File

@ -75,7 +75,7 @@ public class AuthentifServlet extends HttpServlet {
// Création de l'objet leControle de type AuthentifForm // Création de l'objet leControle de type AuthentifForm
AuthentifForm leControle = new AuthentifForm(); AuthentifForm leControle = new AuthentifForm();
// Appel de la méthode controlerAdmin // Appel de la méthode controlerAdmin
boolean isAdmin = leControle.controlerAdmin(request); String isAdmin = leControle.AuthentifPompier(request);
// Création de 2 attributs de requête (isAdmin et leControle) // Création de 2 attributs de requête (isAdmin et leControle)
request.setAttribute("isAdmin", isAdmin); request.setAttribute("isAdmin", isAdmin);
request.setAttribute("controlForm", leControle); request.setAttribute("controlForm", leControle);

View File

@ -5,10 +5,10 @@
<td style='border :0px;'> <td style='border :0px;'>
<fieldset><legend>Coordonnées Pompier</legend> <fieldset><legend>Coordonnées Pompier</legend>
<table> <table>
<tr><th><label for="nom">Nom :</label><input type="text" name="ztNom" size="20" maxlength="30"></th></tr> <tr><th>Nom :<input type="text" name="ztNom" size="20" maxlength="30"></th></tr>
<tr><th><label for="prenom">Prénom :</label><input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr> <tr><th>Prénom :<input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr>
<tr><th>Adresse :<input type="text" name="ztAdr" size="20" maxlength="30"></th></tr> <tr><th>Adresse :<input type="text" name="ztAdr" size="20" maxlength="30"></th></tr>
<tr><th>Ville :<input type="text" name="ztVille" size="20" maxlength="30"></th></tr> <tr><th>Ville :<input type="text"name="ztVille" size="20" maxlength="30"></th></tr>
<tr><th>Code postal :<input type="text" name="ztCp" size="20" maxlength="30"></th></tr> <tr><th>Code postal :<input type="text" name="ztCp" size="20" maxlength="30"></th></tr>
<tr><th>Téléphone :<input type="text" name="ztTel" size="20" maxlength="30"></th></tr> <tr><th>Téléphone :<input type="text" name="ztTel" size="20" maxlength="30"></th></tr>
<tr><th>Mail :<input type="text" name="ztMail" size="20" maxlength="30"></th></tr> <tr><th>Mail :<input type="text" name="ztMail" size="20" maxlength="30"></th></tr>
@ -24,3 +24,6 @@
<tr><th>Mail employeur : <input type="text" name="ztMailEmp" size="20" maxlength="30"></th></tr> <tr><th>Mail employeur : <input type="text" name="ztMailEmp" size="20" maxlength="30"></th></tr>
</table> </table>
</fieldset> </fieldset>
</td>
</tr>
</table>