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 40e4713e21c1c6261fd12910d239c880d522a402..4d1c2c7029a1cdc00b999b5c0c748eb27a517cd7 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,33 +1,17 @@
 <?php
        require_once('init.php');
 
-       if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
-       {
-               echo "Closed for re-indexing...";
-               exit;
-       }
-
-       $aBucketKeys = array();
-
-       if (isset($_SERVER["HTTP_REFERER"])) $aBucketKeys[] = str_replace('www.','',strtolower(parse_url($_SERVER["HTTP_REFERER"], PHP_URL_HOST)));
-       if (isset($_SERVER["REMOTE_ADDR"])) $aBucketKeys[] = $_SERVER["REMOTE_ADDR"];
-       if (isset($_GET["email"])) $aBucketKeys[] = $_GET["email"];
-
-       $fBucketVal = doBucket($aBucketKeys, 
-                       (defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
-                       CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
-
-       if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
+       if (CONST_NoAccessControl)
        {
-               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";
-               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;
 
-       if ($fBucketVal > CONST_ConnectionBucket_WaitLimit)
-       {
-               sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
-       }
 
-       header('Content-type: text/html; charset=utf-8');
+    header('Content-type: text/html; charset=utf-8');