X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/27b379c1e3820fdf5e056a4b773e4e224dd0c44b..fa44f7bcb308bfe51cc68ad15c2e4574f2182a09:/lib-php/website/search.php?ds=inline diff --git a/lib-php/website/search.php b/lib-php/website/search.php index f8162d68..e1aab794 100644 --- a/lib-php/website/search.php +++ b/lib-php/website/search.php @@ -1,4 +1,12 @@ getQueryString() $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder); -$aSearchResults = $oGeocode->lookup(); +// Ignore requests from a faulty app. +if ($oGeocode->getQueryString() === '-1,-1') { + $aSearchResults = array(); +} else { + $aSearchResults = $oGeocode->lookup(); +} logEnd($oDB, $hLog, count($aSearchResults)); @@ -67,17 +80,19 @@ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { } if (isset($_SERVER['REQUEST_SCHEME']) - && isset($_SERVER['SERVER_NAME']) + && isset($_SERVER['HTTP_HOST']) && isset($_SERVER['DOCUMENT_URI']) ) { $sMoreURL = $_SERVER['REQUEST_SCHEME'].'://' .$_SERVER['HTTP_HOST'].$_SERVER['DOCUMENT_URI'].'/?' .http_build_query($aMoreParams); } else { - $sMoreURL = '/search.php'.http_build_query($aMoreParams); + $sMoreURL = '/search.php?'.http_build_query($aMoreParams); } -if (CONST_Debug) exit; +if (CONST_Debug) { + exit; +} $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat; include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');