Use accessor method, ping r110179

[lhc/web/wiklou.git] / includes / IP.php

diff --git a/includes/IP.php b/includes/IP.php
index 055fe85..e3f6121 100644 (file)
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -18,7 +18,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @author Ashar Voultoiz <hashar at free dot fr>, Aaron Schulz
+ * @author Antoine Musso <hashar at free dot fr>, Aaron Schulz
  */
 
 // Some regex definition to "play" with IP address and IP address blocks
@@ -186,14 +186,14 @@ class IP {
        }
 
        /**
-        * Given a host/port string, like one might find in the host part of a URL 
-        * per RFC 2732, split the hostname part and the port part and return an 
-        * array with an element for each. If there is no port part, the array will 
-        * have false in place of the port. If the string was invalid in some way, 
+        * Given a host/port string, like one might find in the host part of a URL
+        * per RFC 2732, split the hostname part and the port part and return an
+        * array with an element for each. If there is no port part, the array will
+        * have false in place of the port. If the string was invalid in some way,
         * false is returned.
         *
-        * This was easy with IPv4 and was generally done in an ad-hoc way, but 
-        * with IPv6 it's somewhat more complicated due to the need to parse the 
+        * This was easy with IPv4 and was generally done in an ad-hoc way, but
+        * with IPv6 it's somewhat more complicated due to the need to parse the
         * square brackets and colons.
         *
         * A bare IPv6 address is accepted despite the lack of square brackets.
@@ -241,8 +241,13 @@ class IP {
        /**
         * Given a host name and a port, combine them into host/port string like
         * you might find in a URL. If the host contains a colon, wrap it in square
-        * brackets like in RFC 2732. If the port matches the default port, omit 
+        * brackets like in RFC 2732. If the port matches the default port, omit
         * the port specification
+        *
+        * @param $host string
+        * @param $port int
+        * @param $defaultPort bool|int
+        * @return string
         */
        public static function combineHostAndPort( $host, $port, $defaultPort = false ) {
                if ( strpos( $host, ':' ) !== false ) {
@@ -373,7 +378,7 @@ class IP {
                static $privateRanges = false;
                if ( !$privateRanges ) {
                        $privateRanges = array(
-                               array( 'fc::', 'fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' ), # RFC 4193 (local)
+                               array( 'fc00::', 'fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' ), # RFC 4193 (local)
                                array( '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1' ), # loopback
                        );
                }
@@ -449,6 +454,10 @@ class IP {
                return $n;
        }
 
+       /**
+        * @param $ip
+        * @return String
+        */
        private static function toUnsigned6( $ip ) {
                return wfBaseConvert( self::IPv6ToRawHex( $ip ), 16, 10 );
        }
@@ -548,6 +557,8 @@ class IP {
         * Convert a network specification in IPv6 CIDR notation to an
         * integer network and a number of bits
         *
+        * @param $range
+        *
         * @return array(string, int)
         */
        private static function parseCIDR6( $range ) {
@@ -585,6 +596,9 @@ class IP {
         *     2001:0db8:85a3::7344/96                                   CIDR
         *     2001:0db8:85a3::7344 - 2001:0db8:85a3::7344   Explicit range
         *     2001:0db8:85a3::7344/96                                   Single IP
+        *
+        * @param $range
+        *
         * @return array(string, string)
         */
        private static function parseRange6( $range ) {
@@ -691,10 +705,13 @@ class IP {
         * @param $range String: IP address to normalize
         * @return string
         */
-       public static function sanitizeRange( $range ){
+       public static function sanitizeRange( $range ) {
                list( /*...*/, $bits ) = self::parseCIDR( $range );
                list( $start, /*...*/ ) = self::parseRange( $range );
                $start = self::formatHex( $start );
+               if ( $bits === false ) {
+                       return $start; // wasn't actually a range
+               }
                return "$start/$bits";
        }
 }