From 9369e9b140b781ab222f854c985f990df26ea554 Mon Sep 17 00:00:00 2001
From: akkushopJK <jk@akkushop.de>
Date: Wed, 9 Feb 2022 12:15:32 +0100
Subject: [PATCH] Possible solution for
 https://github.com/lengow/plugin-shopware/issues/5 Use Shopware method
 (string)
 Shopware()->Container()->get('request_stack')->getCurrentRequest()->getClientIp()

---
 Components/LengowImportOrder.php          | 2 +-
 Components/LengowMain.php                 | 2 +-
 Controllers/Frontend/LengowController.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Components/LengowImportOrder.php b/Components/LengowImportOrder.php
index d4c8967..e49f875 100755
--- a/Components/LengowImportOrder.php
+++ b/Components/LengowImportOrder.php
@@ -1396,7 +1396,7 @@ private function createShopwareOrder($customer, $articles, $lengowOrder)
                 'currency' => $currency->getCurrency(),
                 'currencyFactor' => $currency->getFactor(),
                 'subshopID' => $this->shop->getId(),
-                'remote_addr' => $_SERVER['REMOTE_ADDR'],
+                'remote_addr' => (string) Shopware()->Container()->get('request_stack')->getCurrentRequest()->getClientIp(),
             );
             Shopware()->Db()->insert('s_order', $orderParams);
             // get temporary order
diff --git a/Components/LengowMain.php b/Components/LengowMain.php
index 7955ad8..288d30c 100755
--- a/Components/LengowMain.php
+++ b/Components/LengowMain.php
@@ -231,7 +231,7 @@ public static function checkIp()
         if (isset($_SERVER['SERVER_ADDR'])) {
             $authorizedIps[] = $_SERVER['SERVER_ADDR'];
         }
-        return in_array($_SERVER['REMOTE_ADDR'], $authorizedIps, true);
+        return in_array((string) Shopware()->Container()->get('request_stack')->getCurrentRequest()->getClientIp(), $authorizedIps, true);
     }
 
     /**
diff --git a/Controllers/Frontend/LengowController.php b/Controllers/Frontend/LengowController.php
index 7d2c1c5..1e409f0 100755
--- a/Controllers/Frontend/LengowController.php
+++ b/Controllers/Frontend/LengowController.php
@@ -395,7 +395,7 @@ private function checkAccess($token, $shop = null)
                 $errorMessage = LengowMain::decodeLogMessage(
                     'log/export/unauthorised_ip',
                     LengowTranslation::DEFAULT_ISO_CODE,
-                    array('ip' => $_SERVER['REMOTE_ADDR'])
+                    array('ip' => (string) Shopware()->Container()->get('request_stack')->getCurrentRequest()->getClientIp())
                 );
             } else {
                 $errorMessage = $token !== ''