X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=3bd06bc1919524e48c1c63fb0fdfab3244caa578;hb=b461a30d9e11b54a18086f3512eefafb68089a4b;hp=6079d9e22855d922a3072f9b06804725b5012872;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index 6079d9e228..3bd06bc191 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -5,6 +5,8 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
@@ -100,7 +102,7 @@ class System extends BaseObject
 		}
 
 		if ($st) {
-			logger('xml_status returning non_zero: ' . $st . " message=" . $message);
+			Logger::log('xml_status returning non_zero: ' . $st . " message=" . $message);
 		}
 
 		header("Content-type: text/xml");
@@ -124,9 +126,33 @@ class System extends BaseObject
 	{
 		$err = '';
 		if ($val >= 400) {
-			$err = 'Error';
-			if (!isset($description["title"])) {
-				$description["title"] = $err." ".$val;
+			if (!empty($description['title'])) {
+				$err = $description['title'];
+			} else {
+				$title = [
+					'400' => L10n::t('Error 400 - Bad Request'),
+					'401' => L10n::t('Error 401 - Unauthorized'),
+					'403' => L10n::t('Error 403 - Forbidden'),
+					'404' => L10n::t('Error 404 - Not Found'),
+					'500' => L10n::t('Error 500 - Internal Server Error'),
+					'503' => L10n::t('Error 503 - Service Unavailable'),
+					];
+				$err = defaults($title, $val, 'Error ' . $val);
+				$description['title'] = $err;
+			}
+			if (empty($description['description'])) {
+				// Explanations are taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+				$explanation = [
+					'400' => L10n::t('The server cannot or will not process the request due to an apparent client error.'),
+					'401' => L10n::t('Authentication is required and has failed or has not yet been provided.'),
+					'403' => L10n::t('The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account.'),
+					'404' => L10n::t('The requested resource could not be found but may be available in the future.'),
+					'500' => L10n::t('An unexpected condition was encountered and no more specific message is suitable.'),
+					'503' => L10n::t('The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later.'),
+					];
+				if (!empty($explanation[$val])) {
+					$description['description'] = $explanation[$val];
+				}
 			}
 		}
 
@@ -134,12 +160,12 @@ class System extends BaseObject
 			$err = 'OK';
 		}
 
-		logger('http_status_exit ' . $val);
+		Logger::log('http_status_exit ' . $val);
 		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
 
 		if (isset($description["title"])) {
-			$tpl = get_markup_template('http_status.tpl');
-			echo replace_macros($tpl, ['$title' => $description["title"],
+			$tpl = Renderer::getMarkupTemplate('http_status.tpl');
+			echo Renderer::replaceMacros($tpl, ['$title' => $description["title"],
 				'$description' => defaults($description, 'description', '')]);
 		}
 
@@ -246,7 +272,7 @@ class System extends BaseObject
 	 */
 	public static function externalRedirect($url)
 	{
-		if (!filter_var($url, FILTER_VALIDATE_URL)) {
+		if (empty(parse_url($url, PHP_URL_SCHEME))) {
 			throw new InternalServerErrorException("'$url' is not a fully qualified URL, please use App->internalRedirect() instead");
 		}
 
@@ -263,7 +289,6 @@ class System extends BaseObject
 	function notice($s)
 	function info($s)
 	function is_site_admin()
-	function random_digits($digits)
 	function get_server()
 	function get_temppath()
 	function get_cachefile($file, $writemode = true)