Add IP2Location.io API.

Author: ip2location

README.md

@@ -41,20 +41,11 @@ namespace App\Controller;
 use App\Controller\AppController;
 use IP2LocationCakePHP\Controller\IP2LocationCoresController;
 
-// (required) Define IP2Location API key.
-define('IP2LOCATION_API_KEY', 'your_api_key');
+// (required) Define IP2Location.io API key.
+define('IP2LOCATION_IO_API_KEY', 'your_api_key');
 
-// (required) Define IP2Location Web service package of different granularity of return information.
-define('IP2LOCATION_PACKAGE', 'WS1');
-
-// (optional) Define to use https or http.
-define('IP2LOCATION_USESSL', false);
-
-// (optional) Define extra information in addition to the above-selected package. Refer to https://www.ip2location.com/web-service/ip2location for the list of available addons.
-define('IP2LOCATION_ADDONS', []);
-
-// (optional) Define Translation information. Refer to https://www.ip2location.com/web-service/ip2location for available languages.
-define('IP2LOCATION_LANGUAGE', 'en');
+// (optional) Define Translation information. Refer to https://www.ip2location.io/ip2location-documentation for available languages.
+define('IP2LOCATION_IO_LANGUAGE', 'en');
 
 /**
  * Tests Controller
@@ -128,7 +119,7 @@ This library requires IP2Location BIN data file or IP2Location API key to functi
 * IP2Location LITE BIN Data (Free): https://lite.ip2location.com
 * IP2Location Commercial BIN Data (Comprehensive): https://www.ip2location.com
 
-You can also sign up for [IP2Location Web Service](https://www.ip2location.com/web-service/ip2location) to get one free API key.
+You can also sign up for [IP2Location.io IP Geolocation API](https://www.ip2location.io/sign-up) to get one free API key.
 
 
 ## IPv4 BIN vs IPv6 BIN

src/Controller/IP2LocationCoresController.php

@@ -2,24 +2,29 @@
 namespace IP2LocationCakePHP\Controller;
 
 // Web Service Settings
-if(!defined('IP2LOCATION_API_KEY')) {
-    define('IP2LOCATION_API_KEY', 'demo');
-}
-
-if(!defined('IP2LOCATION_PACKAGE')) {
-    define('IP2LOCATION_PACKAGE', 'WS1');
-}
-
-if(!defined('IP2LOCATION_USESSL')) {
-    define('IP2LOCATION_USESSL', false);
-}
-
-if(!defined('IP2LOCATION_ADDONS')) {
-    define('IP2LOCATION_ADDONS', []);
-}
-
-if(!defined('IP2LOCATION_LANGUAGE')) {
-    define('IP2LOCATION_LANGUAGE', 'en');
+if(defined('IP2LOCATION_IO_API_KEY')) {
+	define('USE_IO', true);
+} else  {
+	define('USE_IO', false);
+	if(!defined('IP2LOCATION_API_KEY')) {
+		define('IP2LOCATION_API_KEY', 'demo');
+	}
+
+	if(!defined('IP2LOCATION_PACKAGE')) {
+		define('IP2LOCATION_PACKAGE', 'WS1');
+	}
+
+	if(!defined('IP2LOCATION_USESSL')) {
+		define('IP2LOCATION_USESSL', false);
+	}
+
+	if(!defined('IP2LOCATION_ADDONS')) {
+		define('IP2LOCATION_ADDONS', []);
+	}
+
+	if(!defined('IP2LOCATION_LANGUAGE')) {
+		define('IP2LOCATION_LANGUAGE', 'en');
+	}
 }
 
 /**
@@ -56,15 +61,51 @@ public function get($ip, $db = '')
 
     public function getWebService($ip)
     {
-        $ws = new \IP2Location\WebService(IP2LOCATION_API_KEY, IP2LOCATION_PACKAGE, IP2LOCATION_USESSL);
-
-        try {
-            $records = $ws->lookup($ip, IP2LOCATION_ADDONS, IP2LOCATION_LANGUAGE);
-        } catch (Exception $e) {
-            return null;
-        }
-
-        return $records;
+		if (USE_IO) {
+			// Using IP2Location.io API
+			$ioapi_baseurl = 'https://api.ip2location.io/?';
+			$params = [
+				'key'     => IP2LOCATION_IO_API_KEY,
+				'ip'      => $ip,
+				'lang'    => ((defined('IP2LOCATION_IO_LANGUAGE')) ? IP2LOCATION_IO_LANGUAGE : ''),
+			];
+			// Remove parameters without values
+			$params = array_filter($params);
+			$url = $ioapi_baseurl . http_build_query($params);
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_FAILONERROR, 0);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+			$response = curl_exec($ch);
+
+			if (!curl_errno($ch)) {
+				if (($data = json_decode($response, true)) === null) {
+					return false;
+				}
+				if (array_key_exists('error', $data)) {
+					throw new \Exception(__CLASS__ . ': ' . $data['error']['error_message'], $data['error']['error_code']);
+				}
+				return $data;
+			}
+
+			curl_close($ch);
+
+			return false;
+		} else {
+			$ws = new \IP2Location\WebService(IP2LOCATION_API_KEY, IP2LOCATION_PACKAGE, IP2LOCATION_USESSL);
+
+			try {
+				$records = $ws->lookup($ip, IP2LOCATION_ADDONS, IP2LOCATION_LANGUAGE);
+			} catch (Exception $e) {
+				return null;
+			}
+
+			return $records;
+		}
     }
 
     public function isIpv4($ip)