rename *_ADDRESS_PROVIDER -> *_ADDRESS_URL

Author: henningkerstan

config.dist.php

@@ -28,23 +28,23 @@
 // define('HOST', 'server');
 
 
-// Set a URL to use to determine the public IPv4 address. It must 
+// Enter a URL to use to determine the public IPv4 address. It must 
 // only return an IPv4 address in plain text, otherwise the script will fail.
-define('IPV4_ADDRESS_PROVIDER', 'https://api.ipify.org');
+define('IPV4_ADDRESS_URL', 'https://api.ipify.org');
 
-// Set a URL to use as fallback to determine the public IPv4 
+// Enter a URL to use as fallback to determine the public IPv4 
 // address. It must only return an IPv4 address in plain text, otherwise the 
 // script will fail.
-define('IPV4_ADDRESS_PROVIDER_FALLBACK', 'https://ipv4.seeip.org');
+define('IPV4_ADDRESS_URL_FALLBACK', 'https://ipv4.seeip.org');
 
-// Set a URL to use to determine the public IPv6 address. It must 
+// Enter a URL to use to determine the public IPv6 address. It must 
 // only return an IPv6 address in plain text, otherwise the script will fail.
-define('IPV6_ADDRESS_PROVIDER', 'https://ipv6.seeip.org');
+define('IPV6_ADDRESS_URL', 'https://ipv6.seeip.org');
 
-// Set a URL to use as fallback to determine the public IPv6 
+// Enter a URL to use as fallback to determine the public IPv6 
 // address. It must only return an IPv6 address in plain text, otherwise the 
 // script will fail.
-define('IPV6_ADDRESS_PROVIDER_FALLBACK', 'https://v6.ident.me/');
+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.

functions.php

@@ -277,9 +277,9 @@ function getCurrentPublicIPv4()
         return $providedIPv4;
     }
 
-    outputStdout('Getting IPv4 address from ' . IPV4_ADDRESS_PROVIDER . '.');
+    outputStdout('Getting IPv4 address from ' . IPV4_ADDRESS_URL . '.');
 
-    $url = IPV4_ADDRESS_PROVIDER;
+    $url = IPV4_ADDRESS_URL;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -292,8 +292,8 @@ function getCurrentPublicIPv4()
         }
 
         if (!isIPV4Valid($publicIP) || $publicIP === false) {
-            outputWarning(IPV4_ADDRESS_PROVIDER . " didn't return a valid IPv4 address (Try $retryCount / $retryLimit). Trying fallback " . IPV4_ADDRESS_PROVIDER_FALLBACK);
-            $url = IPV4_ADDRESS_PROVIDER_FALLBACK;
+            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)) {
@@ -324,9 +324,9 @@ function getCurrentPublicIPv6()
         return $providedIPv6;
     }
 
-    outputStdout('Getting IPv6 address from ' . IPV6_ADDRESS_PROVIDER. '.');
+    outputStdout('Getting IPv6 address from ' . IPV6_ADDRESS_URL. '.');
 
-    $url = IPV6_ADDRESS_PROVIDER;
+    $url = IPV6_ADDRESS_URL;
     $ch = initializeCurlHandlerGetIP($url);
     $publicIP = trim(curl_exec($ch));
 
@@ -339,8 +339,8 @@ function getCurrentPublicIPv6()
         }
 
         if (!isIPV6Valid($publicIP) || $publicIP === false) {
-            outputWarning(IPV6_ADDRESS_PROVIDER . " didn't return a valid IPv6 address (Try $retryCount / $retryLimit). Trying fallback " . IPV6_ADDRESS_PROVIDER_FALLBACK);
-            $url = IPV6_ADDRESS_PROVIDER_FALLBACK;
+            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,20 +24,20 @@
     exit(1);
 }
 
-if (!defined('IPV4_ADDRESS_PROVIDER')) {
-    define('IPV4_ADDRESS_PROVIDER', 'https://api.ipify.org');
+if (!defined('IPV4_ADDRESS_URL')) {
+    define('IPV4_ADDRESS_URL', 'https://api.ipify.org');
 }
 
-if (!defined('IPV4_ADDRESS_PROVIDER_FALLBACK')) {
-    define('IPV4_ADDRESS_PROVIDER_FALLBACK', 'https://ipv4.seeip.org');
+if (!defined('IPV4_ADDRESS_URL_FALLBACK')) {
+    define('IPV4_ADDRESS_URL_FALLBACK', 'https://ipv4.seeip.org');
 }
 
-if (!defined('IPV6_ADDRESS_PROVIDER')) {
-    define('IPV6_ADDRESS_PROVIDER', 'https://ipv6.seeip.org');
+if (!defined('IPV6_ADDRESS_URL')) {
+    define('IPV6_ADDRESS_URL', 'https://ipv6.seeip.org');
 }
 
-if (!defined('IPV6_ADDRESS_PROVIDER_FALLBACK')) {
-    define('IPV6_ADDRESS_PROVIDER_FALLBACK', 'https://v6.ident.me/');
+if (!defined('IPV6_ADDRESS_URL_FALLBACK')) {
+    define('IPV6_ADDRESS_URL_FALLBACK', 'https://v6.ident.me/');
 }   
 
 if (USE_IPV4 === true) {