Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 8603e309f426f888bb8bd1834ee8a6b86be75736..ef8237fbfa7d4fbc6d968fc243d3978ff18c169b 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,11 +1,12 @@
 <?php
-       require_once('init.php');
+    require_once('init.php');
 
-       if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
-       {
-               echo "Closed for re-indexing...";
-               exit;
-       }
+    header('Content-type: text/html; charset=utf-8');
+
+    // check blocks in place for external servers
+    if (strpos($_SERVER["REMOTE_ADDR"],'193.63.75.') !== 0 &&
+        strpos(CONST_WhitelistedIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
+    {
 
        $aBucketKeys = array();
 
@@ -48,6 +49,3 @@
                echo "Information on the Nominatim usage policy can be found here: http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy \n";
                exit;
        }
-
-       header('Content-type: text/html; charset=utf-8');
-