From 94787db64043cd1315db2290171fa58e58d6008e Mon Sep 17 00:00:00 2001
From: Martynas Barzda <martynas@barzda.info>
Date: Tue, 16 Oct 2012 21:00:31 +0300
Subject: [PATCH] Validation Helper: Added filter_var functions

Updated email, ip and url methods with filter_var instead preg_match function.
More: [filter_var](http://www.php.net/manual/en/function.filter-var.php), [validate filters](http://www.php.net/manual/en/filter.filters.validate.php)
---
 monstra/helpers/valid.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/monstra/helpers/valid.php b/monstra/helpers/valid.php
index c2db15f..61399dc 100644
--- a/monstra/helpers/valid.php
+++ b/monstra/helpers/valid.php
@@ -45,7 +45,7 @@
 		 * @return  boolean
 		 */
 		public static function email($email) {
-			return (bool) preg_match('/^[-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+@(?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?$/iD', (string)$email);
+			return (bool) filter_var((string)$email, FILTER_VALIDATE_EMAIL);
 		}
 		
 
@@ -53,7 +53,7 @@
 		 * Check an ip address for correct format.
 		 *
 		 *	<code>
-		 *		if (Valid::ip('127.0.0.1')) {
+		 *		if (Valid::ip('127.0.0.1') || Valid::ip('0:0:0:0:0:0:7f00:1')) {
 		 *			// Do something...
 		 *  	}
 		 *	</code>
@@ -62,7 +62,7 @@
 		 * @return  boolean
 		 */
 		public static function ip($ip) {
-			return (bool) preg_match("^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}^", (string)$ip);
+			return (bool) filter_var((string)$ip, FILTER_VALIDATE_IP);
 		}
 
 
@@ -130,7 +130,7 @@
 		 * @return  boolean
 		 */
 		public static function url($url) {
-			return (bool) preg_match("|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i", (string)$url);	
+			return (bool) filter_var((string)$url, FILTER_VALIDATE_URL);
 		}