Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -r6825a5272d3a48f8cafa370b0e0107cc9077cff6 -r87b69b432f9b2639bceb4e418cf889097a6c919c --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 6825a5272d3a48f8cafa370b0e0107cc9077cff6) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 87b69b432f9b2639bceb4e418cf889097a6c919c) @@ -32,69 +32,65 @@ }; var mustHaveUppercase = ${mustHaveUppercase}, - mustHaveNumerics = ${mustHaveNumerics}, - mustHaveLowercase = ${mustHaveLowercase}, - mustHaveSymbols = ${mustHaveSymbols}; + mustHaveNumerics = ${mustHaveNumerics}, + mustHaveLowercase = ${mustHaveLowercase}, + mustHaveSymbols = ${mustHaveSymbols}; - $.validator.addMethod("pwcheck", function(value) { - return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters - (!mustHaveNumerics || /\d/.test(value)) && // has a digit - (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case - (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols - }); + $.validator.addMethod("pwcheck", function(value) { + return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters + (!mustHaveNumerics || /\d/.test(value)) && // has a digit + (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case + (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols + }); - $.validator - .addMethod( - "charactersAllowed", - function(value) { - return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/ - .test(value) + $.validator.addMethod( + "charactersAllowed", + function(value) { + return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/ + .test(value) + } + ); - }); - $(function() { // Setup form validation - $("form[name='changePass']") - .validate( - { - debug : true, - errorClass : 'help-block', - // validation rules - rules : { - newPassword : { - required : true, - minlength : , - maxlength : 25, - charactersAllowed : true, - pwcheck : true - }, - confirmNewPassword : { - required : true, - equalTo : "#newPassword" - } - }, + $("form[name='changePass']").validate({ + debug : true, + errorClass : 'help-block', + // validation rules + rules : { + newPassword : { + required : true, + minlength : , + maxlength : 25, + charactersAllowed : true, + pwcheck : true + }, + confirmNewPassword : { + required : true, + equalTo : "#newPassword" + } + }, - // Specify the validation error messages - messages : { - newPassword : { - required : "", - minlength : "", - maxlength : "", - charactersAllowed : " ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /", - pwcheck : "" - }, - confirmNewPassword : { - required : "", - equalTo : "" - }, - }, + // Specify the validation error messages + messages : { + newPassword : { + required : "", + minlength : "", + maxlength : "", + charactersAllowed : " ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /", + pwcheck : "" + }, + confirmNewPassword : { + required : "", + equalTo : "" + }, + }, - submitHandler : function(form) { - document.changePass.submit(); - } - }); - + submitHandler : function(form) { + document.changePass.submit(); + } + }); });