From 4aa80be8c952b562f710637179ed45e6da8a9563 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 16 Apr 2020 12:38:25 +0200 Subject: [inc/IpUtil] parseCidr(): Handle IP-only param just like /32 --- inc/iputil.inc.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/inc/iputil.inc.php b/inc/iputil.inc.php index 5cdd583c..69311d7f 100644 --- a/inc/iputil.inc.php +++ b/inc/iputil.inc.php @@ -50,8 +50,15 @@ class IpUtil public static function parseCidr($cidr) { $parts = explode('/', $cidr); - if (count($parts) !== 2) - return false; + if (count($parts) !== 2) { + $ip = ip2long($cidr); + if ($ip === false) + return false; + if (PHP_INT_SIZE === 4) { + $ip = sprintf('%u', $ip); + } + return ['start' => $ip, 'end' => $ip]; + } $ip = $parts[0]; $bits = $parts[1]; if (!is_numeric($bits) || $bits < 0 || $bits > 32) -- cgit v1.2.3-55-g7522