From 0dd10c3fff9896ca23b884a7ec7a97002065d083 Mon Sep 17 00:00:00 2001
From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Mon, 17 Dec 2012 00:24:58 +0000
Subject: [PATCH] Change access control to implement more of CORS.  Change so
 OPTIONS requests don't do an actual search/reverse request

---
 lib/init-website.php         | 8 ++++++++
 lib/template/address-xml.php | 7 +++----
 lib/template/search-json.php | 2 ++
 lib/template/search-xml.php  | 1 -
 osm2pgsql                    | 2 +-
 settings/settings.php        | 1 +
 website/reverse.php          | 3 ++-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/init-website.php b/lib/init-website.php
index 8603e309..94dba6f4 100644
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,6 +1,14 @@
 <?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)
  	{
 		echo "Closed for re-indexing...";
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index fcd90b85..9989bb31 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -1,6 +1,5 @@
 <?php
 	header("content-type: text/xml; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
 
 	echo "<";
 	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
@@ -29,7 +28,7 @@
 		if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
 		echo ">".htmlspecialchars($aPlace['langaddress'])."</result>";
 
-        if ($bShowAddressDetails) {
+		if ($bShowAddressDetails) {
 			echo "<addressparts>";
 			foreach($aAddress as $sKey => $sValue)
 			{
@@ -39,7 +38,7 @@
 				echo "</$sKey>";
 			}
 			echo "</addressparts>";
-        }
+		}
 	}
-	
+
 	echo "</reversegeocode>";
diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 45272d35..4b3b279d 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,4 +1,6 @@
 <?php
+	header("content-type: application/json; charset=UTF-8");
+
 	$aFilteredPlaces = array();
 	foreach($aSearchResults as $iResNum => $aPointDetails)
 	{
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index fa6b14a3..aa029d2b 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -1,6 +1,5 @@
 <?php
 	header("content-type: text/xml; charset=UTF-8");
-	header("Access-Control-Allow-Origin: *");
 
 	echo "<";
 	echo "?xml version=\"1.0\" encoding=\"UTF-8\" ?";
diff --git a/osm2pgsql b/osm2pgsql
index efe87e27..3586caa0 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit efe87e2740349bdda46dfc44f7806b9f6bc40a3d
+Subproject commit 3586caa0936e052ec14a7172769df4b3b4da2d08
diff --git a/settings/settings.php b/settings/settings.php
index 58463a51..cd97b4a7 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -37,6 +37,7 @@
 	}
 
 	// Website settings
+	@define('CONST_NoAccessControl', true);
 	@define('CONST_ClosedForIndexing', false);
 	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@define('CONST_BlockedIPs', '');
diff --git a/website/reverse.php b/website/reverse.php
index d5a36998..1cdbf467 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -138,8 +138,9 @@
         	$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 .= " from placex where place_id = $iPlaceID ";
-//var_dump($sSQL);
+
 		$aPlace = $oDB->getRow($sSQL);
+//var_dump($sSQL, $aPlace); exit;
 
 		if ($bShowAddressDetails)
 		{