From be0cd48c010326997cc14cba3c3e0a7837d533e7 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Tue, 17 Sep 2024 14:22:43 +0300
Subject: [PATCH] Adds user IP to the logs.

---
 app/helpers/logs.php  | 22 ++++++++++++++++++++++
 app/pages/login.php   |  4 ++--
 public_html/index.php |  4 +++-
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 app/helpers/logs.php

diff --git a/app/helpers/logs.php b/app/helpers/logs.php
new file mode 100644
index 0000000..20cce26
--- /dev/null
+++ b/app/helpers/logs.php
@@ -0,0 +1,22 @@
+<?php
+
+function getUserIP() {
+    // get directly the user IP
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    // if user is behind some proxy
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
+
+    // get only the first IP if there are more
+    if (strpos($ip, ',') !== false) {
+        $ip = explode(',', $ip)[0];
+    }
+
+    return trim($ip);
+}
+
+?>
diff --git a/app/pages/login.php b/app/pages/login.php
index 52cf59a..926fd8c 100644
--- a/app/pages/login.php
+++ b/app/pages/login.php
@@ -41,7 +41,7 @@ try {
             // redirect to index
             $_SESSION['notice'] = "Login successful";
             $user_id = $userObject->getUserId($username)[0]['id'];
-            $logObject->insertLog($user_id, "Login: User \"$username\" logged in.", 'user');
+            $logObject->insertLog($user_id, "Login: User \"$username\" logged in. IP: $user_IP", 'user');
             header('Location: index.php');
             exit();
 
@@ -49,7 +49,7 @@ try {
         } else {
             $_SESSION['error'] = "Login failed.";
             $user_id = $userObject->getUserId($username)[0]['id'];
-            $logObject->insertLog($user_id, "Login: Failed login attempt for user \"$username\".", 'user');
+            $logObject->insertLog($user_id, "Login: Failed login attempt for user \"$username\". IP: $user_IP", 'user');
             header('Location: index.php');
             exit();
         }
diff --git a/public_html/index.php b/public_html/index.php
index 36bbd8d..29fcc2d 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -111,7 +111,9 @@ $dbWeb = connectDB($config);
 
 // start logging
 require '../app/classes/log.php';
+include '../app/helpers/logs.php';
 $logObject = new Log($dbWeb);
+$user_IP = getUserIP();
 
 // get platforms details
 require '../app/classes/platform.php';
@@ -133,7 +135,7 @@ if ($page == 'logout') {
 
     $notice = "You were logged out.<br />You can log in again.";
     $user_id = $userObject->getUserId($currentUser)[0]['id'];
-    $logObject->insertLog($user_id, "Logout: User \"$currentUser\" logged out.", 'user');
+    $logObject->insertLog($user_id, "Logout: User \"$currentUser\" logged out. IP: $user_IP", 'user');
 
     // clean up session
     session_unset();