X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d7c469d94e088232d9be45a51ebf76f00f7e1921..a8a700e16d286971c43c013b322a1fd4a339de4d:/lib/init-website.php?ds=sidebyside diff --git a/lib/init-website.php b/lib/init-website.php index 9d66a9ac..d8c012a4 100644 --- a/lib/init-website.php +++ b/lib/init-website.php @@ -1,104 +1,100 @@ 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: 

+
+
+function chksql($oSql, $sMsg = 'Database request failed')
+{
+    if (!PEAR::isError($oSql)) return $oSql;
+
+    header('HTTP/1.0 500 Internal Server Error');
+    header('Content-type: text/html; charset=utf-8');
+
+    $sSqlError = $oSql->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;
-	}
+    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. '; + 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 ''; + } + } + 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. '; + echo 'Please include the error message above and the URL you used.

'; + echo "\n\n"; + exit; +} /*************************************************************************** * 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 ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; +if (CONST_Debug) header('Content-type: text/html; charset=utf-8');