X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/64fa70ac0aaaad3e2fa881cde7c7f2050e151141..aaabb46f20bd6189caebf02c1f1a925cbd08a263:/lib/init-website.php?ds=inline diff --git a/lib/init-website.php b/lib/init-website.php index ca5214da..f2d52980 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -10,79 +10,64 @@ require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php'); * */ - -function chksql($oSql, $sMsg = 'Database request failed') +function userError($sMsg) { - if (!PEAR::isError($oSql)) return $oSql; + throw new Exception($sMsg, 400); +} - header('HTTP/1.0 500 Internal Server Error'); - header('Content-type: text/html; charset=utf-8'); - $sSqlError = $oSql->getMessage(); +function exception_handler_json($exception) +{ + http_response_code($exception->getCode()); + header('Content-type: application/json; charset=utf-8'); + include(CONST_LibDir.'/template/error-json.php'); + exit(); +} - 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;
+function exception_handler_xml($exception)
+{
+    http_response_code($exception->getCode());
+    header('Content-type: text/xml; charset=utf-8');
+    echo ''."\n";
+    include(CONST_LibDir.'/template/error-xml.php');
+    exit();
+}
 
-    if (CONST_Debug) {
-        var_dump($oSql);
-    } else {
-        echo "\n".$oSql->getUserInfo().'';
+function shutdown_exception_handler_xml()
+{
+    $error = error_get_last();
+    if ($error !== null && $error['type'] === E_ERROR) {
+        exception_handler_xml(new Exception($error['message'], 500));
     }
-
-    echo '

'; - exit; } -function failInternalError($sError, $sSQL = false, $vDumpVar = false) +function shutdown_exception_handler_json() { - 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. '; - echo '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 '

'; - } + $error = error_get_last(); + if ($error !== null && $error['type'] === E_ERROR) { + exception_handler_json(new Exception($error['message'], 500)); } - echo "\n\n"; - exit; } -function userError($sError) +function set_exception_handler_by_format($sFormat = null) { - 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. '; - echo 'Please include the error message above and the URL you used.

'; - echo "\n\n"; - exit; + // Multiple calls to register_shutdown_function will cause multiple callbacks + // to be executed, we only want the last executed. Thus we don't want to register + // one by default without an explicit $sFormat set. + + if (!isset($sFormat)) { + set_exception_handler('exception_handler_json'); + } elseif ($sFormat == 'xml') { + set_exception_handler('exception_handler_xml'); + register_shutdown_function('shutdown_exception_handler_xml'); + } else { + set_exception_handler('exception_handler_json'); + register_shutdown_function('shutdown_exception_handler_json'); + } } +// set a default +set_exception_handler_by_format(); /*************************************************************************** @@ -96,6 +81,6 @@ if (CONST_NoAccessControl) { header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']); } } -if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; +if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; if (CONST_Debug) header('Content-type: text/html; charset=utf-8');