X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e686ce868062a70acfbdddc68c8f4384789f0a40..c555b60b366d6efb9acada65e0212196837a8b0f:/lib/init-website.php?ds=sidebyside diff --git a/lib/init-website.php b/lib/init-website.php index 4ca927cf..ca5214da 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -2,6 +2,7 @@ require_once('init.php'); require_once('ParameterParser.php'); +require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php'); /*************************************************************************** * @@ -10,7 +11,7 @@ require_once('ParameterParser.php'); */ -function chksql($oSql, $sMsg = "Database request failed") +function chksql($oSql, $sMsg = 'Database request failed') { if (!PEAR::isError($oSql)) return $oSql; @@ -27,7 +28,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

@@ -38,10 +39,10 @@ INTERNALFAIL; if (CONST_Debug) { var_dump($oSql); } else { - echo "

\n".$oSql->getUserInfo()."

"; + echo "

\n".$oSql->getUserInfo().'

'; } - echo "

"; + echo '

'; exit; } @@ -49,19 +50,20 @@ 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 '

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 '

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

"; + echo '

Debugging Information

'; if ($sSQL) { - echo "

SQL query

".$sSQL.""; + echo '

SQL query

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

Result

";
+            echo 'Result
 ';
             var_dump($vDumpVar);
-            echo "";
+            echo '

'; } } echo "\n\n"; @@ -73,10 +75,11 @@ function userError($sError) { header('HTTP/1.0 400 Bad Request'); header('Content-type: text/html; charset=utf-8'); - echo "

Bad Request

"; + 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 '

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; } @@ -87,10 +90,10 @@ function userError($sError) */ if (CONST_NoAccessControl) { - header("Access-Control-Allow-Origin: *"); - header("Access-Control-Allow-Methods: OPTIONS,GET"); + 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']); + header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']); } } if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;