svn commit: r1178333 - /struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl

[mcucchiara]

Author: mcucchiara
Date: Mon Oct  3 08:35:31 2011
New Revision: 1178333

URL: http://svn.apache.org/viewvc?rev=1178333&view=rev
Log:
WW-3688 JavaScript URL validator in the FreeMarker template fails many valid 
URLs

Modified:

struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl?rev=1178333&r1=1178332&r2=1178333&view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/xhtml/form-close-validate.ftl
 Mon Oct  3 08:35:31 2011
@@ -91,7 +91,7 @@ END SNIPPET: supported-validators
 <#if validator.shortCircuit>continueValidation = false;
 }
 <#elseif validator.validatorType = "url">
-if (continueValidation && field.value != null && 
field.value.length > 0 && 
field.value.match(/(^(ftp|http|https):\/\/(\.[_A-Za-z0-9-]+)*(@?([A-Za-z0-9-])+)?(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))(:[0-9]+)?([/A-Za-z0-9?#_-]*)?$)/gi)==null)
 {
+if (continueValidation && field.value != null && 
field.value.length > 0 && 
field.value.match(/^(ftp|http|https):\/\/((%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:])+@)?((%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=])+)(:[0-9]+)?((\/(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@])*)*)(\?(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@/?])*)?(#(%[A-F0-9]{2}|[A-Z0-9-._~!$&'()*+,;=:@/?])*)?$/gi)==null)
 {
 addError(field, error);
 errors = true;
 <#if validator.shortCircuit>continueValidation = false;

[CONF] Confluence Changes in the last 24 hours

[confluence]

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
What is the prefetch limit for edited by  gtully  (12:12 PM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/What+is+the+prefetch+limit+for



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Camel 2.8.1 Release edited by  dkulp  (02:42 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.8.1+Release

Download edited by  dkulp  (02:41 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Download



Apache CXF (https://cwiki.apache.org/confluence/display/CXF)

Pages
-
FAQ edited by  dkulp  (10:09 AM)
https://cwiki.apache.org/confluence/display/CXF/FAQ



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
Servlet Transport edited by  sergey_beryozkin  (05:47 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Servlet+Transport


Comments
https://cwiki.apache.org/confluence/display/CXF20DOC/Servlet+Transport (1)

Apache HCatalog (https://cwiki.apache.org/confluence/display/HCATALOG)

Pages
-
HowToRelease edited by  hashut...@apache.org  (02:41 PM)
https://cwiki.apache.org/confluence/display/HCATALOG/HowToRelease



Apache Jackrabbit (https://cwiki.apache.org/confluence/display/JCR)

Pages
-
Jackrabbit Roadmap edited by  jukka  (09:55 AM)
https://cwiki.apache.org/confluence/display/JCR/Jackrabbit+Roadmap



Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT)

Pages
-
Powered By Mahout edited by  isabel  (09:58 AM)
https://cwiki.apache.org/confluence/display/MAHOUT/Powered+By+Mahout



OODT (https://cwiki.apache.org/confluence/display/OODT)

Pages
-
RADiX Powered By OODT edited by  pramirez  (05:31 PM)
https://cwiki.apache.org/confluence/display/OODT/RADiX+Powered+By+OODT



Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY)

Pages
-
Index edited by  hlship  (01:12 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Index

News edited by  hlship  (01:10 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/News

Tapestry Feedback! created by hlship (01:09 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/2011/10/03/Tapestry+Feedback%21



Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET)

Pages
-
Wicket Blogs edited by  martin.dil...@googlemail.com  (09:49 AM)
https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs



Apache Wookie (https://cwiki.apache.org/confluence/display/WOOKIE)

Pages
-
Using Wookie's W3C Widget Parser in other Applications edited by  scottbw  
(08:17 AM)
https://cwiki.apache.org/confluence/display/WOOKIE/Using+Wookie%27s+W3C+Widget+Parser+in+other+Applications



Apache Zookeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER)

Pages
-
PoweredBy edited by  alek  (08:57 PM)
https://cwiki.apache.org/confluence/display/ZOOKEEPER/PoweredBy




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action