diff --git a/WEB-INF/src/controleur/Account.java b/WEB-INF/src/controleur/Account.java index 0b3f5594b5d79182e1c49fce9f60a890ce668c0a..d210ac9f13e7b37f2bcfd46780ebfceb9dd55c62 100644 --- a/WEB-INF/src/controleur/Account.java +++ b/WEB-INF/src/controleur/Account.java @@ -68,7 +68,7 @@ public class Account extends HttpServlet{ break; default: req.setAttribute("error", "Ne changez pas l'url vous même!"); - req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); + req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp); return; } } diff --git a/WEB-INF/src/controleur/Authent.java b/WEB-INF/src/controleur/Authent.java index b5a68e5792d7f89f4c906abd6a2272aa89be77fb..73c0c8e5f0f7d201aeed03542ceb4be7ce291dcd 100644 --- a/WEB-INF/src/controleur/Authent.java +++ b/WEB-INF/src/controleur/Authent.java @@ -18,9 +18,15 @@ public class Authent extends HttpServlet { protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { DaoUser daoUser = new DaoUser(); String action = req.getParameter("action"); - String username = req.getParameter("username").toLowerCase(); + String username = req.getParameter("username"); String password = req.getParameter("password"); + if(username == null || password == null){ + req.setAttribute("error", "Vous ne pouvez pas avoir un pseudo ou mot de passe vide !"); + req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp); + return; + } String hashedPassword; + username = username.toLowerCase(); MessageDigest md; this.getServletContext(); @@ -49,6 +55,7 @@ public class Authent extends HttpServlet { return; } else { req.setAttribute("error", "Identifiant ou mot de passe incorrect"); + req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); } break; diff --git a/WEB-INF/src/controleur/Navigation.java b/WEB-INF/src/controleur/Navigation.java index cdbf5df594b3ac4c18cd2a1baa02e35b84ee193b..23827ae6e31acbb2f389657edd004f594e1088ca 100644 --- a/WEB-INF/src/controleur/Navigation.java +++ b/WEB-INF/src/controleur/Navigation.java @@ -45,8 +45,8 @@ public class Navigation extends HttpServlet{ break; default: req.setAttribute("error", "Ne changez pas l'url vous même!"); - req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); - return; + vue = "/WEB-INF/vue/error.jsp"; + break; } req.getRequestDispatcher(vue).forward(req, resp); diff --git a/WEB-INF/src/controleur/ThreadController.java b/WEB-INF/src/controleur/ThreadController.java index 68c197a858cb36cc2816781f67d94123fc72cbd6..f0da83cf55279cabeba3f7cf4fd7a2dd6c1469e6 100644 --- a/WEB-INF/src/controleur/ThreadController.java +++ b/WEB-INF/src/controleur/ThreadController.java @@ -45,7 +45,7 @@ public class ThreadController extends HttpServlet { if(daoThread.findById(idThread) == null){ req.setAttribute("error", "Ne changez pas l'url vous même!"); - req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); + req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp); return; } @@ -55,7 +55,7 @@ public class ThreadController extends HttpServlet { case "follow": if(daoFollower.checkFollowerExist(follow)){ req.setAttribute("error", "Vous suivez déjà ce fils"); - req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); + req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp); return ; } daoFollower.create(follow); @@ -85,8 +85,8 @@ public class ThreadController extends HttpServlet { break; default: req.setAttribute("error", "Ne changez pas l'url vous même!"); - req.getRequestDispatcher("/WEB-INF/vue/error.jsp"); - return; + vue = "/WEB-INF/vue/error.jsp"; + break; } req.getRequestDispatcher(vue).forward(req, resp); } diff --git a/WEB-INF/vue/compte.jsp b/WEB-INF/vue/compte.jsp index 24c468cdea6049f0b3e4a8e1c513bd744ed241e1..941ee795a8ab9a6ba845ef0a389fe7a689ebc4f8 100644 --- a/WEB-INF/vue/compte.jsp +++ b/WEB-INF/vue/compte.jsp @@ -95,8 +95,8 @@ <input class="form-control" name="lastname" type="text" value="<%= user.getLastname() %>" maxlength="50"> </div> </div> - <div class="mt-5 d-flex flex-column justify-content-center"> - <input class="btn btn-primary flex-fill" type="submit" value="Mettre à jour mes informations"> + <div class="mt-5 d-flex justify-content-center"> + <input class="btn btn-primary" type="submit" value="Mettre à jour mes informations"> </div> </form> </div>