Make the DNSBL used for proxy blocking configurable. This is better than hard-coding...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9e2ce25..b72e67a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2059,6 +2059,7 @@ $wgDisableHardRedirects = false;
  * Use http.dnsbl.sorbs.net to check for open proxies
  */
 $wgEnableSorbs = false;
+$wgSorbsUrl = 'http.dnsbl.sorbs.net';
 
 /**
  * Proxy whitelist, list of addresses that are assumed to be non-proxy despite what the other

diff --git a/includes/User.php b/includes/User.php
index 64084dd..7a3a885 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -861,9 +861,10 @@ class User {
        }
 
        function inSorbsBlacklist( $ip ) {
-               global $wgEnableSorbs;
+               global $wgEnableSorbs, $wgSorbsUrl;
+
                return $wgEnableSorbs &&
-                       $this->inDnsBlacklist( $ip, 'http.dnsbl.sorbs.net.' );
+                       $this->inDnsBlacklist( $ip, $wgSorbsUrl );
        }
 
        function inDnsBlacklist( $ip, $base ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7f2a404..63ea596 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1811,9 +1811,9 @@ the list of currently operational bans and blocks.',
 'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.',
 'proxyblockreason'     => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.',
 'proxyblocksuccess'    => 'Done.',
-'sorbs'         => 'SORBS DNSBL',
-'sorbsreason'   => 'Your IP address is listed as an open proxy in the [http://www.sorbs.net SORBS] DNSBL.',
-'sorbs_create_account_reason' => 'Your IP address is listed as an open proxy in the [http://www.sorbs.net SORBS] DNSBL. You cannot create an account',
+'sorbs'         => 'DNSBL',
+'sorbsreason'   => 'Your IP address is listed as an open proxy in the DNSBL used by this site.',
+'sorbs_create_account_reason' => 'Your IP address is listed as an open proxy in the DNSBL used by this site. You cannot create an account',
 
 
 # Developer tools