X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..087522c6013e715d8171cbf7b907473ab27c0fac:/lib/init-website.php diff --git a/lib/init-website.php b/lib/init-website.php index ed95297d..4ca927cf 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; @@ -34,12 +35,9 @@ function chksql($oSql, $sMsg = "Database request failed")
Details:
INTERNALFAIL; - if (CONST_Debug) - { + if (CONST_Debug) { var_dump($oSql); - } - else - { + } else { echo "\n".$oSql->getUserInfo().""; } @@ -55,15 +53,12 @@ function failInternalError($sError, $sSQL = false, $vDumpVar = false) 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) - { + if (CONST_Debug) { echo "Debugging Information
"; - if ($sSQL) - { + if ($sSQL) { echo "SQL query
".$sSQL."
"; } - if ($vDumpVar) - { + if ($vDumpVar) { echo "Result
"; var_dump($vDumpVar); echo "
"; @@ -91,16 +86,13 @@ function userError($sError) * HTTP Reply header setup */ -if (CONST_NoAccessControl) -{ +if (CONST_NoAccessControl) { header("Access-Control-Allow-Origin: *"); header("Access-Control-Allow-Methods: OPTIONS,GET"); - if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) - { + 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'); -