Merge branch 'custom-ip-address-url'

Author: stecklars

config.dist.php

@@ -28,6 +28,23 @@
 // define('HOST', 'server');
 
 
+// Enter a URL to use to determine the public IPv4 address. 
+// [Optional; will be set to default value 'https://api.ipify.org' if missing.]
+define('IPV4_ADDRESS_URL', 'https://api.ipify.org');
+
+// Enter a URL to use as fallback to determine the public IPv4 address. 
+// [Optional; will be set to default value 'https://ipv4.seeip.org' if missing.]
+define('IPV4_ADDRESS_URL_FALLBACK', 'https://ipv4.seeip.org');
+
+// Enter a URL to use to determine the public IPv6 address.
+// [Optional; will be set to default value 'https://ipv6.seeip.org' if missing.]
+define('IPV6_ADDRESS_URL', 'https://ipv6.seeip.org');
+
+// Enter a URL to use as fallback to determine the public IPv6 address.
+// [Optional; will be set to default value 'https://v6.ident.me' if missing.]
+define('IPV6_ADDRESS_URL_FALLBACK', 'https://v6.ident.me');
+
+
 // If set to true, the script will check for your public IPv4 address and add it as an A-Record / change an existing A-Record for the host.
 // You may want to deactivate this, for example, when using a carrier grade NAT (CGNAT).
 // Most likely though, you should keep this active, unless you know otherwise.

functions.php

@@ -297,9 +297,9 @@ function getCurrentPublicIPv4()
         return $providedIPv4;
     }
 
-    outputStdout('Getting IPv4 address from API.');
+    outputStdout('Getting IPv4 address from ' . IPV4_ADDRESS_URL . '.');
 
-    $url = 'https://api.ipify.org';
+    $url = IPV4_ADDRESS_URL;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -312,8 +312,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_URL . " didn't return a valid IPv4 address (Try $retryCount / $retryLimit). Trying fallback " . IPV4_ADDRESS_URL_FALLBACK);
+            $url = IPV4_ADDRESS_URL_FALLBACK;
             $ch = initializeCurlHandlerGetIP($url);
             $publicIP = trim(curl_exec($ch));
             if (!wasCurlSuccessful($ch) || !isIPV4Valid($publicIP)) {
@@ -344,9 +344,9 @@ function getCurrentPublicIPv6()
         return $providedIPv6;
     }
 
-    outputStdout('Getting IPv6 address from API.');
+    outputStdout('Getting IPv6 address from ' . IPV6_ADDRESS_URL . '.');
 
-    $url = 'https://ipv6.seeip.org';
+    $url = IPV6_ADDRESS_URL;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -359,8 +359,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_URL . " didn't return a valid IPv6 address (Try $retryCount / $retryLimit). Trying fallback " . IPV6_ADDRESS_URL_FALLBACK);
+            $url = IPV6_ADDRESS_URL_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_URL')) {
+    define('IPV4_ADDRESS_URL', 'https://api.ipify.org');
+}
+
+if (!defined('IPV4_ADDRESS_URL_FALLBACK')) {
+    define('IPV4_ADDRESS_URL_FALLBACK', 'https://ipv4.seeip.org');
+}
+
+if (!defined('IPV6_ADDRESS_URL')) {
+    define('IPV6_ADDRESS_URL', 'https://ipv6.seeip.org');
+}
+
+if (!defined('IPV6_ADDRESS_URL_FALLBACK')) {
+    define('IPV6_ADDRESS_URL_FALLBACK', 'https://v6.ident.me/');
+}   
+
 if (USE_IPV4 === true) {
     // Get current IPv4 address
     if (!$publicIPv4 = getCurrentPublicIPv4()) {