Index: branches/5.1.x/core/kernel/globals.php
===================================================================
diff -u -N -r13393 -r13559
--- branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 13393)
+++ branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 13559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 13393 2010-04-24 20:33:58Z alex $
+* @version	$Id: globals.php 13559 2010-05-12 09:36:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -563,17 +563,26 @@
 		return $ip_match;
 	}
 
-	function netMatch($network, $ip) {
+	function netMatch($network, $ip)
+	{
 		$network = trim($network);
 		$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);
 
@@ -589,14 +598,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 request_headers()