Revert "Change URL Validation to use filter_var"

This reverts commit 4e53916.
cakephp · Apr 24, 2010 · da31033 · da31033
1 parent 4e53916
commit da31033
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
@@ -666,11 +666,14 @@ public static function ssn($check, $regex = null, $country = null) {
  * @return boolean Success
  */
 	public static function url($check, $strict = false) {
-		$flags = array(FILTER_FLAG_HOST_REQUIRED);
-		if ($strict === true) {
-			$flags[] = FILTER_FLAG_SCHEME_REQUIRED;
-		}
-		return (boolean)filter_var($check, FILTER_VALIDATE_URL, $flags);
+		self::__populateIp();
+		$validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=~') . '\/0-9a-z]|(%[0-9a-f]{2}))';
+		$regex = '/^(?:(?:https?|ftps?|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') .
+			'(?:' . self::$__pattern['IPv4'] . '|' . self::$__pattern['hostname'] . ')(?::[1-9][0-9]{0,3})?' .
+			'(?:\/?|\/' . $validChars . '*)?' .
+			'(?:\?' . $validChars . '*)?' .
+			'(?:#' . $validChars . '*)?$/i';
+		return self::_check($check, $regex);
 	}
 
 /**