From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 15 Aug 2008 01:29:47 +0200
Subject: Update auf 1.13.0

---
 includes/IP.php | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'includes/IP.php')

diff --git a/includes/IP.php b/includes/IP.php
index db712c3b..e76f66c1 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -48,7 +48,7 @@ class IP {
 		// IPv6 IPs with two "::" strings are ambiguous and thus invalid
 		return preg_match( '/^' . IP_ADDRESS_STRING . '$/', $ip) && ( substr_count($ip, '::') < 2 );
 	}
-	
+
 	public static function isIPv6( $ip ) {
 		if ( !$ip ) return false;
 		if( is_array( $ip ) ) {
@@ -57,18 +57,18 @@ class IP {
 		// IPv6 IPs with two "::" strings are ambiguous and thus invalid
 		return preg_match( '/^' . RE_IPV6_ADD . '(\/' . RE_IPV6_PREFIX . '|)$/', $ip) && ( substr_count($ip, '::') < 2);
 	}
-	
+
 	public static function isIPv4( $ip ) {
 		if ( !$ip ) return false;
 		return preg_match( '/^' . RE_IP_ADD . '(\/' . RE_IP_PREFIX . '|)$/', $ip);
 	}
-	
+
 	/**
 	 * Given an IP address in dotted-quad notation, returns an IPv6 octet.
 	 * See http://www.answers.com/topic/ipv4-compatible-address
 	 * IPs with the first 92 bits as zeros are reserved from IPv6
 	 * @param $ip quad-dotted IP address.
-	 * @return string 
+	 * @return string
 	 */
 	public static function IPv4toIPv6( $ip ) {
 		if ( !$ip ) return null;
@@ -106,13 +106,13 @@ class IP {
         $r_ip = wfBaseConvert( $r_ip, 16, 10 );
        	return $r_ip;
 	}
-	
+
 	/**
 	 * Given an IPv6 address in octet notation, returns the expanded octet.
 	 * IPv4 IPs will be trimmed, thats it...
 	 * @param $ip octet ipv6 IP address.
-	 * @return string 
-	 */	
+	 * @return string
+	 */
 	public static function sanitizeIP( $ip ) {
 		$ip = trim( $ip );
 		if ( $ip === '' ) return null;
@@ -132,11 +132,11 @@ class IP {
     	$ip = preg_replace( '/(^|:)0+' . RE_IPV6_WORD . '/', '$1$2', $ip );
     	return $ip;
 	}
-	
+
 	/**
 	 * Given an unsigned integer, returns an IPv6 address in octet notation
 	 * @param $ip integer IP address.
-	 * @return string 
+	 * @return string
 	 */
 	public static function toOctet( $ip_int ) {
    		// Convert to padded uppercase hex
@@ -181,9 +181,9 @@ class IP {
 		}
 		return array( $network, $bits );
 	}
-	
+
 	/**
-	 * Given a string range in a number of formats, return the start and end of 
+	 * Given a string range in a number of formats, return the start and end of
 	 * the range in hexadecimal. For IPv6.
 	 *
 	 * Formats are:
@@ -233,7 +233,7 @@ class IP {
 			return array( $start, $end );
 		}
     }
-	
+
 	/**
 	 * Validate an IP address.
 	 * @return boolean True if it is valid.
@@ -310,7 +310,7 @@ class IP {
 	 * Return a zero-padded hexadecimal representation of an IP address.
 	 *
 	 * Hexadecimal addresses are used because they can easily be extended to
-	 * IPv6 support. To separate the ranges, the return value from this 
+	 * IPv6 support. To separate the ranges, the return value from this
 	 * function for an IPv6 address will be prefixed with "v6-", a non-
 	 * hexadecimal string which sorts after the IPv4 addresses.
 	 *
@@ -396,14 +396,14 @@ class IP {
 	}
 
 	/**
-	 * Given a string range in a number of formats, return the start and end of 
+	 * Given a string range in a number of formats, return the start and end of
 	 * the range in hexadecimal.
 	 *
 	 * Formats are:
 	 *     1.2.3.4/24          CIDR
 	 *     1.2.3.4 - 1.2.3.5   Explicit range
 	 *     1.2.3.4             Single IP
-	 * 
+	 *
 	 *     2001:0db8:85a3::7344/96          			 CIDR
 	 *     2001:0db8:85a3::7344 - 2001:0db8:85a3::7344   Explicit range
 	 *     2001:0db8:85a3::7344             			 Single IP
@@ -439,7 +439,7 @@ class IP {
 		}
 		if ( $start === false || $end === false ) {
 			return array( false, false );
-		} else {				
+		} else {
 			return array( $start, $end );
 		}
     }
@@ -492,5 +492,3 @@ class IP {
 		return null;  // give up
     }
 }
-
-
-- 
cgit v1.2.2