use variables for IPv4/IPv6 address provider

Author: henningkerstan

config.dist.php

@@ -33,6 +33,13 @@
 // Most likely though, you should keep this active, unless you know otherwise.
 define('USE_IPV4', true);
 
+
+define('IPV4_ADDRESS_PROVIDER', 'https://api.ipify.org');
+define('IPV4_ADDRESS_PROVIDER_FALLBACK', 'https://ipv4.seeip.org');
+define('IPV6_ADDRESS_PROVIDER', 'https://ipv6.seeip.org');
+define('IPV6_ADDRESS_PROVIDER_FALLBACK', 'https://v6.ident.me/');
+
+
 // If set to true, the script will check for your public IPv6 address too and add it as an AAAA-Record / change an existing AAAA-Record for the host.
 // Activate this only if you have IPv6 connectivity, or you *WILL* get errors.
 define('USE_IPV6', false);

functions.php

@@ -279,7 +279,7 @@ function getCurrentPublicIPv4()
 
     outputStdout('Getting IPv4 address from API.');
 
-    $url = 'https://api.ipify.org';
+    $url = IPV4_ADDRESS_PROVIDER;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -292,8 +292,8 @@ function getCurrentPublicIPv4()
         }
 
         if (!isIPV4Valid($publicIP) || $publicIP === false) {
-            outputWarning("https://api.ipify.org didn't return a valid IPv4 address (Try $retryCount / $retryLimit). Trying fallback API https://ipv4.seeip.org");
-            $url = 'https://ipv4.seeip.org';
+            outputWarning(IPV4_ADDRESS_PROVIDER . " didn't return a valid IPv4 address (Try $retryCount / $retryLimit). Trying fallback API " . IPV4_ADDRESS_PROVIDER_FALLBACK);
+            $url = IPV4_ADDRESS_PROVIDER_FALLBACK;
             $ch = initializeCurlHandlerGetIP($url);
             $publicIP = trim(curl_exec($ch));
             if (!wasCurlSuccessful($ch) || !isIPV4Valid($publicIP)) {
@@ -326,7 +326,7 @@ function getCurrentPublicIPv6()
 
     outputStdout('Getting IPv6 address from API.');
 
-    $url = 'https://ipv6.seeip.org';
+    $url = IPV6_ADDRESS_PROVIDER;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -339,8 +339,8 @@ function getCurrentPublicIPv6()
         }
 
         if (!isIPV6Valid($publicIP) || $publicIP === false) {
-            outputWarning("https://ipv6.seeip.org didn't return a valid IPv6 address (Try $retryCount / $retryLimit). Trying fallback API https://v6.ident.me/");
-            $url = 'https://v6.ident.me/';
+            outputWarning(IPV6_ADDRESS_PROVIDER . " didn't return a valid IPv6 address (Try $retryCount / $retryLimit). Trying fallback API " . IPV6_ADDRESS_PROVIDER_FALLBACK);
+            $url = IPV6_ADDRESS_PROVIDER_FALLBACK;
             $ch = initializeCurlHandlerGetIP($url);
             $publicIP = trim(curl_exec($ch));
             if (!wasCurlSuccessful($ch) || !isIPV6Valid($publicIP)) {

update.php

@@ -24,6 +24,22 @@
     exit(1);
 }
 
+if (!defined('IPV4_ADDRESS_PROVIDER')) {
+    define('IPV4_ADDRESS_PROVIDER', 'https://api.ipify.org');
+}
+
+if (!defined('IPV4_ADDRESS_PROVIDER_FALLBACK')) {
+    define('IPV4_ADDRESS_PROVIDER_FALLBACK', 'https://ipv4.seeip.org');
+}
+
+if (!defined('IPV6_ADDRESS_PROVIDER')) {
+    define('IPV6_ADDRESS_PROVIDER', 'https://ipv6.seeip.org');
+}
+
+if (!defined('IPV6_ADDRESS_PROVIDER_FALLBACK')) {
+    define('IPV6_ADDRESS_PROVIDER_FALLBACK', 'https://v6.ident.me/');
+}   
+
 if (USE_IPV4 === true) {
     // Get current IPv4 address
     if (!$publicIPv4 = getCurrentPublicIPv4()) {