Fixed bug in url validation, added documentation

victorjonsson · victorjonsson · commit 1c7a99d0a5e3 · 2012-04-04T17:57:19.000+02:00
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ This plugin was created to minimize javascript logic in the html code when deali
  * **validate_length** — *Validate that input length is in given range (length3-20)*
  * **validate_confirmation**
  * **validate_spamcheck**
+ * **validate_ukvatnumber**
  * **validate_swesec** - *validate swedish social security number*
  * **required** — *no validation except that a value has to be given*
  * **validate_custom** - *Validate value against regexp (validate_custom regexp/^[a-z]{2} [0-9]{2}$/)
@@ -127,6 +128,48 @@ $('#my_form')
   });
 ```
 
+## Localization
+All error dialogs can be overwritten by passing an object into the validation function.
+
+```javascript
+var jQueryFormLang = {
+    errorTitle : 'Form submission failed!',
+    requiredFields : 'You have not answered all required fields',
+    badTime : 'You have not given a correct time',
+    badEmail : 'You have not given a correct e-mail address',
+    badTelephone : 'You have not given a correct phone number',
+    badSecurityAnswer : 'You have not given a correct answer to the security question',
+    badDate : 'You have not given a correct date',
+    toLongStart : 'You have given an answer longer than ',
+    toLongEnd : ' characters',
+    toShortStart : 'You have given an answer shorter than ',
+    toShortEnd : ' characters',
+    badLength : 'You have to give an answer between ',
+    notConfirmed : 'Values could not be confirmed',
+    badDomain : 'Incorrect domain value',
+    badUrl : 'Incorrect url value',
+    badFloat : 'Incorrect float value',
+    badCustomVal : 'You gave an incorrect answer',
+    badInt : 'Incorrect integer value',
+    badSecurityNumber : 'Your social security number was incorrect',
+    badUKVatAnswer : 'Incorrect UK VAT Number'
+};
+```
+
+```html
+<html>
+<head>
+    <script src="scripts/jquery.formvalidator.min.js"></script>
+    <script src="scripts/locale.en.js"></script>
+    ...
+<head>
+<body>
+    ...
+    <form action="script.php" onsubmit="return $(this).validate(jQueryFormLang);">
+    ...
+```
+
+
 ## Simple captcha example
 ```php
 <?php
@@ -167,4 +210,8 @@ $_SESSION['captcha'] = array( mt_rand(0,9), mt_rand(1, 9) );
 ```html
   <p>Password: <input type="password" name="pass" data-validation="validate_confirmation" /></p>
   <p>Confirm password: <input type="password" name="pass_confirmation" /></p>
-```
+```
+
+## Contributors
+[Matt Clements](https://github.com/mattclements)<br />
+[Scott Gonzales](http://projects.scottsplayground.com/iri/)
diff --git a/example.html b/example.html
@@ -8,7 +8,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
-    <script type="text/javascript" src="jquery.formvalidator.js"></script>
+    <script type="text/javascript" src="jquery.formvalidator.min.js"></script>
 
     <link href="style.css" type="text/css" rel="stylesheet"/>
 
@@ -19,8 +19,8 @@ <h1>
         Form validation using jQuery
     </h1>
     <p>
-        <a href="https://github.com/victorjonsson/jQuery-Form-Validator/wiki">
-            https://github.com/victorjonsson/jQuery-Form-Validator/wiki
+        <a href="https://github.com/victorjonsson/jQuery-Form-Validator/">
+            https://github.com/victorjonsson/jQuery-Form-Validator/
         </a>
     </p>
 
diff --git a/jquery.formvalidator.js b/jquery.formvalidator.js
@@ -3,11 +3,10 @@
 * ------------------------------------------
 * Created by Victor Jonsson <http://www.victorjonsson.se>
 * Documentation and issue tracking on Github <https://github.com/victorjonsson/jQuery-Form-Validator/>
-* Available for download at jQuery.com <http://plugins.jquery.com/project/jQueryFormValidtor/>
 *
-* $license Creative Commons Erkännande-DelaLika 3.0 Unported License <http://creativecommons.org/licenses/by-sa/3.0/>
-* $version 1.3.beta
-* $stable 1.2 (https://github.com/victorjonsson/jQuery-Form-Validator/zipball/v1.2)
+* Dual licensed under the MIT or GPL Version 2 licenses
+*
+* $version 1.3
 */
 (function($) {
     $.extend($.fn, {
@@ -35,7 +34,7 @@
          * @return {jQuery}
          */
         showHelpOnFocus : function(attrName) {
-            if(typeof attrName === 'undefined') {
+            if(!attrName) {
                 attrName = 'data-help';
             }
 
@@ -45,7 +44,7 @@
                     $(this)
                         .focus(function() {
                             var $element = $(this);
-                            if($element.parent().find('.jquery_form_help').length === 0) {
+                            if($element.parent().find('.jquery_form_help').length == 0) {
                                 $element.after(
                                       $('<span />')
                                         .addClass('jquery_form_help')
@@ -78,7 +77,7 @@
          * @return {jQuery}
          */
         doValidate : function(language, settings, attachKeyupEvent) {
-            if(typeof attachKeyupEvent === 'undefined') {
+            if(typeof attachKeyupEvent == 'undefined') {
                 attachKeyupEvent = true;
             }
 
@@ -219,7 +218,7 @@
             //
             $form.find('input[type=radio]').each(function() {
                 var validationRule = $(this).attr(config.validationRuleAttribute);
-                if (typeof validationRule !== 'undefined' && validationRule === 'required') {
+                if (typeof validationRule != 'undefined' && validationRule === 'required') {
                     var radioButtonName = $(this).attr('name');
                     var isChecked = false;
                     $form.find('input[name=' + radioButtonName + ']').each(function() {
@@ -242,7 +241,7 @@
                 if (!ignoreInput($(this).attr('name'), $(this).attr('type'))) {
 
                     // memorize border color
-                    if (jQueryFormUtils.defaultBorderColor === null && $(this).attr('type') === 'text') {
+                    if (jQueryFormUtils.defaultBorderColor === null && $(this).attr('type')) {
                         jQueryFormUtils.defaultBorderColor = $(this).css('border-color');
                     }
 
@@ -351,7 +350,7 @@ jQueryFormUtils.validateEmail = function(email) {
     var emailFilter = /^([a-zA-Z0-9_\.\-])+@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
     if(emailFilter.test(email)) {
        var parts = email.split('@');
-       if(parts.length === 2) {
+       if(parts.length == 2) {
            return jQueryFormUtils.validateDomain(parts[1]);
        }
     }
@@ -392,9 +391,9 @@ jQueryFormUtils.validateSwedishMobileNumber = function(number) {
     number = number.replace(/[^0-9]/g, '');
     var begin = number.substring(0, 3);
 
-    if (number.length !== 10 && begin !== '467') {
+    if (number.length != 10 && begin !== '467') {
         return false;
-    } else if (number.length !== 11 && begin === '467') {
+    } else if (number.length != 11 && begin === '467') {
         return false;
     }
     return (/07[0-9{1}]/).test(begin) || (begin === '467' && number.substr(3, 1) === '0');
@@ -711,8 +710,7 @@ jQueryFormUtils.validateDomain = function(val) {
 				'nls');
 				
 				for(var j = 0; j < ukarr.length; j++) {
-					if(ukarr[j] === tld2)
-					{
+					if(ukarr[j] === tld2) {
 						hasTopDomain = true;
 						break;
 					}
@@ -763,7 +761,7 @@ jQueryFormUtils.validateInput = function(el, language, config, form) {
     var value = jQuery.trim(el.val());
     var validationRules = el.attr(config.validationRuleAttribute);
 
-    if (typeof validationRules !== 'undefined' && validationRules !== null) {
+    if (typeof validationRules != 'undefined' && validationRules !== null) {
 
         /**
          * <input data-validation="length12" /> => getAttribute($(element).attr('class'), 'length') = 12
@@ -873,7 +871,7 @@ jQueryFormUtils.validateInput = function(el, language, config, form) {
         }
 
         // confirmation
-        if (validationRules.indexOf('validate_confirmation') > -1 && typeof(form) !== 'undefined') {
+        if (validationRules.indexOf('validate_confirmation') > -1 && typeof(form) != 'undefined') {
             var conf = '';
             var confInput = form.find('input[name=' + el.attr('name') + '_confirmation]').eq(0);
             if (confInput) {
@@ -901,9 +899,9 @@ jQueryFormUtils.LANG =  {
     badTelephone : 'You have not given a correct phone number',
     badSecurityAnswer : 'You have not given a correct answer to the security question',
     badDate : 'You have not given a correct date',
-    toLongStart : 'You have given an answer longer then ',
+    toLongStart : 'You have given an answer longer than ',
     toLongEnd : ' characters',
-    toShortStart : 'You have given an answer shorter then ',
+    toShortStart : 'You have given an answer shorter than ',
     toShortEnd : ' characters',
     badLength : 'You have to give an answer between ',
     notConfirmed : 'Values could not be confirmed',
@@ -924,8 +922,17 @@ jQueryFormUtils.LANG =  {
  * @return {Boolean}
  */
 jQueryFormUtils.validateUrl = function(url) {
-    var urlFilter = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
-    return urlFilter.test(url);
+    // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/ but added support for arrays in the url ?arg[]=sdfsdf
+    var urlFilter = /^(https|http|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|\[|\]|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;
+    if(urlFilter.test(url)) {
+        var domain = url.split(/^https|^http|^ftp/i)[1].replace('://', '');
+        var domainSlashPos = domain.indexOf('/');
+        if(domainSlashPos > -1)
+            domain = domain.substr(0, domainSlashPos);
+
+        return jQueryFormUtils.validateDomain(domain); // todo: add support for IP-addresses
+    }
+    return false;
 };
 
 /**
diff --git a/jquery.formvalidator.min.js b/jquery.formvalidator.min.js
