use url with php prefix in more url

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index bf27ef9a8157e734536b60196f35f009cf3d19ba..b107e120c4fde6d38c0e575f15a647dcb394060e 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -20,10 +20,14 @@
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 

-       if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
-       if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
+       if (CONST_Search_ReversePlanForAll
+               || isset($aLangPrefOrder['name:de'])
+               || isset($aLangPrefOrder['name:ru'])
+               || isset($aLangPrefOrder['name:ja'])
+               || isset($aLangPrefOrder['name:pl']))
+       {
+               $oGeocode->setReverseInPlan(true);
+       }

 
        // Format for output
        $sOutputFormat = 'html';
 
        // Format for output
        $sOutputFormat = 'html';


@@ -122,10 +126,12 @@
        $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
        $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 
        $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
        $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 

-       $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+       $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());

        if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
        if ($bShowPolygons) $sMoreURL .= '&polygon=1';
        if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
        if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
        if ($bShowPolygons) $sMoreURL .= '&polygon=1';
        if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';

+       if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1';
+       if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1';

        if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
        if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
        $sMoreURL .= '&q='.urlencode($sQuery);
        if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
        if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
        $sMoreURL .= '&q='.urlencode($sQuery);