Index: branches/RC/core/kernel/utility/debugger.php =================================================================== diff -u -r11501 -r11711 --- branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 11501) +++ branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 11711) @@ -251,12 +251,20 @@ $ip = trim($ip); if ($network == $ip) { - // comparing 2 ip addresses directly + // comparing two ip addresses directly return true; } $d = strpos($network, '-'); - if ($d === false) { + if ($d !== false) { + // ip address range specified + $from = ip2long(trim(substr($network, 0, $d))); + $to = ip2long(trim(substr($network, $d + 1))); + + $ip = ip2long($ip); + return ($ip >= $from && $ip <= $to); + } + elseif (strpos($network, '/') !== false) { // sigle subnet specified $ip_arr = explode('/', $network); @@ -272,14 +280,8 @@ return ($ip_long & $mask) == ($network_long & $mask); } - else { - // ip address range specified - $from = ip2long(trim(substr($network, 0, $d))); - $to = ip2long(trim(substr($network, $d + 1))); - $ip = ip2long($ip); - return ($ip >= $from && $ip <= $to); - } + return false; } function InitReport()