From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 24 Aug 2008 06:45:07 +0000 (+0000)
Subject: Removed the AOL hack. Use the TrustedXFF extension instead.
X-Git-Tag: 1.31.0-rc.0~45697
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=9a70df9bf19f5b83646b20556e3b4d0d69588b89;p=lhc%2Fweb%2Fwiklou.git

Removed the AOL hack. Use the TrustedXFF extension instead.
---

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 0f0104218a..759857d683 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -121,8 +121,7 @@ function wfIsTrustedProxy( $ip ) {
 	global $wgSquidServers, $wgSquidServersNoPurge;
 
 	if ( in_array( $ip, $wgSquidServers ) ||
-		in_array( $ip, $wgSquidServersNoPurge ) ||
-		wfIsAOLProxy( $ip )
+		in_array( $ip, $wgSquidServersNoPurge )
 	) {
 		$trusted = true;
 	} else {
@@ -212,50 +211,3 @@ function wfIsLocallyBlockedProxy( $ip ) {
 	return $ret;
 }
 
-/**
- * TODO: move this list to the database in a global IP info table incorporating
- * trusted ISP proxies, blocked IP addresses and open proxies.
- * @return bool
- */
-function wfIsAOLProxy( $ip ) {
-	# From http://webmaster.info.aol.com/proxyinfo.html
-	$ranges = array(
-		'64.12.96.0/19',
-		'149.174.160.0/20',
-		'152.163.240.0/21',
-		'152.163.248.0/22',
-		'152.163.252.0/23',
-		'152.163.96.0/22',
-		'152.163.100.0/23',
-		'195.93.32.0/22',
-		'195.93.48.0/22',
-		'195.93.64.0/19',
-		'195.93.96.0/19',
-		'195.93.16.0/20',
-		'198.81.0.0/22',
-		'198.81.16.0/20',
-		'198.81.8.0/23',
-		'202.67.64.128/25',
-		'205.188.192.0/20',
-		'205.188.208.0/23',
-		'205.188.112.0/20',
-		'205.188.146.144/30',
-		'207.200.112.0/21',
-	);
-
-	static $parsedRanges;
-	if ( is_null( $parsedRanges ) ) {
-		$parsedRanges = array();
-		foreach ( $ranges as $range ) {
-			$parsedRanges[] =  IP::parseRange( $range );
-		}
-	}
-
-	$hex = IP::toHex( $ip );
-	foreach ( $parsedRanges as $range ) {
-		if ( $hex >= $range[0] && $hex <= $range[1] ) {
-			return true;
-		}
-	}
-	return false;
-}