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 36928628611b228d5651312a5aaa3432055da3dc..4d1c2c7029a1cdc00b999b5c0c748eb27a517cd7 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,22 +1,17 @@
  <?php
  <?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;
-       }
-
-       if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
+       if (CONST_NoAccessControl)
         {
         {
-               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;
+               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;
+
  
  
-       header('Content-type: text/html; charset=utf-8');
+    header('Content-type: text/html; charset=utf-8');