X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/5464dec0570c2451d8607bc739c6f2b6f298bb75..890d415e1ffd997d11ed35dee04cb01b94ca133f:/lib/init-website.php diff --git a/lib/init-website.php b/lib/init-website.php index 9d66a9ac..67fb52d1 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -1,104 +1,69 @@ getMessage(); +function userError($sMsg) +{ + throw new Exception($sMsg, 400); +} - echo << - Internal Server Error - -

Internal Server Error

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 - Github. Please include the URL that caused the problem and the - complete error details below.

Message: $sMsg

SQL Error: $sSqlError

Details:

-INTERNALFAIL;
 
-		if (CONST_Debug)
-		{
-			var_dump($oSql);
-		}
-		else
-		{
-			echo "\n".$oSql->getUserInfo()."";
-		}
+function exception_handler_html($exception)
+{
+    http_response_code($exception->getCode());
+    header('Content-type: text/html; charset=UTF-8');
+    include(CONST_BasePath.'/lib/template/error-html.php');
+}
 
-		echo "

"; - exit; - } +function exception_handler_json($exception) +{ + http_response_code($exception->getCode()); + header('Content-type: application/json; charset=utf-8'); + include(CONST_BasePath.'/lib/template/error-json.php'); +} - function failInternalError($sError, $sSQL = false, $vDumpVar = false) - { - header('HTTP/1.0 500 Internal Server Error'); - header('Content-type: text/html; charset=utf-8'); - 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.

'; - if (CONST_Debug) - { - echo "

Debugging Information

"; - if ($sSQL) - { - echo "

SQL query

".$sSQL.""; - } - if ($vDumpVar) - { - echo "

Result

";
-				var_dump($vDumpVar);
-				echo "

"; - } - } - echo "\n\n"; - exit; - } +function exception_handler_xml($exception) +{ + http_response_code($exception->getCode()); + header('Content-type: text/xml; charset=utf-8'); + echo ''."\n"; + include(CONST_BasePath.'/lib/template/error-xml.php'); +} - function userError($sError) - { - header('HTTP/1.0 400 Bad Request'); - header('Content-type: text/html; charset=utf-8'); - 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 "\n\n"; - exit; - } +function set_exception_handler_by_format($sFormat = 'html') +{ + if ($sFormat == 'html') { + set_exception_handler('exception_handler_html'); + } elseif ($sFormat == 'xml') { + set_exception_handler('exception_handler_xml'); + } else { + set_exception_handler('exception_handler_json'); + } +} +// set a default +set_exception_handler_by_format(); /*************************************************************************** * HTTP Reply header setup */ - if (CONST_NoAccessControl) - { - header("Access-Control-Allow-Origin: *"); - header("Access-Control-Allow-Methods: OPTIONS,GET"); - if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) - { - header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']); - } - } - if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; - - if (CONST_Debug) header('Content-type: text/html; charset=utf-8'); +if (CONST_NoAccessControl) { + header('Access-Control-Allow-Origin: *'); + header('Access-Control-Allow-Methods: OPTIONS,GET'); + if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) { + header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']); + } +} +if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; +if (CONST_Debug) header('Content-type: text/html; charset=utf-8');