From 8bd6a73d4051762e81850cf2815244f5b1fb8251 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 19 Jun 2008 06:14:53 +0000 Subject: [PATCH] Loosen ipv4 check back, this really should be called isLikeIP() --- includes/User.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/includes/User.php b/includes/User.php index 6d8c739499..0f6e797bf4 100644 --- a/includes/User.php +++ b/includes/User.php @@ -431,13 +431,7 @@ class User { * @return bool */ static function isIP( $name ) { - return IP::isIPAddress($name); - /*return preg_match("/^ - (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\. - (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\. - (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\. - (?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5])) - $/x", $name);*/ + return preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/',$name) || IP::isIPv6($name); } /** -- 2.20.1