Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java =================================================================== diff -u -raa6023fdecba00eb9a7df76e834e681f7d58462d -r8898e5bee8a79311cf036a79541221cee2d3fc62 --- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision aa6023fdecba00eb9a7df76e834e681f7d58462d) +++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision 8898e5bee8a79311cf036a79541221cee2d3fc62) @@ -61,7 +61,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 -rce3e782fd6844641f7298e09104f8d7554f073ff -r8898e5bee8a79311cf036a79541221cee2d3fc62 --- lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision ce3e782fd6844641f7298e09104f8d7554f073ff) +++ lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision 8898e5bee8a79311cf036a79541221cee2d3fc62) @@ -1,161 +1,140 @@ -<%@ 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" %> +<%@ 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"%> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> - - <fmt:message key="title.forgot.password"/> - - - + if (email == null || email == "") { + alert(""); + return false; + } else if (!filter.test(email)) { + alert(""); + return false; + } else { + document.forgotForm.submit(); + } + } + } + + function radioSelected() { + if (document.forgotForm.selectType[0].checked) { + document.forgotForm.login.disabled = false; + document.forgotForm.email.disabled = true; + } else if (document.forgotForm.selectType[1].checked) { + document.forgotForm.login.disabled = true; + document.forgotForm.email.disabled = false; + } + } + + function submitenter(myfield, e) { + var keycode; + if (window.event) + keycode = window.event.keyCode; + else if (e) + keycode = e.which; + else + return true; + + if (keycode == 13) { + validateForm(); + return false; + } else + return true; + } + -
-
- - - -
-
-

- -

- -

- -

- -

- - - - - - - - - - - - - - - -
-   - - - -
-   - - - -
  - - - - -
-
- -
- - -
+
+ +
+ +
+
+

+ +

- +

+ +

- \ No newline at end of file +

+ +

+ + + + + + + + + + + + + + + +
  +
 
  + + + +
+
+ + +
+ + + +
+ + + + + + + Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r8898e5bee8a79311cf036a79541221cee2d3fc62 --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision ce3e782fd6844641f7298e09104f8d7554f073ff) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 8898e5bee8a79311cf036a79541221cee2d3fc62) @@ -1,12 +1,12 @@ -<%@ 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" %> +<%@ 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"%> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> <% String key = request.getParameter("key"); @@ -16,97 +16,90 @@ - - <fmt:message key="title.forgot.password"/> - - - + + <fmt:message key="title.forgot.password" /> + + + - -
-
- - - -
-
-

- - - - - - - - - - - - - - - -
- : - - -
- : - - -
  - -
-
-
- - - -
+ +
+ +
+ - +
+
+

+ +

- \ No newline at end of file + + + + + + + + + + + + + + +
:
:
  + +
+
+ +
+ + + + +
+ + + + +