Index: lams_central/web/forgotPassword.jsp =================================================================== diff -u -r8e454f8298f642d44db16ee5ade01b0c0afde504 -r9004121c5aab7ccdf967fa5ceef247c8950e92f8 --- lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision 8e454f8298f642d44db16ee5ade01b0c0afde504) +++ lams_central/web/forgotPassword.jsp (.../forgotPassword.jsp) (revision 9004121c5aab7ccdf967fa5ceef247c8950e92f8) @@ -21,52 +21,83 @@ function toHome() {window.location="index.do";}; - function validateForm() { - var login = document.getElementById("login").value; - var email = document.getElementById("email").value; - var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; - - if (login == null || login=="" || email == null || email =="") + if (document.forgotForm.selectType[0].checked) { - alert(''); + var login = document.forgotForm.login.value; + if (login == null || login=="") + { + alert(''); + return false; + } + else + { + document.forgotForm.submit(); + } } - else if (!filter.test(email)) + else if (document.forgotForm.selectType[1].checked) { - alert(''); - return false; + var email = document.forgotForm.email.value; + var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; + + 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 + else if (document.forgotForm.selectType[1].checked) { - document.forgotForm.submit(); + 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; - } + { + 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; + } + + //--> - +
@@ -82,21 +113,21 @@ +   + - - - + + +
- : -
- : - - - -
+   + + + +