From: Steve Clay <steve@mrclay.org>
Date: Sun, 8 Dec 2013 01:27:32 +0000 (-0500)
Subject: Fixes #6012: Gets correct client IP behind proxy (1.8)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f4420e017f6dc2039e8e3910e5b98c0eb17a7be2;p=lorea%2Felgg.git

Fixes #6012: Gets correct client IP behind proxy (1.8)
---

diff --git a/engine/lib/system_log.php b/engine/lib/system_log.php
index 5a153afb2..bed863755 100644
--- a/engine/lib/system_log.php
+++ b/engine/lib/system_log.php
@@ -187,7 +187,11 @@ function system_log($object, $event) {
 		$object_subtype = $object->getSubtype();
 		$event = sanitise_string($event);
 		$time = time();
-		$ip_address = sanitise_string($_SERVER['REMOTE_ADDR']);
+		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$ip_address = array_pop(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']));
+		} else {
+			$ip_address = sanitise_string($_SERVER['REMOTE_ADDR']);
+		}
 		$performed_by = elgg_get_logged_in_user_guid();
 
 		if (isset($object->access_id)) {