don't send blocked IPs to OSM's trac by default

diff --git a/lib/init-website.php b/lib/init-website.php
index bcf3ebf7a0aeb6674e874ebbf3ed7413572373dc..e47b73fb4bfa0d29b53f19c0c481e70d460a061c 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -55,8 +55,7 @@
        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
        {
                echo "Your IP has been blocked. \n";
        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
        {
                echo "Your IP has been blocked. \n";

-               echo "Please create a nominatim trac ticket (http://trac.openstreetmap.org/newticket?component=nominatim) to request this to be removed. \n";
-               echo "Information on the Nominatim usage policy can be found here: http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy \n";
+               echo CONST_BlockMessage;

                exit;
        }
 
                exit;
        }
 

diff --git a/settings/settings.php b/settings/settings.php
index 0ce34ad2e5601b7d972e9b68a0980ab63203f9b2..27b3446b3c9c70e7775055276a2e28225ece8cdb 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -55,6 +55,7 @@
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_BulkUserIPs', '');
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_BulkUserIPs', '');

+       @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs

 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');