From ee2130ed331247ba24bdccdf8c7b2a9e85d8df8e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 2 Feb 2022 10:58:43 +1100
Subject: [PATCH] v5.3.55

---
 .env.example        | 2 +-
 VERSION.txt         | 2 +-
 app/Utils/Ninja.php | 4 ++--
 config/ninja.php    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env.example b/.env.example
index 69001f07b2..95ce31237f 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
 APP_NAME="Invoice Ninja"
 APP_ENV=production
-APP_KEY=
+APP_KEY=base64:RR++yx2rJ9kdxbdh3+AmbHLDQu+Q76i++co9Y8ybbno=
 APP_DEBUG=false
 
 APP_URL=http://localhost
diff --git a/VERSION.txt b/VERSION.txt
index 045285d57c..f3a1d04bd3 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.54
\ No newline at end of file
+5.3.55
\ No newline at end of file
diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php
index 515d472308..95435412a9 100644
--- a/app/Utils/Ninja.php
+++ b/app/Utils/Ninja.php
@@ -119,9 +119,9 @@ class Ninja
             if(request()->hasHeader('Cf-Connecting-Ip'))
                 $ip = request()->header('Cf-Connecting-Ip');
             elseif(request()->hasHeader('X-Forwarded-For'))
-                $ip = request()->header('Cf-Connecting-Ip');
+                $ip = request()->header('X-Forwarded-For');
             else
-                $ip = request()->ip();
+                $ip = request()->ip() ?: ' ';
 
         return [
             'ip' => $ip,
diff --git a/config/ninja.php b/config/ninja.php
index 1ae6e825c0..64676a4cc4 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.54',
-    'app_tag' => '5.3.54',
+    'app_version' => '5.3.55',
+    'app_tag' => '5.3.55',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),