Merge branch 'master' of github.com:posabsolute/jQuery-Validation-Engine

Author: Cedric Dugas

index.html

@@ -106,7 +106,7 @@
 
 				<label>
 					<span>Telephone : </span>
-					<input value="1111111111"  class="validate[required,custom[telephone]] text-input" type="text" name="telephone"  id="telephone" />
+					<input value="1111111111"  class="validate[required,custom[phone]] text-input" type="text" name="telephone"  id="telephone" />
 				</label>
 			</fieldset>
 			<fieldset>

js/jquery.validationEngine-pt.js

@@ -21,30 +21,30 @@
 						"regex":"none",
 						"alertText":"* Selecione ",
 						"alertText2":" opções"},	
-					"confirm":{
+					"equals":{
 						"regex":"none",
 						"alertText":"* Os campos não correspondem"},		
-					"telephone":{
+					"phone":{
 						// credit: jquery.h5validate.js / orefalo
-						"regex": /([\+][0-9]{1,3}([ \.\-])?)?([\(]{1}[0-9]{3}[\)])?([0-9A-Z \.\-]{1,32})((x|ext|extension)[ ]?[0-9]{1,4})?/,
+						"regex": /^([\+][0-9]{1,3}[ \.\-])?([\(]{1}[0-9]{2,6}[\)])?([0-9 \.\-\/]{3,20})((x|ext|extension)[ ]?[0-9]{1,4})?$/,
 						"alertText":"* Número de telefone inválido"},	
 					"email":{
 						// Shamelessly lifted from Scott Gonzalez via the Bassistance Validation plugin http://projects.scottsplayground.com/email_address_validation/
 						"regex": /^((([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])))\.?$/,
 						"alertText":"* Endereço de email inválido"},
 					"integer":{
-						"regex": /^[-+]?\d+$/,
+						"regex": /^[\-\+]?\d+$/,
 						"alertText":"* Não é um número inteiro"},
 					"number":{
 						// Number, including positive, negative, and floating decimal. Credit: bassistance
-						"regex": /^[-+]?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)$/,
+						"regex": /^[\-\+]?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)$/,
 						"alertText":"* Não é um número decimal"},
 					"date":{
 						// Date in ISO format. Credit: bassistance
                          "regex":/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/,
                          "alertText":"* Data inválida, o formato deve de ser AAAA-MM-DD"},
 
-                    "ip":{
+                    "ipv4":{
                     	"regex": /^([1-9][0-9]{0,2})+\.([1-9][0-9]{0,2})+\.([1-9][0-9]{0,2})+\.([1-9][0-9]{0,2})+$/,
                     	"alertText":"* Número IP inválido"},      
                     "url":{