Modified: 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/plugins/validate/additional-methods.js
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/plugins/validate/additional-methods.js?rev=1815824&r1=1815823&r2=1815824&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/plugins/validate/additional-methods.js
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/plugins/validate/additional-methods.js
 Mon Nov 20 17:35:27 2017
@@ -1,148 +1,509 @@
 /*!
- * jQuery Validation Plugin 1.11.1
+ * jQuery Validation Plugin v1.17.0
  *
- * http://bassistance.de/jquery-plugins/jquery-plugin-validation/
- * http://docs.jquery.com/Plugins/Validation
+ * https://jqueryvalidation.org/
  *
- * Copyright 2013 Jörn Zaefferer
- * Released under the MIT license:
- *   http://www.opensource.org/licenses/mit-license.php
+ * Copyright (c) 2017 Jörn Zaefferer
+ * Released under the MIT license
  */
+(function( factory ) {
+       if ( typeof define === "function" && define.amd ) {
+               define( ["jquery", "./jquery.validate"], factory );
+       } else if (typeof module === "object" && module.exports) {
+               module.exports = factory( require( "jquery" ) );
+       } else {
+               factory( jQuery );
+       }
+}(function( $ ) {
+
+( function() {
 
-(function() {
+       function stripHtml( value ) {
 
-       function stripHtml(value) {
-               // remove html tags and space chars
-               return value.replace(/<.[^<>]*?>/g, ' 
').replace(/&nbsp;|&#160;/gi, ' ')
-               // remove punctuation
-               .replace(/[.(),;:!?%#$'"_+=\/\-]*/g,'');
+               // Remove html tags and space chars
+               return value.replace( /<.[^<>]*?>/g, " " ).replace( 
/&nbsp;|&#160;/gi, " " )
+
+               // Remove punctuation
+               .replace( /[.(),;:!?%#$'\"_+=\/\-“”’]*/g, "" );
        }
-       jQuery.validator.addMethod("maxWords", function(value, element, params) 
{
-               return this.optional(element) || 
stripHtml(value).match(/\b\w+\b/g).length <= params;
-       }, jQuery.validator.format("Please enter {0} words or less."));
 
-       jQuery.validator.addMethod("minWords", function(value, element, params) 
{
-               return this.optional(element) || 
stripHtml(value).match(/\b\w+\b/g).length >= params;
-       }, jQuery.validator.format("Please enter at least {0} words."));
+       $.validator.addMethod( "maxWords", function( value, element, params ) {
+               return this.optional( element ) || stripHtml( value ).match( 
/\b\w+\b/g ).length <= params;
+       }, $.validator.format( "Please enter {0} words or less." ) );
+
+       $.validator.addMethod( "minWords", function( value, element, params ) {
+               return this.optional( element ) || stripHtml( value ).match( 
/\b\w+\b/g ).length >= params;
+       }, $.validator.format( "Please enter at least {0} words." ) );
+
+       $.validator.addMethod( "rangeWords", function( value, element, params ) 
{
+               var valueStripped = stripHtml( value ),
+                       regex = /\b\w+\b/g;
+               return this.optional( element ) || valueStripped.match( regex 
).length >= params[ 0 ] && valueStripped.match( regex ).length <= params[ 1 ];
+       }, $.validator.format( "Please enter between {0} and {1} words." ) );
+
+}() );
+
+// Accept a value from a file input based on a required mimetype
+$.validator.addMethod( "accept", function( value, element, param ) {
+
+       // Split mime on commas in case we have multiple types we can accept
+       var typeParam = typeof param === "string" ? param.replace( /\s/g, "" ) 
: "image/*",
+               optionalValue = this.optional( element ),
+               i, file, regex;
+
+       // Element is optional
+       if ( optionalValue ) {
+               return optionalValue;
+       }
 
-       jQuery.validator.addMethod("rangeWords", function(value, element, 
params) {
-               var valueStripped = stripHtml(value);
-               var regex = /\b\w+\b/g;
-               return this.optional(element) || 
valueStripped.match(regex).length >= params[0] && 
valueStripped.match(regex).length <= params[1];
-       }, jQuery.validator.format("Please enter between {0} and {1} words."));
+       if ( $( element ).attr( "type" ) === "file" ) {
 
-}());
+               // Escape string to be used in the regex
+               // see: 
https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
+               // Escape also "/*" as "/.*" as a wildcard
+               typeParam = typeParam
+                               .replace( /[\-\[\]\/\{\}\(\)\+\?\.\\\^\$\|]/g, 
"\\$&" )
+                               .replace( /,/g, "|" )
+                               .replace( /\/\*/g, "/.*" );
 
-jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) {
-       return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value);
-}, "Letters or punctuation only please");
+               // Check if the element has a FileList before checking each file
+               if ( element.files && element.files.length ) {
+                       regex = new RegExp( ".?(" + typeParam + ")$", "i" );
+                       for ( i = 0; i < element.files.length; i++ ) {
+                               file = element.files[ i ];
 
-jQuery.validator.addMethod("alphanumeric", function(value, element) {
-       return this.optional(element) || /^\w+$/i.test(value);
-}, "Letters, numbers, and underscores only please");
+                               // Grab the mimetype from the loaded file, 
verify it matches
+                               if ( !file.type.match( regex ) ) {
+                                       return false;
+                               }
+                       }
+               }
+       }
 
-jQuery.validator.addMethod("lettersonly", function(value, element) {
-       return this.optional(element) || /^[a-z]+$/i.test(value);
-}, "Letters only please");
+       // Either return true because we've validated each file, or because the
+       // browser does not support element.files and the FileList feature
+       return true;
+}, $.validator.format( "Please enter a value with a valid mimetype." ) );
 
-jQuery.validator.addMethod("nowhitespace", function(value, element) {
-       return this.optional(element) || /^\S+$/i.test(value);
-}, "No white space please");
+$.validator.addMethod( "alphanumeric", function( value, element ) {
+       return this.optional( element ) || /^\w+$/i.test( value );
+}, "Letters, numbers, and underscores only please" );
 
-jQuery.validator.addMethod("ziprange", function(value, element) {
-       return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value);
-}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx");
+/*
+ * Dutch bank account numbers (not 'giro' numbers) have 9 digits
+ * and pass the '11 check'.
+ * We accept the notation with spaces, as that is common.
+ * acceptable: 123456789 or 12 34 56 789
+ */
+$.validator.addMethod( "bankaccountNL", function( value, element ) {
+       if ( this.optional( element ) ) {
+               return true;
+       }
+       if ( !( /^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test( value ) ) ) {
+               return false;
+       }
 
-jQuery.validator.addMethod("zipcodeUS", function(value, element) {
-       return this.optional(element) || /\d{5}-\d{4}$|^\d{5}$/.test(value);
-}, "The specified US ZIP Code is invalid");
+       // Now '11 check'
+       var account = value.replace( / /g, "" ), // Remove spaces
+               sum = 0,
+               len = account.length,
+               pos, factor, digit;
+       for ( pos = 0; pos < len; pos++ ) {
+               factor = len - pos;
+               digit = account.substring( pos, pos + 1 );
+               sum = sum + factor * digit;
+       }
+       return sum % 11 === 0;
+}, "Please specify a valid bank account number" );
 
-jQuery.validator.addMethod("integer", function(value, element) {
-       return this.optional(element) || /^-?\d+$/.test(value);
-}, "A positive or negative non-decimal number please");
+$.validator.addMethod( "bankorgiroaccountNL", function( value, element ) {
+       return this.optional( element ) ||
+                       ( $.validator.methods.bankaccountNL.call( this, value, 
element ) ) ||
+                       ( $.validator.methods.giroaccountNL.call( this, value, 
element ) );
+}, "Please specify a valid bank or giro account number" );
 
 /**
- * Return true, if the value is a valid vehicle identification number (VIN).
+ * BIC is the business identifier code (ISO 9362). This BIC check is not a 
guarantee for authenticity.
  *
- * Works with all kind of text inputs.
+ * BIC pattern: BBBBCCLLbbb (8 or 11 characters long; bbb is optional)
  *
- * @example <input type="text" size="20" name="VehicleID" 
class="{required:true,vinUS:true}" />
- * @desc Declares a required input element whose value must be a valid vehicle 
identification number.
+ * Validation is case-insensitive. Please make sure to normalize input 
yourself.
  *
- * @name jQuery.validator.methods.vinUS
- * @type Boolean
- * @cat Plugins/Validate/Methods
+ * BIC definition in detail:
+ * - First 4 characters - bank code (only letters)
+ * - Next 2 characters - ISO 3166-1 alpha-2 country code (only letters)
+ * - Next 2 characters - location code (letters and digits)
+ *   a. shall not start with '0' or '1'
+ *   b. second character must be a letter ('O' is not allowed) or digit ('0' 
for test (therefore not allowed), '1' denoting passive participant, '2' 
typically reverse-billing)
+ * - Last 3 characters - branch code, optional (shall not start with 'X' 
except in case of 'XXX' for primary office) (letters and digits)
  */
-jQuery.validator.addMethod("vinUS", function(v) {
-       if (v.length !== 17) {
+$.validator.addMethod( "bic", function( value, element ) {
+    return this.optional( element ) || 
/^([A-Z]{6}[A-Z2-9][A-NP-Z1-9])(X{3}|[A-WY-Z0-9][A-Z0-9]{2})?$/.test( 
value.toUpperCase() );
+}, "Please specify a valid BIC code" );
+
+/*
+ * Código de identificación fiscal ( CIF ) is the tax identification code 
for Spanish legal entities
+ * Further rules can be found in Spanish on 
http://es.wikipedia.org/wiki/C%C3%B3digo_de_identificaci%C3%B3n_fiscal
+ *
+ * Spanish CIF structure:
+ *
+ * [ T ][ P ][ P ][ N ][ N ][ N ][ N ][ N ][ C ]
+ *
+ * Where:
+ *
+ * T: 1 character. Kind of Organization Letter: [ABCDEFGHJKLMNPQRSUVW]
+ * P: 2 characters. Province.
+ * N: 5 characters. Secuencial Number within the province.
+ * C: 1 character. Control Digit: [0-9A-J].
+ *
+ * [ T ]: Kind of Organizations. Possible values:
+ *
+ *   A. Corporations
+ *   B. LLCs
+ *   C. General partnerships
+ *   D. Companies limited partnerships
+ *   E. Communities of goods
+ *   F. Cooperative Societies
+ *   G. Associations
+ *   H. Communities of homeowners in horizontal property regime
+ *   J. Civil Societies
+ *   K. Old format
+ *   L. Old format
+ *   M. Old format
+ *   N. Nonresident entities
+ *   P. Local authorities
+ *   Q. Autonomous bodies, state or not, and the like, and congregations and 
religious institutions
+ *   R. Congregations and religious institutions (since 2008 ORDER 
EHA/451/2008)
+ *   S. Organs of State Administration and regions
+ *   V. Agrarian Transformation
+ *   W. Permanent establishments of non-resident in Spain
+ *
+ * [ C ]: Control Digit. It can be a number or a letter depending on T value:
+ * [ T ]  -->  [ C ]
+ * ------    ----------
+ *   A         Number
+ *   B         Number
+ *   E         Number
+ *   H         Number
+ *   K         Letter
+ *   P         Letter
+ *   Q         Letter
+ *   S         Letter
+ *
+ */
+$.validator.addMethod( "cifES", function( value, element ) {
+       "use strict";
+
+       if ( this.optional( element ) ) {
+               return true;
+       }
+
+       var cifRegEx = new RegExp( 
/^([ABCDEFGHJKLMNPQRSUVW])(\d{7})([0-9A-J])$/gi );
+       var letter  = value.substring( 0, 1 ), // [ T ]
+               number  = value.substring( 1, 8 ), // [ P ][ P ][ N ][ N ][ N 
][ N ][ N ]
+               control = value.substring( 8, 9 ), // [ C ]
+               all_sum = 0,
+               even_sum = 0,
+               odd_sum = 0,
+               i, n,
+               control_digit,
+               control_letter;
+
+       function isOdd( n ) {
+               return n % 2 === 0;
+       }
+
+       // Quick format test
+       if ( value.length !== 9 || !cifRegEx.test( value ) ) {
                return false;
        }
-       var i, n, d, f, cd, cdv;
-       var LL = 
["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
-       var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
-       var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
-       var rs = 0;
-       for(i = 0; i < 17; i++){
-               f = FL[i];
-               d = v.slice(i,i+1);
-               if (i === 8) {
-                       cdv = d;
-               }
-               if (!isNaN(d)) {
-                       d *= f;
+
+       for ( i = 0; i < number.length; i++ ) {
+               n = parseInt( number[ i ], 10 );
+
+               // Odd positions
+               if ( isOdd( i ) ) {
+
+                       // Odd positions are multiplied first.
+                       n *= 2;
+
+                       // If the multiplication is bigger than 10 we need to 
adjust
+                       odd_sum += n < 10 ? n : n - 9;
+
+               // Even positions
+               // Just sum them
                } else {
-                       for (n = 0; n < LL.length; n++) {
-                               if (d.toUpperCase() === LL[n]) {
-                                       d = VL[n];
-                                       d *= f;
-                                       if (isNaN(cdv) && n === 8) {
-                                               cdv = LL[n];
-                                       }
-                                       break;
-                               }
+                       even_sum += n;
+               }
+       }
+
+       all_sum = even_sum + odd_sum;
+       control_digit = ( 10 - ( all_sum ).toString().substr( -1 ) ).toString();
+       control_digit = parseInt( control_digit, 10 ) > 9 ? "0" : control_digit;
+       control_letter = "JABCDEFGHI".substr( control_digit, 1 ).toString();
+
+       // Control must be a digit
+       if ( letter.match( /[ABEH]/ ) ) {
+               return control === control_digit;
+
+       // Control must be a letter
+       } else if ( letter.match( /[KPQS]/ ) ) {
+               return control === control_letter;
+       }
+
+       // Can be either
+       return control === control_digit || control === control_letter;
+
+}, "Please specify a valid CIF number." );
+
+/*
+ * Brazillian CPF number (Cadastrado de Pessoas Físicas) is the equivalent of 
a Brazilian tax registration number.
+ * CPF numbers have 11 digits in total: 9 numbers followed by 2 check numbers 
that are being used for validation.
+ */
+$.validator.addMethod( "cpfBR", function( value ) {
+
+       // Removing special characters from value
+       value = value.replace( /([~!@#$%^&*()_+=`{}\[\]\-|\\:;'<>,.\/? ])+/g, 
"" );
+
+       // Checking value to have 11 digits only
+       if ( value.length !== 11 ) {
+               return false;
+       }
+
+       var sum = 0,
+               firstCN, secondCN, checkResult, i;
+
+       firstCN = parseInt( value.substring( 9, 10 ), 10 );
+       secondCN = parseInt( value.substring( 10, 11 ), 10 );
+
+       checkResult = function( sum, cn ) {
+               var result = ( sum * 10 ) % 11;
+               if ( ( result === 10 ) || ( result === 11 ) ) {
+                       result = 0;
+               }
+               return ( result === cn );
+       };
+
+       // Checking for dump data
+       if ( value === "" ||
+               value === "00000000000" ||
+               value === "11111111111" ||
+               value === "22222222222" ||
+               value === "33333333333" ||
+               value === "44444444444" ||
+               value === "55555555555" ||
+               value === "66666666666" ||
+               value === "77777777777" ||
+               value === "88888888888" ||
+               value === "99999999999"
+       ) {
+               return false;
+       }
+
+       // Step 1 - using first Check Number:
+       for ( i = 1; i <= 9; i++ ) {
+               sum = sum + parseInt( value.substring( i - 1, i ), 10 ) * ( 11 
- i );
+       }
+
+       // If first Check Number (CN) is valid, move to Step 2 - using second 
Check Number:
+       if ( checkResult( sum, firstCN ) ) {
+               sum = 0;
+               for ( i = 1; i <= 10; i++ ) {
+                       sum = sum + parseInt( value.substring( i - 1, i ), 10 ) 
* ( 12 - i );
+               }
+               return checkResult( sum, secondCN );
+       }
+       return false;
+
+}, "Please specify a valid CPF number" );
+
+// https://jqueryvalidation.org/creditcard-method/
+// based on https://en.wikipedia.org/wiki/Luhn_algorithm
+$.validator.addMethod( "creditcard", function( value, element ) {
+       if ( this.optional( element ) ) {
+               return "dependency-mismatch";
+       }
+
+       // Accept only spaces, digits and dashes
+       if ( /[^0-9 \-]+/.test( value ) ) {
+               return false;
+       }
+
+       var nCheck = 0,
+               nDigit = 0,
+               bEven = false,
+               n, cDigit;
+
+       value = value.replace( /\D/g, "" );
+
+       // Basing min and max length on
+       // https://developer.ean.com/general_info/Valid_Credit_Card_Types
+       if ( value.length < 13 || value.length > 19 ) {
+               return false;
+       }
+
+       for ( n = value.length - 1; n >= 0; n-- ) {
+               cDigit = value.charAt( n );
+               nDigit = parseInt( cDigit, 10 );
+               if ( bEven ) {
+                       if ( ( nDigit *= 2 ) > 9 ) {
+                               nDigit -= 9;
                        }
                }
-               rs += d;
+
+               nCheck += nDigit;
+               bEven = !bEven;
        }
-       cd = rs % 11;
-       if (cd === 10) {
-               cd = "X";
+
+       return ( nCheck % 10 ) === 0;
+}, "Please enter a valid credit card number." );
+
+/* NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
+ * Redistributed under the the Apache License 2.0 at 
http://www.apache.org/licenses/LICENSE-2.0
+ * Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, 
unknown, all (overrides all other settings)
+ */
+$.validator.addMethod( "creditcardtypes", function( value, element, param ) {
+       if ( /[^0-9\-]+/.test( value ) ) {
+               return false;
+       }
+
+       value = value.replace( /\D/g, "" );
+
+       var validTypes = 0x0000;
+
+       if ( param.mastercard ) {
+               validTypes |= 0x0001;
+       }
+       if ( param.visa ) {
+               validTypes |= 0x0002;
+       }
+       if ( param.amex ) {
+               validTypes |= 0x0004;
+       }
+       if ( param.dinersclub ) {
+               validTypes |= 0x0008;
        }
-       if (cd === cdv) {
+       if ( param.enroute ) {
+               validTypes |= 0x0010;
+       }
+       if ( param.discover ) {
+               validTypes |= 0x0020;
+       }
+       if ( param.jcb ) {
+               validTypes |= 0x0040;
+       }
+       if ( param.unknown ) {
+               validTypes |= 0x0080;
+       }
+       if ( param.all ) {
+               validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 
0x0020 | 0x0040 | 0x0080;
+       }
+       if ( validTypes & 0x0001 && /^(5[12345])/.test( value ) ) { // 
Mastercard
+               return value.length === 16;
+       }
+       if ( validTypes & 0x0002 && /^(4)/.test( value ) ) { // Visa
+               return value.length === 16;
+       }
+       if ( validTypes & 0x0004 && /^(3[47])/.test( value ) ) { // Amex
+               return value.length === 15;
+       }
+       if ( validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test( value ) ) { // 
Dinersclub
+               return value.length === 14;
+       }
+       if ( validTypes & 0x0010 && /^(2(014|149))/.test( value ) ) { // Enroute
+               return value.length === 15;
+       }
+       if ( validTypes & 0x0020 && /^(6011)/.test( value ) ) { // Discover
+               return value.length === 16;
+       }
+       if ( validTypes & 0x0040 && /^(3)/.test( value ) ) { // Jcb
+               return value.length === 16;
+       }
+       if ( validTypes & 0x0040 && /^(2131|1800)/.test( value ) ) { // Jcb
+               return value.length === 15;
+       }
+       if ( validTypes & 0x0080 ) { // Unknown
                return true;
        }
        return false;
-}, "The specified vehicle identification number (VIN) is invalid.");
+}, "Please enter a valid credit card number." );
+
+/**
+ * Validates currencies with any given symbols by @jameslouiz
+ * Symbols can be optional or required. Symbols required by default
+ *
+ * Usage examples:
+ *  currency: ["£", false] - Use false for soft currency validation
+ *  currency: ["$", false]
+ *  currency: ["RM", false] - also works with text based symbols such as "RM" 
- Malaysia Ringgit etc
+ *
+ *  <input class="currencyInput" name="currencyInput">
+ *
+ * Soft symbol checking
+ *  currencyInput: {
+ *     currency: ["$", false]
+ *  }
+ *
+ * Strict symbol checking (default)
+ *  currencyInput: {
+ *     currency: "$"
+ *     //OR
+ *     currency: ["$", true]
+ *  }
+ *
+ * Multiple Symbols
+ *  currencyInput: {
+ *     currency: "$,£,¢"
+ *  }
+ */
+$.validator.addMethod( "currency", function( value, element, param ) {
+    var isParamString = typeof param === "string",
+        symbol = isParamString ? param : param[ 0 ],
+        soft = isParamString ? true : param[ 1 ],
+        regex;
+
+    symbol = symbol.replace( /,/g, "" );
+    symbol = soft ? symbol + "]" : symbol + "]?";
+    regex = "^[" + symbol + 
"([1-9]{1}[0-9]{0,2}(\\,[0-9]{3})*(\\.[0-9]{0,2})?|[1-9]{1}[0-9]{0,}(\\.[0-9]{0,2})?|0(\\.[0-9]{0,2})?|(\\.[0-9]{1,2})?)$";
+    regex = new RegExp( regex );
+    return this.optional( element ) || regex.test( value );
+
+}, "Please specify a valid currency" );
+
+$.validator.addMethod( "dateFA", function( value, element ) {
+       return this.optional( element ) || 
/^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(
 value );
+}, $.validator.messages.date );
 
 /**
  * Return true, if the value is a valid date, also making this formal check 
dd/mm/yyyy.
  *
- * @example jQuery.validator.methods.date("01/01/1900")
+ * @example $.validator.methods.date("01/01/1900")
  * @result true
  *
- * @example jQuery.validator.methods.date("01/13/1990")
+ * @example $.validator.methods.date("01/13/1990")
  * @result false
  *
- * @example jQuery.validator.methods.date("01.01.1900")
+ * @example $.validator.methods.date("01.01.1900")
  * @result false
  *
  * @example <input name="pippo" class="{dateITA:true}" />
  * @desc Declares an optional input element whose value must be a valid date.
  *
- * @name jQuery.validator.methods.dateITA
+ * @name $.validator.methods.dateITA
  * @type Boolean
  * @cat Plugins/Validate/Methods
  */
-jQuery.validator.addMethod("dateITA", function(value, element) {
-       var check = false;
-       var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
-       if( re.test(value)) {
-               var adata = value.split('/');
-               var gg = parseInt(adata[0],10);
-               var mm = parseInt(adata[1],10);
-               var aaaa = parseInt(adata[2],10);
-               var xdata = new Date(aaaa,mm-1,gg);
-               if ( ( xdata.getFullYear() === aaaa ) && ( xdata.getMonth() === 
mm - 1 ) && ( xdata.getDate() === gg ) ){
+$.validator.addMethod( "dateITA", function( value, element ) {
+       var check = false,
+               re = /^\d{1,2}\/\d{1,2}\/\d{4}$/,
+               adata, gg, mm, aaaa, xdata;
+       if ( re.test( value ) ) {
+               adata = value.split( "/" );
+               gg = parseInt( adata[ 0 ], 10 );
+               mm = parseInt( adata[ 1 ], 10 );
+               aaaa = parseInt( adata[ 2 ], 10 );
+               xdata = new Date( Date.UTC( aaaa, mm - 1, gg, 12, 0, 0, 0 ) );
+               if ( ( xdata.getUTCFullYear() === aaaa ) && ( 
xdata.getUTCMonth() === mm - 1 ) && ( xdata.getUTCDate() === gg ) ) {
                        check = true;
                } else {
                        check = false;
@@ -150,92 +511,128 @@ jQuery.validator.addMethod("dateITA", fu
        } else {
                check = false;
        }
-       return this.optional(element) || check;
-}, "Please enter a correct date");
+       return this.optional( element ) || check;
+}, $.validator.messages.date );
+
+$.validator.addMethod( "dateNL", function( value, element ) {
+       return this.optional( element ) || 
/^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test( 
value );
+}, $.validator.messages.date );
+
+// Older "accept" file extension method. Old docs: 
http://docs.jquery.com/Plugins/Validation/Methods/accept
+$.validator.addMethod( "extension", function( value, element, param ) {
+       param = typeof param === "string" ? param.replace( /,/g, "|" ) : 
"png|jpe?g|gif";
+       return this.optional( element ) || value.match( new RegExp( "\\.(" + 
param + ")$", "i" ) );
+}, $.validator.format( "Please enter a value with a valid extension." ) );
+
+/**
+ * Dutch giro account numbers (not bank numbers) have max 7 digits
+ */
+$.validator.addMethod( "giroaccountNL", function( value, element ) {
+       return this.optional( element ) || /^[0-9]{1,7}$/.test( value );
+}, "Please specify a valid giro account number" );
 
 /**
  * IBAN is the international bank account number.
  * It has a country - specific format, that is checked here too
+ *
+ * Validation is case-insensitive. Please make sure to normalize input 
yourself.
  */
-jQuery.validator.addMethod("iban", function(value, element) {
-       // some quick simple tests to prevent needless work
-       if (this.optional(element)) {
+$.validator.addMethod( "iban", function( value, element ) {
+
+       // Some quick simple tests to prevent needless work
+       if ( this.optional( element ) ) {
                return true;
        }
-       if (!(/^([a-zA-Z0-9]{4} 
){2,8}[a-zA-Z0-9]{1,4}|[a-zA-Z0-9]{12,34}$/.test(value))) {
+
+       // Remove spaces and to upper case
+       var iban = value.replace( / /g, "" ).toUpperCase(),
+               ibancheckdigits = "",
+               leadingZeroes = true,
+               cRest = "",
+               cOperator = "",
+               countrycode, ibancheck, charAt, cChar, bbanpattern, 
bbancountrypatterns, ibanregexp, i, p;
+
+       // Check for IBAN code length.
+       // It contains:
+       // country code ISO 3166-1 - two letters,
+       // two check digits,
+       // Basic Bank Account Number (BBAN) - up to 30 chars
+       var minimalIBANlength = 5;
+       if ( iban.length < minimalIBANlength ) {
                return false;
        }
 
-       // check the country code and find the country specific format
-       var iban = value.replace(/ /g,'').toUpperCase(); // remove spaces and 
to upper case
-       var countrycode = iban.substring(0,2);
-       var bbancountrypatterns = {
-               'AL': "\\d{8}[\\dA-Z]{16}",
-               'AD': "\\d{8}[\\dA-Z]{12}",
-               'AT': "\\d{16}",
-               'AZ': "[\\dA-Z]{4}\\d{20}",
-               'BE': "\\d{12}",
-               'BH': "[A-Z]{4}[\\dA-Z]{14}",
-               'BA': "\\d{16}",
-               'BR': "\\d{23}[A-Z][\\dA-Z]",
-               'BG': "[A-Z]{4}\\d{6}[\\dA-Z]{8}",
-               'CR': "\\d{17}",
-               'HR': "\\d{17}",
-               'CY': "\\d{8}[\\dA-Z]{16}",
-               'CZ': "\\d{20}",
-               'DK': "\\d{14}",
-               'DO': "[A-Z]{4}\\d{20}",
-               'EE': "\\d{16}",
-               'FO': "\\d{14}",
-               'FI': "\\d{14}",
-               'FR': "\\d{10}[\\dA-Z]{11}\\d{2}",
-               'GE': "[\\dA-Z]{2}\\d{16}",
-               'DE': "\\d{18}",
-               'GI': "[A-Z]{4}[\\dA-Z]{15}",
-               'GR': "\\d{7}[\\dA-Z]{16}",
-               'GL': "\\d{14}",
-               'GT': "[\\dA-Z]{4}[\\dA-Z]{20}",
-               'HU': "\\d{24}",
-               'IS': "\\d{22}",
-               'IE': "[\\dA-Z]{4}\\d{14}",
-               'IL': "\\d{19}",
-               'IT': "[A-Z]\\d{10}[\\dA-Z]{12}",
-               'KZ': "\\d{3}[\\dA-Z]{13}",
-               'KW': "[A-Z]{4}[\\dA-Z]{22}",
-               'LV': "[A-Z]{4}[\\dA-Z]{13}",
-               'LB': "\\d{4}[\\dA-Z]{20}",
-               'LI': "\\d{5}[\\dA-Z]{12}",
-               'LT': "\\d{16}",
-               'LU': "\\d{3}[\\dA-Z]{13}",
-               'MK': "\\d{3}[\\dA-Z]{10}\\d{2}",
-               'MT': "[A-Z]{4}\\d{5}[\\dA-Z]{18}",
-               'MR': "\\d{23}",
-               'MU': "[A-Z]{4}\\d{19}[A-Z]{3}",
-               'MC': "\\d{10}[\\dA-Z]{11}\\d{2}",
-               'MD': "[\\dA-Z]{2}\\d{18}",
-               'ME': "\\d{18}",
-               'NL': "[A-Z]{4}\\d{10}",
-               'NO': "\\d{11}",
-               'PK': "[\\dA-Z]{4}\\d{16}",
-               'PS': "[\\dA-Z]{4}\\d{21}",
-               'PL': "\\d{24}",
-               'PT': "\\d{21}",
-               'RO': "[A-Z]{4}[\\dA-Z]{16}",
-               'SM': "[A-Z]\\d{10}[\\dA-Z]{12}",
-               'SA': "\\d{2}[\\dA-Z]{18}",
-               'RS': "\\d{18}",
-               'SK': "\\d{20}",
-               'SI': "\\d{15}",
-               'ES': "\\d{20}",
-               'SE': "\\d{20}",
-               'CH': "\\d{5}[\\dA-Z]{12}",
-               'TN': "\\d{20}",
-               'TR': "\\d{5}[\\dA-Z]{17}",
-               'AE': "\\d{3}\\d{16}",
-               'GB': "[A-Z]{4}\\d{14}",
-               'VG': "[\\dA-Z]{4}\\d{16}"
+       // Check the country code and find the country specific format
+       countrycode = iban.substring( 0, 2 );
+       bbancountrypatterns = {
+               "AL": "\\d{8}[\\dA-Z]{16}",
+               "AD": "\\d{8}[\\dA-Z]{12}",
+               "AT": "\\d{16}",
+               "AZ": "[\\dA-Z]{4}\\d{20}",
+               "BE": "\\d{12}",
+               "BH": "[A-Z]{4}[\\dA-Z]{14}",
+               "BA": "\\d{16}",
+               "BR": "\\d{23}[A-Z][\\dA-Z]",
+               "BG": "[A-Z]{4}\\d{6}[\\dA-Z]{8}",
+               "CR": "\\d{17}",
+               "HR": "\\d{17}",
+               "CY": "\\d{8}[\\dA-Z]{16}",
+               "CZ": "\\d{20}",
+               "DK": "\\d{14}",
+               "DO": "[A-Z]{4}\\d{20}",
+               "EE": "\\d{16}",
+               "FO": "\\d{14}",
+               "FI": "\\d{14}",
+               "FR": "\\d{10}[\\dA-Z]{11}\\d{2}",
+               "GE": "[\\dA-Z]{2}\\d{16}",
+               "DE": "\\d{18}",
+               "GI": "[A-Z]{4}[\\dA-Z]{15}",
+               "GR": "\\d{7}[\\dA-Z]{16}",
+               "GL": "\\d{14}",
+               "GT": "[\\dA-Z]{4}[\\dA-Z]{20}",
+               "HU": "\\d{24}",
+               "IS": "\\d{22}",
+               "IE": "[\\dA-Z]{4}\\d{14}",
+               "IL": "\\d{19}",
+               "IT": "[A-Z]\\d{10}[\\dA-Z]{12}",
+               "KZ": "\\d{3}[\\dA-Z]{13}",
+               "KW": "[A-Z]{4}[\\dA-Z]{22}",
+               "LV": "[A-Z]{4}[\\dA-Z]{13}",
+               "LB": "\\d{4}[\\dA-Z]{20}",
+               "LI": "\\d{5}[\\dA-Z]{12}",
+               "LT": "\\d{16}",
+               "LU": "\\d{3}[\\dA-Z]{13}",
+               "MK": "\\d{3}[\\dA-Z]{10}\\d{2}",
+               "MT": "[A-Z]{4}\\d{5}[\\dA-Z]{18}",
+               "MR": "\\d{23}",
+               "MU": "[A-Z]{4}\\d{19}[A-Z]{3}",
+               "MC": "\\d{10}[\\dA-Z]{11}\\d{2}",
+               "MD": "[\\dA-Z]{2}\\d{18}",
+               "ME": "\\d{18}",
+               "NL": "[A-Z]{4}\\d{10}",
+               "NO": "\\d{11}",
+               "PK": "[\\dA-Z]{4}\\d{16}",
+               "PS": "[\\dA-Z]{4}\\d{21}",
+               "PL": "\\d{24}",
+               "PT": "\\d{21}",
+               "RO": "[A-Z]{4}[\\dA-Z]{16}",
+               "SM": "[A-Z]\\d{10}[\\dA-Z]{12}",
+               "SA": "\\d{2}[\\dA-Z]{18}",
+               "RS": "\\d{18}",
+               "SK": "\\d{20}",
+               "SI": "\\d{15}",
+               "ES": "\\d{20}",
+               "SE": "\\d{20}",
+               "CH": "\\d{5}[\\dA-Z]{12}",
+               "TN": "\\d{20}",
+               "TR": "\\d{5}[\\dA-Z]{17}",
+               "AE": "\\d{3}\\d{16}",
+               "GB": "[A-Z]{4}\\d{14}",
+               "VG": "[\\dA-Z]{4}\\d{16}"
        };
-       var bbanpattern = bbancountrypatterns[countrycode];
+
+       bbanpattern = bbancountrypatterns[ countrycode ];
+
        // As new countries will start using IBAN in the
        // future, we only check if the countrycode is known.
        // This prevents false negatives, while almost all
@@ -243,302 +640,340 @@ jQuery.validator.addMethod("iban", funct
        // by the checksum validation below anyway.
        // Strict checking should return FALSE for unknown
        // countries.
-       if (typeof bbanpattern !== 'undefined') {
-               var ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + 
"$", "");
-               if (!(ibanregexp.test(iban))) {
-                       return false; // invalid country specific format
+       if ( typeof bbanpattern !== "undefined" ) {
+               ibanregexp = new RegExp( "^[A-Z]{2}\\d{2}" + bbanpattern + "$", 
"" );
+               if ( !( ibanregexp.test( iban ) ) ) {
+                       return false; // Invalid country specific format
                }
        }
 
-       // now check the checksum, first convert to digits
-       var ibancheck = iban.substring(4,iban.length) + iban.substring(0,4);
-       var ibancheckdigits = "";
-       var leadingZeroes = true;
-       var charAt;
-       for (var i =0; i<ibancheck.length; i++) {
-               charAt = ibancheck.charAt(i);
-               if (charAt !== "0") {
+       // Now check the checksum, first convert to digits
+       ibancheck = iban.substring( 4, iban.length ) + iban.substring( 0, 4 );
+       for ( i = 0; i < ibancheck.length; i++ ) {
+               charAt = ibancheck.charAt( i );
+               if ( charAt !== "0" ) {
                        leadingZeroes = false;
                }
-               if (!leadingZeroes) {
-                       ibancheckdigits += 
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt);
+               if ( !leadingZeroes ) {
+                       ibancheckdigits += 
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf( charAt );
                }
        }
 
-       // calculate the result of: ibancheckdigits % 97
-    var cRest = '';
-    var cOperator = '';
-       for (var p=0; p<ibancheckdigits.length; p++) {
-               var cChar = ibancheckdigits.charAt(p);
-               cOperator = '' + cRest + '' + cChar;
+       // Calculate the result of: ibancheckdigits % 97
+       for ( p = 0; p < ibancheckdigits.length; p++ ) {
+               cChar = ibancheckdigits.charAt( p );
+               cOperator = "" + cRest + "" + cChar;
                cRest = cOperator % 97;
-    }
+       }
        return cRest === 1;
-}, "Please specify a valid IBAN");
+}, "Please specify a valid IBAN" );
 
-jQuery.validator.addMethod("dateNL", function(value, element) {
-       return this.optional(element) || 
/^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value);
-}, "Please enter a correct date");
-
-/**
- * Dutch phone numbers have 10 digits (or 11 and start with +31).
+$.validator.addMethod( "integer", function( value, element ) {
+       return this.optional( element ) || /^-?\d+$/.test( value );
+}, "A positive or negative non-decimal number please" );
+
+$.validator.addMethod( "ipv4", function( value, element ) {
+       return this.optional( element ) || 
/^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(
 value );
+}, "Please enter a valid IP v4 address." );
+
+$.validator.addMethod( "ipv6", function( value, element ) {
+       return this.optional( element ) || 
/^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(
 value );
+}, "Please enter a valid IP v6 address." );
+
+$.validator.addMethod( "lettersonly", function( value, element ) {
+       return this.optional( element ) || /^[a-z]+$/i.test( value );
+}, "Letters only please" );
+
+$.validator.addMethod( "letterswithbasicpunc", function( value, element ) {
+       return this.optional( element ) || /^[a-z\-.,()'"\s]+$/i.test( value );
+}, "Letters or punctuation only please" );
+
+$.validator.addMethod( "mobileNL", function( value, element ) {
+       return this.optional( element ) || 
/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(
 value );
+}, "Please specify a valid mobile number" );
+
+/* For UK phone functions, do the following server side processing:
+ * Compare original input with this RegEx pattern:
+ * 
^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
+ * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set 
$prefix to '0'
+ * Extract $2 and remove hyphens, spaces and parentheses. Phone number is 
combined $prefix and $2.
+ * A number of very detailed GB telephone number RegEx patterns can also be 
found at:
+ * 
http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
  */
-jQuery.validator.addMethod("phoneNL", function(value, element) {
-       return this.optional(element) || 
/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid phone number.");
-
-jQuery.validator.addMethod("mobileNL", function(value, element) {
-       return this.optional(element) || 
/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid mobile number");
-
-jQuery.validator.addMethod("postalcodeNL", function(value, element) {
-       return this.optional(element) || 
/^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value);
-}, "Please specify a valid postal code");
+$.validator.addMethod( "mobileUK", function( phone_number, element ) {
+       phone_number = phone_number.replace( /\(|\)|\s+|-/g, "" );
+       return this.optional( element ) || phone_number.length > 9 &&
+               phone_number.match( 
/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[1345789]\d{2}|624)\s?\d{3}\s?\d{3})$/ );
+}, "Please specify a valid mobile number" );
+
+$.validator.addMethod( "netmask", function( value, element ) {
+    return this.optional( element ) || 
/^(254|252|248|240|224|192|128)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(254|252|248|240|224|192|128|0)/i.test(
 value );
+}, "Please enter a valid netmask." );
 
 /*
- * Dutch bank account numbers (not 'giro' numbers) have 9 digits
- * and pass the '11 check'.
- * We accept the notation with spaces, as that is common.
- * acceptable: 123456789 or 12 34 56 789
+ * The NIE (Número de Identificación de Extranjero) is a Spanish tax 
identification number assigned by the Spanish
+ * authorities to any foreigner.
+ *
+ * The NIE is the equivalent of a Spaniards Número de Identificación Fiscal 
(NIF) which serves as a fiscal
+ * identification number. The CIF number (Certificado de Identificación 
Fiscal) is equivalent to the NIF, but applies to
+ * companies rather than individuals. The NIE consists of an 'X' or 'Y' 
followed by 7 or 8 digits then another letter.
  */
-jQuery.validator.addMethod("bankaccountNL", function(value, element) {
-       if (this.optional(element)) {
+$.validator.addMethod( "nieES", function( value, element ) {
+       "use strict";
+
+       if ( this.optional( element ) ) {
                return true;
        }
-       if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) {
+
+       var nieRegEx = new RegExp( 
/^[MXYZ]{1}[0-9]{7,8}[TRWAGMYFPDXBNJZSQVHLCKET]{1}$/gi );
+       var validChars = "TRWAGMYFPDXBNJZSQVHLCKET",
+               letter = value.substr( value.length - 1 ).toUpperCase(),
+               number;
+
+       value = value.toString().toUpperCase();
+
+       // Quick format test
+       if ( value.length > 10 || value.length < 9 || !nieRegEx.test( value ) ) 
{
                return false;
        }
-       // now '11 check'
-       var account = value.replace(/ /g,''); // remove spaces
-       var sum = 0;
-       var len = account.length;
-       for (var pos=0; pos<len; pos++) {
-               var factor = len - pos;
-               var digit = account.substring(pos, pos+1);
-               sum = sum + factor * digit;
-       }
-       return sum % 11 === 0;
-}, "Please specify a valid bank account number");
 
-/**
- * Dutch giro account numbers (not bank numbers) have max 7 digits
- */
-jQuery.validator.addMethod("giroaccountNL", function(value, element) {
-       return this.optional(element) || /^[0-9]{1,7}$/.test(value);
-}, "Please specify a valid giro account number");
-
-jQuery.validator.addMethod("bankorgiroaccountNL", function(value, element) {
-       return this.optional(element) ||
-                       ($.validator.methods["bankaccountNL"].call(this, value, 
element)) ||
-                       ($.validator.methods["giroaccountNL"].call(this, value, 
element));
-}, "Please specify a valid bank or giro account number");
-
-
-jQuery.validator.addMethod("time", function(value, element) {
-       return this.optional(element) || 
/^([01]\d|2[0-3])(:[0-5]\d){1,2}$/.test(value);
-}, "Please enter a valid time, between 00:00 and 23:59");
-jQuery.validator.addMethod("time12h", function(value, element) {
-       return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ 
?[AP]M))$/i.test(value);
-}, "Please enter a valid time in 12-hour am/pm format");
-
-/**
- * matches US phone number format
- *
- * where the area code may not start with 1 and the prefix may not start with 1
- * allows '-' or ' ' as a separator and allows parens around area code
- * some people may want to put a '1' in front of their number
- *
- * 1(212)-999-2345 or
- * 212 999 2344 or
- * 212-999-0983
- *
- * but not
- * 111-123-5434
- * and not
- * 212 123 4567
- */
-jQuery.validator.addMethod("phoneUS", function(phone_number, element) {
-       phone_number = phone_number.replace(/\s+/g, "");
-       return this.optional(element) || phone_number.length > 9 &&
-               
phone_number.match(/^(\+?1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
-}, "Please specify a valid phone number");
-
-jQuery.validator.addMethod('phoneUK', function(phone_number, element) {
-       phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-       return this.optional(element) || phone_number.length > 9 &&
-               
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/);
-}, 'Please specify a valid phone number');
-
-jQuery.validator.addMethod('mobileUK', function(phone_number, element) {
-       phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-       return this.optional(element) || phone_number.length > 9 &&
-               
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[45789]\d{2}|624)\s?\d{3}\s?\d{3})$/);
-}, 'Please specify a valid mobile number');
-
-//Matches UK landline + mobile, accepting only 01-3 for landline or 07 for 
mobile to exclude many premium numbers
-jQuery.validator.addMethod('phonesUK', function(phone_number, element) {
-       phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-       return this.optional(element) || phone_number.length > 9 &&
-               
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[45789]\d{8}|624\d{6})))$/);
-}, 'Please specify a valid uk phone number');
-// On the above three UK functions, do the following server side processing:
-//  Compare original input with this RegEx pattern:
-//   
^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
-//  Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set 
$prefix to '0'
-//  Extract $2 and remove hyphens, spaces and parentheses. Phone number is 
combined $prefix and $2.
-// A number of very detailed GB telephone number RegEx patterns can also be 
found at:
-// 
http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
+       // X means same number
+       // Y means number + 10000000
+       // Z means number + 20000000
+       value = value.replace( /^[X]/, "0" )
+               .replace( /^[Y]/, "1" )
+               .replace( /^[Z]/, "2" );
 
-// Matches UK postcode. Does not match to UK Channel Islands that have their 
own postcodes (non standard UK)
-jQuery.validator.addMethod('postcodeUK', function(value, element) {
-       return this.optional(element) || 
/^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value);
-}, 'Please specify a valid UK postcode');
+       number = value.length === 9 ? value.substr( 0, 8 ) : value.substr( 0, 9 
);
 
-// TODO check if value starts with <, otherwise don't try stripping anything
-jQuery.validator.addMethod("strippedminlength", function(value, element, 
param) {
-       return jQuery(value).text().length >= param;
-}, jQuery.validator.format("Please enter at least {0} characters"));
+       return validChars.charAt( parseInt( number, 10 ) % 23 ) === letter;
 
-// same as email, but TLD is optional
-jQuery.validator.addMethod("email2", function(value, element, param) {
-       return this.optional(element) || 
/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([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])))\.?$/i.test(value);
-}, jQuery.validator.messages.email);
+}, "Please specify a valid NIE number." );
 
-// same as url, but TLD is optional
-jQuery.validator.addMethod("url2", function(value, element, param) {
-       return this.optional(element) || 
/^(https?|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.test(value);
-}, jQuery.validator.messages.url);
+/*
+ * The Número de Identificación Fiscal ( NIF ) is the way tax identification 
used in Spain for individuals
+ */
+$.validator.addMethod( "nifES", function( value, element ) {
+       "use strict";
 
-// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
-// Redistributed under the the Apache License 2.0 at 
http://www.apache.org/licenses/LICENSE-2.0
-// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, 
unknown, all (overrides all other settings)
-jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
-       if (/[^0-9\-]+/.test(value)) {
-               return false;
+       if ( this.optional( element ) ) {
+               return true;
        }
 
-       value = value.replace(/\D/g, "");
-
-       var validTypes = 0x0000;
+       value = value.toUpperCase();
 
-       if (param.CCT_MASTERCARD) {
-               validTypes |= 0x0001;
-       }
-       if (param.CCT_VISA) {
-               validTypes |= 0x0002;
-       }
-       if (param.CCT_AMEX) {
-               validTypes |= 0x0004;
-       }
-       if (param.CCT_DINERSCLUB) {
-               validTypes |= 0x0008;
-       }
-       if (param.CCT_ENROUTE) {
-               validTypes |= 0x0010;
-       }
-       if (param.CCT_DISCOVER) {
-               validTypes |= 0x0020;
-       }
-       if (param.CCT_JCB) {
-               validTypes |= 0x0040;
-       }
-       if (param.CCT_UNKNOWN) {
-               validTypes |= 0x0080;
-       }
-       if (param.all) {
-               validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 
0x0020 | 0x0040 | 0x0080;
-       }
-       if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { //mastercard
-               return value.length === 16;
-       }
-       if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
-               return value.length === 16;
-       }
-       if (validTypes & 0x0004 && /^(3[47])/.test(value)) { //amex
-               return value.length === 15;
-       }
-       if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { 
//dinersclub
-               return value.length === 14;
-       }
-       if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { //enroute
-               return value.length === 15;
-       }
-       if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
-               return value.length === 16;
-       }
-       if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
-               return value.length === 16;
+       // Basic format test
+       if ( !value.match( 
"((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)" ) ) {
+               return false;
        }
-       if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
-               return value.length === 15;
+
+       // Test NIF
+       if ( /^[0-9]{8}[A-Z]{1}$/.test( value ) ) {
+               return ( "TRWAGMYFPDXBNJZSQVHLCKE".charAt( value.substring( 8, 
0 ) % 23 ) === value.charAt( 8 ) );
        }
-       if (validTypes & 0x0080) { //unknown
-               return true;
+
+       // Test specials NIF (starts with K, L or M)
+       if ( /^[KLM]{1}/.test( value ) ) {
+               return ( value[ 8 ] === "TRWAGMYFPDXBNJZSQVHLCKE".charAt( 
value.substring( 8, 1 ) % 23 ) );
        }
+
        return false;
-}, "Please enter a valid credit card number.");
 
-jQuery.validator.addMethod("ipv4", function(value, element, param) {
-       return this.optional(element) || 
/^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value);
-}, "Please enter a valid IP v4 address.");
-
-jQuery.validator.addMethod("ipv6", function(value, element, param) {
-       return this.optional(element) || 
/^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
-}, "Please enter a valid IP v6 address.");
+}, "Please specify a valid NIF number." );
+
+/*
+ * Numer identyfikacji podatkowej ( NIP ) is the way tax identification used 
in Poland for companies
+ */
+$.validator.addMethod( "nipPL", function( value ) {
+       "use strict";
+
+       value = value.replace( /[^0-9]/g, "" );
+
+       if ( value.length !== 10 ) {
+               return false;
+       }
+
+       var arrSteps = [ 6, 5, 7, 2, 3, 4, 5, 6, 7 ];
+       var intSum = 0;
+       for ( var i = 0; i < 9; i++ ) {
+               intSum += arrSteps[ i ] * value[ i ];
+       }
+       var int2 = intSum % 11;
+       var intControlNr = ( int2 === 10 ) ? 0 : int2;
+
+       return ( intControlNr === parseInt( value[ 9 ], 10 ) );
+}, "Please specify a valid NIP number." );
+
+$.validator.addMethod( "notEqualTo", function( value, element, param ) {
+       return this.optional( element ) || !$.validator.methods.equalTo.call( 
this, value, element, param );
+}, "Please enter a different value, values must not be the same." );
+
+$.validator.addMethod( "nowhitespace", function( value, element ) {
+       return this.optional( element ) || /^\S+$/i.test( value );
+}, "No white space please" );
 
 /**
 * Return true if the field value matches the given format RegExp
 *
-* @example jQuery.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
+* @example $.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
 * @result true
 *
-* @example jQuery.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
+* @example $.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
 * @result false
 *
-* @name jQuery.validator.methods.pattern
+* @name $.validator.methods.pattern
 * @type Boolean
 * @cat Plugins/Validate/Methods
 */
-jQuery.validator.addMethod("pattern", function(value, element, param) {
-       if (this.optional(element)) {
+$.validator.addMethod( "pattern", function( value, element, param ) {
+       if ( this.optional( element ) ) {
                return true;
        }
-       if (typeof param === 'string') {
-               param = new RegExp('^(?:' + param + ')$');
+       if ( typeof param === "string" ) {
+               param = new RegExp( "^(?:" + param + ")$" );
        }
-       return param.test(value);
-}, "Invalid format.");
+       return param.test( value );
+}, "Invalid format." );
 
+/**
+ * Dutch phone numbers have 10 digits (or 11 and start with +31).
+ */
+$.validator.addMethod( "phoneNL", function( value, element ) {
+       return this.optional( element ) || 
/^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(
 value );
+}, "Please specify a valid phone number." );
+
+/* For UK phone functions, do the following server side processing:
+ * Compare original input with this RegEx pattern:
+ * 
^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
+ * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set 
$prefix to '0'
+ * Extract $2 and remove hyphens, spaces and parentheses. Phone number is 
combined $prefix and $2.
+ * A number of very detailed GB telephone number RegEx patterns can also be 
found at:
+ * 
http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
+ */
+
+// Matches UK landline + mobile, accepting only 01-3 for landline or 07 for 
mobile to exclude many premium numbers
+$.validator.addMethod( "phonesUK", function( phone_number, element ) {
+       phone_number = phone_number.replace( /\(|\)|\s+|-/g, "" );
+       return this.optional( element ) || phone_number.length > 9 &&
+               phone_number.match( 
/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[1345789]\d{8}|624\d{6})))$/
 );
+}, "Please specify a valid uk phone number" );
+
+/* For UK phone functions, do the following server side processing:
+ * Compare original input with this RegEx pattern:
+ * 
^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
+ * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set 
$prefix to '0'
+ * Extract $2 and remove hyphens, spaces and parentheses. Phone number is 
combined $prefix and $2.
+ * A number of very detailed GB telephone number RegEx patterns can also be 
found at:
+ * 
http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
+ */
+$.validator.addMethod( "phoneUK", function( phone_number, element ) {
+       phone_number = phone_number.replace( /\(|\)|\s+|-/g, "" );
+       return this.optional( element ) || phone_number.length > 9 &&
+               phone_number.match( 
/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/
 );
+}, "Please specify a valid phone number" );
+
+/**
+ * Matches US phone number format
+ *
+ * where the area code may not start with 1 and the prefix may not start with 1
+ * allows '-' or ' ' as a separator and allows parens around area code
+ * some people may want to put a '1' in front of their number
+ *
+ * 1(212)-999-2345 or
+ * 212 999 2344 or
+ * 212-999-0983
+ *
+ * but not
+ * 111-123-5434
+ * and not
+ * 212 123 4567
+ */
+$.validator.addMethod( "phoneUS", function( phone_number, element ) {
+       phone_number = phone_number.replace( /\s+/g, "" );
+       return this.optional( element ) || phone_number.length > 9 &&
+               phone_number.match( 
/^(\+?1-?)?(\([2-9]([02-9]\d|1[02-9])\)|[2-9]([02-9]\d|1[02-9]))-?[2-9]([02-9]\d|1[02-9])-?\d{4}$/
 );
+}, "Please specify a valid phone number" );
+
+/*
+* Valida CEPs do brasileiros:
+*
+* Formatos aceitos:
+* 99999-999
+* 99.999-999
+* 99999999
+*/
+$.validator.addMethod( "postalcodeBR", function( cep_value, element ) {
+       return this.optional( element ) || 
/^\d{2}.\d{3}-\d{3}?$|^\d{5}-?\d{3}?$/.test( cep_value );
+}, "Informe um CEP válido." );
+
+/**
+ * Matches a valid Canadian Postal Code
+ *
+ * @example jQuery.validator.methods.postalCodeCA( "H0H 0H0", element )
+ * @result true
+ *
+ * @example jQuery.validator.methods.postalCodeCA( "H0H0H0", element )
+ * @result false
+ *
+ * @name jQuery.validator.methods.postalCodeCA
+ * @type Boolean
+ * @cat Plugins/Validate/Methods
+ */
+$.validator.addMethod( "postalCodeCA", function( value, element ) {
+       return this.optional( element ) || 
/^[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ] 
*\d[ABCEGHJKLMNPRSTVWXYZ]\d$/i.test( value );
+}, "Please specify a valid postal code" );
+
+/* Matches Italian postcode (CAP) */
+$.validator.addMethod( "postalcodeIT", function( value, element ) {
+       return this.optional( element ) || /^\d{5}$/.test( value );
+}, "Please specify a valid postal code" );
+
+$.validator.addMethod( "postalcodeNL", function( value, element ) {
+       return this.optional( element ) || 
/^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test( value );
+}, "Please specify a valid postal code" );
+
+// Matches UK postcode. Does not match to UK Channel Islands that have their 
own postcodes (non standard UK)
+$.validator.addMethod( "postcodeUK", function( value, element ) {
+       return this.optional( element ) || 
/^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(
 value );
+}, "Please specify a valid UK postcode" );
 
 /*
  * Lets you say "at least X inputs that match selector Y must be filled."
  *
  * The end result is that neither of these inputs:
  *
- *  <input class="productinfo" name="partnumber">
- *  <input class="productinfo" name="description">
+ *     <input class="productinfo" name="partnumber">
+ *     <input class="productinfo" name="description">
  *
- *  ...will validate unless at least one of them is filled.
+ *     ...will validate unless at least one of them is filled.
  *
- * partnumber:  {require_from_group: [1,".productinfo"]},
+ * partnumber: {require_from_group: [1,".productinfo"]},
  * description: {require_from_group: [1,".productinfo"]}
  *
+ * options[0]: number of fields that must be filled in the group
+ * options[1]: CSS selector that defines the group of conditionally required 
fields
  */
-jQuery.validator.addMethod("require_from_group", function(value, element, 
options) {
-       var validator = this;
-       var selector = options[1];
-       var validOrNot = $(selector, element.form).filter(function() {
-               return validator.elementValue(this);
-       }).length >= options[0];
-
-       if(!$(element).data('being_validated')) {
-               var fields = $(selector, element.form);
-               fields.data('being_validated', true);
-               fields.valid();
-               fields.data('being_validated', false);
+$.validator.addMethod( "require_from_group", function( value, element, options 
) {
+       var $fields = $( options[ 1 ], element.form ),
+               $fieldsFirst = $fields.eq( 0 ),
+               validator = $fieldsFirst.data( "valid_req_grp" ) ? 
$fieldsFirst.data( "valid_req_grp" ) : $.extend( {}, this ),
+               isValid = $fields.filter( function() {
+                       return validator.elementValue( this );
+               } ).length >= options[ 0 ];
+
+       // Store the cloned validator for future validation
+       $fieldsFirst.data( "valid_req_grp", validator );
+
+       // If element isn't being validated, run each require_from_group 
field's validation rules
+       if ( !$( element ).data( "being_validated" ) ) {
+               $fields.data( "being_validated", true );
+               $fields.each( function() {
+                       validator.element( this );
+               } );
+               $fields.data( "being_validated", false );
        }
-       return validOrNot;
-}, jQuery.format("Please fill at least {0} of these fields."));
+       return isValid;
+}, $.validator.format( "Please fill at least {0} of these fields." ) );
 
 /*
  * Lets you say "either at least X inputs that match selector Y must be filled,
@@ -546,72 +981,178 @@ jQuery.validator.addMethod("require_from
  *
  * The end result, is that none of these inputs:
  *
- *  <input class="productinfo" name="partnumber">
- *  <input class="productinfo" name="description">
- *  <input class="productinfo" name="color">
- *
- *  ...will validate unless either at least two of them are filled,
- *  OR none of them are.
- *
- * partnumber:  {skip_or_fill_minimum: [2,".productinfo"]},
- *  description: {skip_or_fill_minimum: [2,".productinfo"]},
- * color:       {skip_or_fill_minimum: [2,".productinfo"]}
- *
- */
-jQuery.validator.addMethod("skip_or_fill_minimum", function(value, element, 
options) {
-       var validator = this,
-               numberRequired = options[0],
-               selector = options[1];
-       var numberFilled = $(selector, element.form).filter(function() {
-               return validator.elementValue(this);
-       }).length;
-       var valid = numberFilled >= numberRequired || numberFilled === 0;
-
-       if(!$(element).data('being_validated')) {
-               var fields = $(selector, element.form);
-               fields.data('being_validated', true);
-               fields.valid();
-               fields.data('being_validated', false);
+ *     <input class="productinfo" name="partnumber">
+ *     <input class="productinfo" name="description">
+ *     <input class="productinfo" name="color">
+ *
+ *     ...will validate unless either at least two of them are filled,
+ *     OR none of them are.
+ *
+ * partnumber: {skip_or_fill_minimum: [2,".productinfo"]},
+ * description: {skip_or_fill_minimum: [2,".productinfo"]},
+ * color:              {skip_or_fill_minimum: [2,".productinfo"]}
+ *
+ * options[0]: number of fields that must be filled in the group
+ * options[1]: CSS selector that defines the group of conditionally required 
fields
+ *
+ */
+$.validator.addMethod( "skip_or_fill_minimum", function( value, element, 
options ) {
+       var $fields = $( options[ 1 ], element.form ),
+               $fieldsFirst = $fields.eq( 0 ),
+               validator = $fieldsFirst.data( "valid_skip" ) ? 
$fieldsFirst.data( "valid_skip" ) : $.extend( {}, this ),
+               numberFilled = $fields.filter( function() {
+                       return validator.elementValue( this );
+               } ).length,
+               isValid = numberFilled === 0 || numberFilled >= options[ 0 ];
+
+       // Store the cloned validator for future validation
+       $fieldsFirst.data( "valid_skip", validator );
+
+       // If element isn't being validated, run each skip_or_fill_minimum 
field's validation rules
+       if ( !$( element ).data( "being_validated" ) ) {
+               $fields.data( "being_validated", true );
+               $fields.each( function() {
+                       validator.element( this );
+               } );
+               $fields.data( "being_validated", false );
+       }
+       return isValid;
+}, $.validator.format( "Please either skip these fields or fill at least {0} 
of them." ) );
+
+/* Validates US States and/or Territories by @jdforsythe
+ * Can be case insensitive or require capitalization - default is case 
insensitive
+ * Can include US Territories or not - default does not
+ * Can include US Military postal abbreviations (AA, AE, AP) - default does not
+ *
+ * Note: "States" always includes DC (District of Colombia)
+ *
+ * Usage examples:
+ *
+ *  This is the default - case insensitive, no territories, no military zones
+ *  stateInput: {
+ *     caseSensitive: false,
+ *     includeTerritories: false,
+ *     includeMilitary: false
+ *  }
+ *
+ *  Only allow capital letters, no territories, no military zones
+ *  stateInput: {
+ *     caseSensitive: false
+ *  }
+ *
+ *  Case insensitive, include territories but not military zones
+ *  stateInput: {
+ *     includeTerritories: true
+ *  }
+ *
+ *  Only allow capital letters, include territories and military zones
+ *  stateInput: {
+ *     caseSensitive: true,
+ *     includeTerritories: true,
+ *     includeMilitary: true
+ *  }
+ *
+ */
+$.validator.addMethod( "stateUS", function( value, element, options ) {
+       var isDefault = typeof options === "undefined",
+               caseSensitive = ( isDefault || typeof options.caseSensitive === 
"undefined" ) ? false : options.caseSensitive,
+               includeTerritories = ( isDefault || typeof 
options.includeTerritories === "undefined" ) ? false : 
options.includeTerritories,
+               includeMilitary = ( isDefault || typeof options.includeMilitary 
=== "undefined" ) ? false : options.includeMilitary,
+               regex;
+
+       if ( !includeTerritories && !includeMilitary ) {
+               regex = 
"^(A[KLRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
+       } else if ( includeTerritories && includeMilitary ) {
+               regex = 
"^(A[AEKLPRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
+       } else if ( includeTerritories ) {
+               regex = 
"^(A[KLRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
+       } else {
+               regex = 
"^(A[AEKLPRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
        }
-       return valid;
-}, jQuery.format("Please either skip these fields or fill at least {0} of 
them."));
 
-// Accept a value from a file input based on a required mimetype
-jQuery.validator.addMethod("accept", function(value, element, param) {
-       // Split mime on commas in case we have multiple types we can accept
-       var typeParam = typeof param === "string" ? param.replace(/\s/g, 
'').replace(/,/g, '|') : "image/*",
-       optionalValue = this.optional(element),
-       i, file;
+       regex = caseSensitive ? new RegExp( regex ) : new RegExp( regex, "i" );
+       return this.optional( element ) || regex.test( value );
+}, "Please specify a valid state" );
 
-       // Element is optional
-       if (optionalValue) {
-               return optionalValue;
-       }
-
-       if ($(element).attr("type") === "file") {
-               // If we are using a wildcard, make it regex friendly
-               typeParam = typeParam.replace(/\*/g, ".*");
+// TODO check if value starts with <, otherwise don't try stripping anything
+$.validator.addMethod( "strippedminlength", function( value, element, param ) {
+       return $( value ).text().length >= param;
+}, $.validator.format( "Please enter at least {0} characters" ) );
+
+$.validator.addMethod( "time", function( value, element ) {
+       return this.optional( element ) || 
/^([01]\d|2[0-3]|[0-9])(:[0-5]\d){1,2}$/.test( value );
+}, "Please enter a valid time, between 00:00 and 23:59" );
+
+$.validator.addMethod( "time12h", function( value, element ) {
+       return this.optional( element ) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ 
?[AP]M))$/i.test( value );
+}, "Please enter a valid time in 12-hour am/pm format" );
+
+// Same as url, but TLD is optional
+$.validator.addMethod( "url2", function( value, element ) {
+       return this.optional( element ) || 
/^(https?|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.test(
 value );
+}, $.validator.messages.url );
 
-               // Check if the element has a FileList before checking each file
-               if (element.files && element.files.length) {
-                       for (i = 0; i < element.files.length; i++) {
-                               file = element.files[i];
+/**
+ * Return true, if the value is a valid vehicle identification number (VIN).
+ *
+ * Works with all kind of text inputs.
+ *
+ * @example <input type="text" size="20" name="VehicleID" 
class="{required:true,vinUS:true}" />
+ * @desc Declares a required input element whose value must be a valid vehicle 
identification number.
+ *
+ * @name $.validator.methods.vinUS
+ * @type Boolean
+ * @cat Plugins/Validate/Methods
+ */
+$.validator.addMethod( "vinUS", function( v ) {
+       if ( v.length !== 17 ) {
+               return false;
+       }
 
-                               // Grab the mimetype from the loaded file, 
verify it matches
-                               if (!file.type.match(new RegExp( ".?(" + 
typeParam + ")$", "i"))) {
-                                       return false;
+       var LL = [ "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", 
"N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ],
+               VL = [ 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 7, 9, 2, 3, 4, 5, 
6, 7, 8, 9 ],
+               FL = [ 8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2 ],
+               rs = 0,
+               i, n, d, f, cd, cdv;
+
+       for ( i = 0; i < 17; i++ ) {
+               f = FL[ i ];
+               d = v.slice( i, i + 1 );
+               if ( i === 8 ) {
+                       cdv = d;
+               }
+               if ( !isNaN( d ) ) {
+                       d *= f;
+               } else {
+                       for ( n = 0; n < LL.length; n++ ) {
+                               if ( d.toUpperCase() === LL[ n ] ) {
+                                       d = VL[ n ];
+                                       d *= f;
+                                       if ( isNaN( cdv ) && n === 8 ) {
+                                               cdv = LL[ n ];
+                                       }
+                                       break;
                                }
                        }
                }
+               rs += d;
        }
+       cd = rs % 11;
+       if ( cd === 10 ) {
+               cd = "X";
+       }
+       if ( cd === cdv ) {
+               return true;
+       }
+       return false;
+}, "The specified vehicle identification number (VIN) is invalid." );
 
-       // Either return true because we've validated each file, or because the
-       // browser does not support element.files and the FileList feature
-       return true;
-}, jQuery.format("Please enter a value with a valid mimetype."));
-
-// Older "accept" file extension method. Old docs: 
http://docs.jquery.com/Plugins/Validation/Methods/accept
-jQuery.validator.addMethod("extension", function(value, element, param) {
-       param = typeof param === "string" ? param.replace(/,/g, '|') : 
"png|jpe?g|gif";
-       return this.optional(element) || value.match(new RegExp(".(" + param + 
")$", "i"));
-}, jQuery.format("Please enter a value with a valid extension."));
+$.validator.addMethod( "zipcodeUS", function( value, element ) {
+       return this.optional( element ) || /^\d{5}(-\d{4})?$/.test( value );
+}, "The specified US ZIP Code is invalid" );
+
+$.validator.addMethod( "ziprange", function( value, element ) {
+       return this.optional( element ) || /^90[2-5]\d\{2\}-\d{4}$/.test( value 
);
+}, "Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx" );
+return $;
+}));
\ No newline at end of file


Reply via email to