X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d45524cbfb299f5004a03c52802c64749c5ad212..feb458f8dd4c897f3aa688943d75dbf58bc090f5:/lib/website.php?ds=inline diff --git a/lib/website.php b/lib/website.php index cf228f38..a6afb698 100644 --- a/lib/website.php +++ b/lib/website.php @@ -1,5 +1,88 @@ getMessage(); + + 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()."";
+		}
+
+		echo "

"; + exit; + } + + 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 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; + } + + /*************************************************************************** * * Functions for parsing URL parameters @@ -8,16 +91,16 @@ function getParamBool($sName, $bDefault=false) { - if (!isset($_GET[$sName])) return $bDefault; + if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault; return (bool) $_GET[$sName]; } function getParamInt($sName, $bDefault=false) { - if (!isset($_GET[$sName])) return $bDefault; + if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault; - if (!preg_match('/^[+-][0-9]+$/', $_GET[$sName])) + if (!preg_match('/^[+-]?[0-9]+$/', $_GET[$sName])) { userError("Integer number expected for parameter '$sName'"); } @@ -27,7 +110,7 @@ function getParamFloat($sName, $bDefault=false) { - if (!isset($_GET[$sName])) return $bDefault; + if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault; if (!preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET[$sName])) { @@ -39,14 +122,14 @@ function getParamString($sName, $bDefault=false) { - if (!isset($_GET[$sName])) return $bDefault; + if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault; return $_GET[$sName]; } function getParamSet($sName, $aValues, $sDefault=false) { - if (!isset($_GET[$sName])) return $sDefault; + if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $sDefault; if (!in_array($_GET[$sName], $aValues)) {