You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by tm...@apache.org on 2006/04/01 14:50:17 UTC
svn commit: r390663 -
/incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl
Author: tmjee
Date: Sat Apr 1 04:50:14 2006
New Revision: 390663
URL: http://svn.apache.org/viewcvs?rev=390663&view=rev
Log:
xw-371
Modified:
incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl
Modified: incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl?rev=390663&r1=390662&r2=390663&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl (original)
+++ incubator/webwork2/src/java/template/xhtml/form-close-validate.ftl Sat Apr 1 04:50:14 2006
@@ -68,7 +68,8 @@
errors = true;
}
<#elseif validator.validatorType = "url">
- if (field.value != null && field.value.length > 0 && field.value.match(/^((file:\/\/\S+)|(ftp|http|https):\/\/\S+\.(com|net|org|info|edu|mil|gov|biz|ws|us|tv|cc|aero|arpa|coop|int|jobs|museum|name|pro|travel|nato|.{2,2}))$/ig) == null) {
+ <#--if (field.value != null && field.value.length > 0 && field.value.match(/^\S+@\S+\.(com|net|org|info|edu|mil|gov|biz|ws|us|tv|cc|aero|arpa|coop|int|jobs|museum|name|pro|travel|nato|.{2,2})$/gi) == null) { -->
+ if (field.value != null && field.value.length > 0 && field.value.match(/(^[_A-Za-z0-9-]+(\.[_A-Za-z0-9-]+)*@([A-Za-z0-9-])+(\.[A-Za-z0-9-]+)*((\.com)|(\.net)|(\.org)|(\.info)|(\.edu)|(\.mil)|(\.gov)|(\.biz)|(\.ws)|(\.us)|(\.tv)|(\.cc)|(\.aero)|(\.arpa)|(\.coop)|(\.int)|(\.jobs)|(\.museum)|(\.name)|(\.pro)|(\.travel)|(\.nato)|(\.[A-Za-z0-9]{2,3})|(\.[A-Za-z0-9]{2,3}\.[A-Za-z0-9]{2,3}))$)/gi) == null) {
addError(field, error);
errors = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org