correctly handle comma-only exclude_place_ids

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

diff --git a/lib/init-website.php b/lib/init-website.php
index 94dba6f4a15599675da89c7e484a334692035b39..6db83988551f4d2fd6fba8ac745befa3f9043388 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -5,7 +5,10 @@
        {
                header("Access-Control-Allow-Origin: *");
                header("Access-Control-Allow-Methods: OPTIONS,GET");
        {
                header("Access-Control-Allow-Origin: *");
                header("Access-Control-Allow-Methods: OPTIONS,GET");

-               header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+               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 ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
 


@@ -51,9 +54,9 @@
 
        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
        {
 
        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
        {

+               header("HTTP/1.0 429 Too Many Requests");

                echo "Your IP has been blocked. \n";
                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;
        }