[BUGFIX] Update API calls, to retrieve IP locations

extensions/t3omy/Classes/Hooks/FeManagerHooks.php

@@ -324,26 +324,32 @@ class FeManagerHooks
      */
     protected function getLocationDataByIp()
     {
-        $location = '';
-        $locationDataAsJson = GeneralUtility::getUrl('http://geoip.nekudo.com/api/' . GeneralUtility::getIndpEnv('REMOTE_ADDR'));
-        $locationData = json_decode($locationDataAsJson, true);
-
-        if (!empty($locationData)) {
-            if (isset($locationData['type']) && $locationData['type'] === 'error') {
-                $location = 'Location could not retrieved: ' . $locationData['msg'] . ' with IP: ' . GeneralUtility::getIndpEnv('REMOTE_ADDR');
-            } else {
-                if (isset($locationData['country']['name'])) {
-                    $location = $locationData['country']['name'];
-                }
-
-                if (isset($locationData['city']) && $locationData['city']) {
-                    $location .= ', ' . $locationData['city'];
+        if ($this->settings['ipapi']['access_key']) {
+            $apiUrl = 'http://api.ipapi.com/' . GeneralUtility::getIndpEnv('REMOTE_ADDR');
+            $apiUrl .= '?access_key=' . $this->settings['ipapi']['access_key'];
+            $location = '';
+            $locationDataAsJson = GeneralUtility::getUrl($apiUrl);
+            $locationData = json_decode($locationDataAsJson, true);
+
+            if (!empty($locationData)) {
+                if (isset($locationData['type']) && $locationData['type'] === 'error') {
+                    $location = 'Location could not retrieved: ' . $locationData['msg'] . ' with IP: ' . GeneralUtility::getIndpEnv('REMOTE_ADDR');
+                } else {
+                    if (isset($locationData['country_name'])) {
+                        $location = $locationData['country_name'];
+                    }
+
+                    if (isset($locationData['city']) && $locationData['city']) {
+                        $location .= ', ' . $locationData['city'];
+                    }
                 }
+            } else {
+                $location = 'Empty result from api.ipapi.com.';
             }
+
+            return $location;
         } else {
-            $location = 'Empty result from geoip.nekudo.com/api/.';
+            return 'No Access key is set in typoscript constants - tx_t3omy.ipapi.access_key';
         }
-
-        return $location;
     }
 }

extensions/t3omy/Configuration/TypoScript/main.txt

@@ -18,6 +18,7 @@ plugin.tx_t3omy {
          url =
       }
    }
+   ipapi.access_key = {$tx_t3omy.ipapi.access_key}
 }
 
 config.tx_realurl_enable = 1

extensions/t3omy/ext_typoscript_constants.txt

@@ -13,6 +13,12 @@ plugin.tx_femanager.settings.adminName = TYPO3 Association / typo3.org Administr
 plugin.tx_femanager.settings.adminEmail = confirm-t3o-account@typo3.org
 plugin.tx_femanager.persistence.storagePid = 5
 
+#################
+### Settings  ###
+#################
+# cat=T3Omy Settings/ipapi/001; type=string;  label = Access Key for api.ipapi.com
+tx_t3omy.ipapi.access_key =
+
 ###############
 ### PageIds ###
 ###############