From d92492d5a1c23d5d0018f762abec8d90b855ce6c Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 21 Jul 2017 12:06:36 +0200 Subject: [PATCH] DirectorActivityLog: use IP when unauthenticated This applies mostly to self service API --- library/Director/Objects/DirectorActivityLog.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/Director/Objects/DirectorActivityLog.php b/library/Director/Objects/DirectorActivityLog.php index 4eb6635d..57b3b625 100644 --- a/library/Director/Objects/DirectorActivityLog.php +++ b/library/Director/Objects/DirectorActivityLog.php @@ -57,6 +57,10 @@ class DirectorActivityLog extends DbObject $auth = Auth::getInstance(); if ($auth->isAuthenticated()) { return $auth->getUser()->getUsername(); + } elseif (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER)) { + return '<' . $_SERVER['HTTP_X_FORWARDED_FOR'] . '>'; + } elseif (array_key_exists('REMOTE_ADDR', $_SERVER)) { + return '<' . $_SERVER['REMOTE_ADDR'] . '>'; } else { return ''; }