Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -re0a7b3e91077a48612f883dc740e177efb582d99 --- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision e0a7b3e91077a48612f883dc740e177efb582d99) @@ -62,7 +62,7 @@ private static String EMAIL_SENT = "&emailSent="; @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String method = request.getParameter("method"); if (method.equals("requestEmail")) { Index: lams_central/web/forgotPassword.jsp =================================================================== diff -u -r038b324dcfb10ea96cdaa78b8ce513ae5d11cb14 -re0a7b3e91077a48612f883dc740e177efb582d99 --- lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision 038b324dcfb10ea96cdaa78b8ce513ae5d11cb14) +++ lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision e0a7b3e91077a48612f883dc740e177efb582d99) @@ -1,4 +1,5 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" + contentType="text/html;charset=utf-8"%> <%@page import="org.apache.struts.action.ActionMessages"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> @@ -17,9 +18,9 @@ <fmt:message key="title.forgot.password" /> - - @@ -86,7 +86,8 @@ -
+

@@ -106,30 +107,39 @@
- - + +
-
- +
-
- + - +
Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -r038b324dcfb10ea96cdaa78b8ce513ae5d11cb14 -re0a7b3e91077a48612f883dc740e177efb582d99 --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 038b324dcfb10ea96cdaa78b8ce513ae5d11cb14) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision e0a7b3e91077a48612f883dc740e177efb582d99) @@ -1,4 +1,5 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" + contentType="text/html;charset=utf-8"%> <%@page import="org.apache.struts.action.ActionMessages"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> @@ -8,20 +9,16 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> -<% - String key = request.getParameter("key"); -%> - <fmt:message key="title.forgot.password" /> - - @@ -66,25 +62,31 @@ - - + +

- +
- +
- +