X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f05ea577f42c5ad4a62ff25ec62fbb60c550ee26..760807c5e04c427d8df616991b18c78f72a10b04:/lib/init-website.php?ds=sidebyside diff --git a/lib/init-website.php b/lib/init-website.php index 18d45284..7d5cef1a 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -9,6 +9,7 @@ require_once('ParameterParser.php'); * */ + function chksql($oSql, $sMsg = "Database request failed") { if (!PEAR::isError($oSql)) return $oSql; @@ -26,7 +27,7 @@ function chksql($oSql, $sMsg = "Database request failed")

Nominatim has encountered an internal error while accessing the database. This may happen because the database is broken or because of a bug in the software. If you think it is a bug, feel free to report - it over on + it over on Github. Please include the URL that caused the problem and the complete error details below.

Message: $sMsg

@@ -51,7 +52,8 @@ function failInternalError($sError, $sSQL = false, $vDumpVar = false) echo "

Internal Server Error

"; echo '

Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.

'; echo "

Details: ".$sError,"

"; - echo '

Feel free to file an issue on Github. Please include the error message above and the URL you used.

'; + echo '

Feel free to file an issue on Github. '; + echo 'Please include the error message above and the URL you used.

'; if (CONST_Debug) { echo "

Debugging Information


"; if ($sSQL) { @@ -75,7 +77,8 @@ function userError($sError) echo "

Bad Request

"; echo '

Nominatim has encountered an error with your request.

'; echo "

Details: ".$sError."

"; - echo '

If you feel this error is incorrect feel file an issue on Github. Please include the error message above and the URL you used.

'; + echo '

If you feel this error is incorrect feel file an issue on Github. '; + echo 'Please include the error message above and the URL you used.

'; echo "\n\n"; exit; } @@ -95,4 +98,3 @@ if (CONST_NoAccessControl) { if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; if (CONST_Debug) header('Content-type: text/html; charset=utf-8'); -