Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv12325/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
UserForm.java
Log Message:
CMSC-996 validate the Email
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: UserForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UserForm.java 10 May 2008 16:31:49 -0000 1.5
+++ UserForm.java 4 Aug 2008 07:15:10 -0000 1.6
@@ -120,16 +120,22 @@
public ActionErrors validate(ActionMapping actionMapping,
HttpServletRequest httpServletRequest) {
ActionErrors actionErrors = new ActionErrors();
if (account.equals("")) {
- actionErrors.add("account", new
ActionMessage("userform.account.empty"));
+ actionErrors.add("account", new ActionMessage(
+ "userform.account.empty"));
}
if (email.equals("")) {
- actionErrors.add("email", new
ActionMessage("userform.email.empty"));
+ actionErrors
+ .add("email", new
ActionMessage("userform.email.empty"));
}
- if (this.getAction().equalsIgnoreCase(ACTION_ADD)){
+ if(!email.equals("")&&!email.matches("\\w+([-+.]\\w+)[EMAIL
PROTECTED]([-.]\\w+)*\\.\\w+([-.]\\w+)*")){
+ actionErrors.add("email",new
ActionMessage("userform.email.not.regular"));
+ }
+ if (this.getAction().equalsIgnoreCase(ACTION_ADD)) {
validatePassword(actionErrors);
} else {
- if (this.getAction().equalsIgnoreCase(ACTION_EDIT)){
- if (StringUtils.isNotBlank(passwordText) ||
StringUtils.isNotBlank(passwordConfirmation)){
+ if (this.getAction().equalsIgnoreCase(ACTION_EDIT)) {
+ if (StringUtils.isNotBlank(passwordText)
+ ||
StringUtils.isNotBlank(passwordConfirmation)) {
validatePassword(actionErrors);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
