Change access control to implement more of CORS. Change so OPTIONS re…

…quests don't do an actual search/reverse request
osm-search · Dec 17, 2012 · 0dd10c3 · 0dd10c3
1 parent 89af917
commit 0dd10c3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/settings/settings.php b/settings/settings.php
@@ -37,6 +37,7 @@ function user_busy_cost()
 	}
 
 	// 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
@@ -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)
 		{