mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-10-27 11:42:46 +03:00
Change access control to implement more of CORS. Change so OPTIONS requests don't do an actual search/reverse request
This commit is contained in:
parent
89af917105
commit
0dd10c3fff
@ -1,6 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once('init.php');
|
require_once('init.php');
|
||||||
|
|
||||||
|
if (CONST_NoAccessControl)
|
||||||
|
{
|
||||||
|
header("Access-Control-Allow-Origin: *");
|
||||||
|
header("Access-Control-Allow-Methods: OPTIONS,GET");
|
||||||
|
header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
|
||||||
|
}
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
|
||||||
|
|
||||||
if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
|
if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
|
||||||
{
|
{
|
||||||
echo "Closed for re-indexing...";
|
echo "Closed for re-indexing...";
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
header("content-type: text/xml; charset=UTF-8");
|
header("content-type: text/xml; charset=UTF-8");
|
||||||
header("Access-Control-Allow-Origin: *");
|
|
||||||
|
|
||||||
echo "<";
|
echo "<";
|
||||||
echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
|
echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
header("content-type: application/json; charset=UTF-8");
|
||||||
|
|
||||||
$aFilteredPlaces = array();
|
$aFilteredPlaces = array();
|
||||||
foreach($aSearchResults as $iResNum => $aPointDetails)
|
foreach($aSearchResults as $iResNum => $aPointDetails)
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
header("content-type: text/xml; charset=UTF-8");
|
header("content-type: text/xml; charset=UTF-8");
|
||||||
header("Access-Control-Allow-Origin: *");
|
|
||||||
|
|
||||||
echo "<";
|
echo "<";
|
||||||
echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
|
echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit efe87e2740349bdda46dfc44f7806b9f6bc40a3d
|
Subproject commit 3586caa0936e052ec14a7172769df4b3b4da2d08
|
@ -37,6 +37,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Website settings
|
// Website settings
|
||||||
|
@define('CONST_NoAccessControl', true);
|
||||||
@define('CONST_ClosedForIndexing', false);
|
@define('CONST_ClosedForIndexing', false);
|
||||||
@define('CONST_ClosedForIndexingExceptionIPs', '');
|
@define('CONST_ClosedForIndexingExceptionIPs', '');
|
||||||
@define('CONST_BlockedIPs', '');
|
@define('CONST_BlockedIPs', '');
|
||||||
|
@ -138,8 +138,9 @@
|
|||||||
$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
|
$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
|
||||||
$sSQL .= " st_y(st_centroid(geometry)) as lat, st_x(st_centroid(geometry)) as lon";
|
$sSQL .= " st_y(st_centroid(geometry)) as lat, st_x(st_centroid(geometry)) as lon";
|
||||||
$sSQL .= " from placex where place_id = $iPlaceID ";
|
$sSQL .= " from placex where place_id = $iPlaceID ";
|
||||||
//var_dump($sSQL);
|
|
||||||
$aPlace = $oDB->getRow($sSQL);
|
$aPlace = $oDB->getRow($sSQL);
|
||||||
|
//var_dump($sSQL, $aPlace); exit;
|
||||||
|
|
||||||
if ($bShowAddressDetails)
|
if ($bShowAddressDetails)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user