From a004602ce2fc37eac552e2b311f82d73260886c4 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Fri, 25 Apr 2025 10:07:01 +0300
Subject: [PATCH] Replaces olg logs helper with IP helper

---
 app/helpers/ip_helper.php | 24 ++++++++++++++++++++++++
 app/helpers/logs.php      | 20 --------------------
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 app/helpers/ip_helper.php
 delete mode 100644 app/helpers/logs.php

diff --git a/app/helpers/ip_helper.php b/app/helpers/ip_helper.php
new file mode 100644
index 0000000..3badf35
--- /dev/null
+++ b/app/helpers/ip_helper.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Returns the user's IP address.
+ * Uses global $user_IP set by Logger plugin if available, else falls back to server variables.
+ *
+ * @return string
+ */
+function getUserIP() {
+    global $user_IP;
+    if (!empty($user_IP)) {
+        return $user_IP;
+    }
+    // Fallback to HTTP headers or REMOTE_ADDR
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        return $_SERVER['HTTP_CLIENT_IP'];
+    }
+    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        // May contain multiple IPs
+        $parts = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        return trim($parts[0]);
+    }
+    return $_SERVER['REMOTE_ADDR'] ?? '';
+}
diff --git a/app/helpers/logs.php b/app/helpers/logs.php
deleted file mode 100644
index 21b53ed..0000000
--- a/app/helpers/logs.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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);
-}