litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-638 Check in first phase of changes to the Login form and backend.

Browse source
This commit is contained in:
jeb228 2010-07-07 19:35:46 +00:00
parent 2253f889ed
commit 74c7660321
12 changed files with 999 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

38
webapp/web/siteAdmin/siteAdminScripts.jsp
View file

@ -13,14 +13,10 @@ function isValidLogin( theForm ) {
theForm.loginName.focus();
return false;
}
if ( isEmptyOrWrongLength( theForm.loginPassword.value)) {
if ( isEmptyPassword( theForm.loginPassword.value)) {
theForm.loginPassword.focus();
return false;
}
//alert("theForm.loginPassword.value=" + theForm.loginPassword.value );
theForm.loginPassword.value = calcMD5( theForm.loginPassword.value );
//alert("theForm.loginPassword.value=" + theForm.loginPassword.value );
return true;
}
@ -32,15 +28,39 @@ function isEmpty( aStr ) {
return false;
}
function isEmptyOrWrongLength( aStr ) {
function isEmptyPassword( aStr ) {
if ( aStr.length == 0 ) {
alert("Please enter a password to log in");
return true;
} else if ( aStr.length < <%=User.MIN_PASSWORD_LENGTH%> || aStr.length > <%=User.MAX_PASSWORD_LENGTH%>) {
alert("Please enter a password between 6 and 12 characters long");
return true;
}
return false;
}
function isReasonableNewPassword( theForm ) {
if ( isWrongLengthPassword( theForm.newPassword.value)) {
theForm.newPassword.focus();
return false;
}
if ( isMismatchedPasswords( theForm.newPassword.value, theForm.confirmPassword.value)) {
theForm.newPassword.focus();
return false;
}
}
function isWrongLengthPassword( aStr ) {
if ( aStr.length < <%=User.MIN_PASSWORD_LENGTH%> || aStr.length > <%=User.MAX_PASSWORD_LENGTH%>) {
alert("Please enter a password between <%=User.MIN_PASSWORD_LENGTH%> and <%=User.MAX_PASSWORD_LENGTH%> characters long");
return true;
}
return false;
}
function isMismatchedPasswords( one, two ) {
if ( one != two ) {
alert("Passwords do not match");
return true;
}
return false;
}
//Give initial focus to the password or username field