https://github.com/opencart/opencart/issues/13927

opencart · May 10, 2024 · 6efe939 · 6efe939
1 parent 3c4a930
commit 6efe939
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/upload/system/helper/general.php b/upload/system/helper/general.php
@@ -1,5 +1,22 @@
 <?php
-// String
+/*
+ * @return string
+ */
+function oc_get_ip(): string {
+	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+		return $_SERVER['HTTP_X_FORWARDED_FOR'];
+	} elseif (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+		return $_SERVER['HTTP_CLIENT_IP'];
+	} else {
+		return $_SERVER['REMOTE_ADDR'];
+	}
+}
+
+/**
+ * @param string $string
+ *
+ * @return string
+ */
 function oc_strlen(string $string): int {
 	return mb_strlen($string);
 }

diff --git a/upload/system/startup.php b/upload/system/startup.php
@@ -45,10 +45,8 @@
 	$_SERVER['HTTPS'] = false;
 }
 
-// Check IP if forwarded IP
-if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
-} elseif (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+// Check IP
+if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
 	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CLIENT_IP'];
 }