X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c0d21d0bd3ec04d340c2e716a9f9482d36dff310..3c7519444867cd9c6b3003c4c88729df21b8c265:/website/search.php?ds=sidebyside

diff --git a/website/search.php b/website/search.php
index d2a1cc67..619dec6d 100644
--- a/website/search.php
+++ b/website/search.php
@@ -1,12 +1,12 @@
 <?php
 
-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/Geocode.php');
-require_once(CONST_BasePath.'/lib/output.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/Geocode.php');
+require_once(CONST_LibDir.'/output.php');
 ini_set('memory_limit', '200M');
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 $oParams = new Nominatim\ParameterParser();
 
@@ -15,15 +15,6 @@ $oGeocode = new Nominatim\Geocode($oDB);
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 $oGeocode->setLanguagePreference($aLangPrefOrder);
 
-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 = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'jsonv2');
 set_exception_handler_by_format($sOutputFormat);
@@ -41,7 +32,7 @@ if (CONST_Search_BatchMode && isset($_GET['batch'])) {
         $aSearchResults = $oBatchGeocode->lookup();
         $aBatchResults[] = $aSearchResults;
     }
-    include(CONST_BasePath.'/lib/template/search-batch-json.php');
+    include(CONST_LibDir.'/template/search-batch-json.php');
     exit;
 }
 
@@ -74,9 +65,19 @@ $aMoreParams['format'] = $sOutputFormat;
 if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
     $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 }
-$sMoreURL = CONST_Website_BaseURL.'search.php?'.http_build_query($aMoreParams);
+
+if (isset($_SERVER['REQUEST_SCHEME'])
+    && isset($_SERVER['SERVER_NAME'])
+    && isset($_SERVER['DOCUMENT_URI'])
+) {
+    $sMoreURL = $_SERVER['REQUEST_SCHEME'].'://'
+                .$_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_URI'].'/?'
+                .http_build_query($aMoreParams);
+} else {
+    $sMoreURL = '/search.php'.http_build_query($aMoreParams);
+}
 
 if (CONST_Debug) exit;
 
 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
-include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');
+include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');