give mild preference to results in viewbox

[nominatim.git] / lib / init-website.php
diff --git a/lib/init-website.php b/lib/init-website.php

index 6db2ac374d995837b2aac2dcb9861ec6922945b6..4d1c2c7029a1cdc00b999b5c0c748eb27a517cd7 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,34 +1,17 @@
  <?php
  <?php
-    require_once('init.php');
+       require_once('init.php');
  
  
-    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)
-    {
+       if (CONST_NoAccessControl)
+       {
+               header("Access-Control-Allow-Origin: *");
+               header("Access-Control-Allow-Methods: OPTIONS,GET");
+               header("Access-Control-Max-Age: 8640000");
+               if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
+               {
+                       header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+               }
+       }
+       if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
  
  
-        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-        {
-            header('HTTP/1.0 403 Forbidden');
-            header('Content-type: text/html; charset=utf-8');
-            echo "<html><body><h1>Access blocked</h1>";
-            echo "Your IP has been blocked for overusing OpenStreetMap's volunteer-run servers.<br> \n";
-            echo 'Please consult the <a href="http://wiki.openstreetmap.org/wiki/Nominatim_usage_policy">Nominatim usage policy</a> for more information.';
-            echo "\n</body></html>\n";
-            exit;
-        }
  
  
-        $sTempBlockedIP = file_get_contents(CONST_IPBanFile);
-        if (preg_match('/\b'.$_SERVER["REMOTE_ADDR"].'\b/', $sTempBlockedIP))
-        {
-            header('HTTP/1.0 503 Service Temporarily Unavailable');
-            header('Content-type: text/html; charset=utf-8');
-            echo "<html><body><h1>Access blocked</h1>";
-            echo "Your IP has been blocked temporarily for overusing OpenStreetMap's volunteer-run servers. This ban will be lifted automatically in a while. To avoid further blocks, please read the<br> \n";
-            echo '<a href="http://wiki.openstreetmap.org/wiki/Nominatim_usage_policy">Nominatim usage policy</a> carefully before you continue to use this service.';
-            echo "\n</body></html>\n";
-            exit;
-        }
-
-    }
+    header('Content-type: text/html; charset=utf-8');