Merge pull request #27 from gavinjackson/master

Check that customer IP address is present (and increment version)
fatzebra · Apr 23, 2021 · 6d08b3e · 6d08b3e
2 parents a30df99 + a8852c6
commit 6d08b3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/README.markdown b/README.markdown
@@ -1,7 +1,7 @@
 PHP API Library for Fat Zebra
 ==============================
 
-Release 1.2.2 for API version 1.0
+Release 1.2.3 for API version 1.0
 
 A PHP library for the [Fat Zebra](https://www.fatzebra.com.au) Online Payment Gateway (for Australian Merchants)
 Now supports recurring billing (subscriptions, plans, customers)

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "fatzebra/fatzebra-php",
-	"version": "1.2.2",
+	"version": "1.2.3",
 	"repositories": [
 		{
 			"type": "vcs",

diff --git a/src/Gateway.php b/src/Gateway.php
@@ -528,15 +528,15 @@ protected function do_request($method, $uri, $payload = null)
      */
     private function get_customer_ip()
     {
-        $customer_ip = $_SERVER['REMOTE_ADDR'];
+
+        $customer_ip = "UNKNOWN";
+        if (isset($_SERVER['REMOTE_ADDR'])) {
+            $customer_ip = $_SERVER['REMOTE_ADDR'];
+        }
         if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
             $forwarded_ips = explode(', ', $_SERVER['HTTP_X_FORWARDED_FOR']);
             $customer_ip = $forwarded_ips[0];
         }
-
-        if ($customer_ip == null) {
-            $customer_ip = 'UNKNOWN';
-        }
         return $customer_ip;
     }