From afa84968c7743c5d549f6d0d25185645540a23da Mon Sep 17 00:00:00 2001
From: Jeff Bierschbach <jeff.bierschbach@grainmillers.com>
Date: Sat, 8 Jan 2022 06:16:05 -0600
Subject: [PATCH] Save correct IP address to database (#457)

---
 backend/getIP.php      | 21 ++-------------------
 backend/getIP_util.php | 20 ++++++++++++++++++++
 results/telemetry.php  |  3 ++-
 3 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 backend/getIP_util.php

diff --git a/backend/getIP.php b/backend/getIP.php
index a2ed9a0..0b6267d 100755
--- a/backend/getIP.php
+++ b/backend/getIP.php
@@ -2,7 +2,7 @@
 
 /*
  * This script detects the client's IP address and fetches ISP info from ipinfo.io/
- * Output from this script is a JSON string composed of 2 objects: a string called processedString which contains the combined IP, ISP, Contry and distance as it can be presented to the user; and an object called rawIspInfo which contains the raw data from ipinfo.io (will be empty if isp detection is disabled).
+ * Output from this script is a JSON string composed of 2 objects: a string called processedString which contains the combined IP, ISP, Country and distance as it can be presented to the user; and an object called rawIspInfo which contains the raw data from ipinfo.io (will be empty if isp detection is disabled).
  * Client side, the output of this script can be treated as JSON or as regular text. If the output is regular text, it will be shown to the user as is.
  */
 
@@ -11,24 +11,7 @@ error_reporting(0);
 define('API_KEY_FILE', 'getIP_ipInfo_apikey.php');
 define('SERVER_LOCATION_CACHE_FILE', 'getIP_serverLocation.php');
 
-/**
- * @return string
- */
-function getClientIp()
-{
-    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
-        $ip = $_SERVER['HTTP_CLIENT_IP'];
-    } elseif (!empty($_SERVER['HTTP_X_REAL_IP'])) {
-        $ip = $_SERVER['HTTP_X_REAL_IP'];
-    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-        $ip = preg_replace('/,.*/', '', $ip); # hosts are comma-separated, client is first
-    } else {
-        $ip = $_SERVER['REMOTE_ADDR'];
-    }
-
-    return preg_replace('/^::ffff:/', '', $ip);
-}
+require_once 'getIP_util.php';
 
 /**
  * @param string $ip
diff --git a/backend/getIP_util.php b/backend/getIP_util.php
new file mode 100644
index 0000000..5cc6b64
--- /dev/null
+++ b/backend/getIP_util.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @return string
+ */
+function getClientIp() {
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_REAL_IP'])) {
+        $ip = $_SERVER['HTTP_X_REAL_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        $ip = preg_replace('/,.*/', '', $ip); # hosts are comma-separated, client is first
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
+
+    return preg_replace('/^::ffff:/', '', $ip);
+}
+
diff --git a/results/telemetry.php b/results/telemetry.php
index 5824c43..18bb733 100755
--- a/results/telemetry.php
+++ b/results/telemetry.php
@@ -2,8 +2,9 @@
 
 require 'telemetry_settings.php';
 require_once 'telemetry_db.php';
+require_once '../backend/getIP_util.php';
 
-$ip = $_SERVER['REMOTE_ADDR'];
+$ip = getClientIp();
 $ispinfo = $_POST['ispinfo'];
 $extra = $_POST['extra'];
 $ua = $_SERVER['HTTP_USER_AGENT'];