X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Futils%2FIP.php;h=55a8994748d6198f8bd94391cdae3326036f98c3;hb=96dd55fde17f13f61060c5786ef4076742af9272;hp=0e2db8cc071fd0fdf572e7f1728e8aec3dd12e6a;hpb=227204c69b59dda16c6011002f8f3db7a874ded1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/utils/IP.php b/includes/utils/IP.php
index 0e2db8cc07..55a8994748 100644
--- a/includes/utils/IP.php
+++ b/includes/utils/IP.php
@@ -628,6 +628,25 @@ class IP {
 			strcmp( $hexIP, $end ) <= 0 );
 	}
 
+	/**
+	 * Determines if an IP address is a list of CIDR a.b.c.d/n ranges.
+	 *
+	 * @since 1.25
+	 *
+	 * @param string $ip the IP to check
+	 * @param array $ranges the IP ranges, each element a range
+	 *
+	 * @return bool true if the specified adress belongs to the specified range; otherwise, false.
+	 */
+	public static function isInRanges( $ip, $ranges ) {
+		foreach ( $ranges as $range ) {
+			if ( self::isInRange( $ip, $range ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Convert some unusual representations of IPv4 addresses to their
 	 * canonical dotted quad representation.
@@ -698,7 +717,7 @@ class IP {
 	 */
 	public static function isTrustedProxy( $ip ) {
 		$trusted = self::isConfiguredProxy( $ip );
-		wfRunHooks( 'IsTrustedProxy', array( &$ip, &$trusted ) );
+		Hooks::run( 'IsTrustedProxy', array( &$ip, &$trusted ) );
 		return $trusted;
 	}