From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 31 Mar 2005 10:37:54 +0000 (+0000)
Subject: fixed bug
X-Git-Tag: 1.5.0alpha1~446
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=50f2612218fa7df442cf93f688c2c5a0162199a5;p=lhc%2Fweb%2Fwiklou.git

fixed bug
---

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index d335faee93..cf19119571 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -32,8 +32,12 @@ function wfGetIP()
 	if ( count( $trustedProxies ) ) {
 		# Append XFF on to $ipchain
 		if ( isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-			$ipchain = array_merge( $ipchain, array_map( 'trim', explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) );
+			$xff = explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] );
+			for ( $i = 1; $i <= count( $xff ); $i++ ) {
+				$ipchain[$i] = trim( $xff[count($xff) - $i );
+			}
 		}
+		var_dump( $ipchain );
 		# Step through XFF list and find the last address in the list which is a trusted server
 		# Set $ip to the IP address given by that trusted server, unless the address is not sensible (e.g. private)
 		foreach ( $ipchain as $i => $curIP ) {