X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=197e7b2ae6acd43af9785bf490bf4531e2e08b87;hb=34521c228bd69609fa4f475bb2e2e826723fcc16;hp=602d85c83c7636134b91777c58ae868ef50ecae2;hpb=8bb33dccd1d945c849c7006ee56a73fc9404323c;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index 602d85c83c..197e7b2ae6 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -28,10 +28,12 @@ use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Module\Response;
 use Friendica\Network\HTTPException\FoundException;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\MovedPermanentlyException;
 use Friendica\Network\HTTPException\TemporaryRedirectException;
 use Friendica\Util\BasePath;
 use Friendica\Util\XML;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -274,32 +276,59 @@ class System
 		return implode(', ', $callstack2);
 	}
 
+	/**
+	 * Display current response, including setting all headers
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public static function echoResponse(ResponseInterface $response)
+	{
+		header(sprintf("HTTP/%s %s %s",
+				$response->getProtocolVersion(),
+				$response->getStatusCode(),
+				$response->getReasonPhrase())
+		);
+
+		foreach ($response->getHeaders() as $key => $header) {
+			if (is_array($header)) {
+				$header_str = implode(',', $header);
+			} else {
+				$header_str = $header;
+			}
+
+			if (is_int($key)) {
+				header($header_str);
+			} else {
+				header("$key: $header_str");
+			}
+		}
+
+		echo $response->getBody();
+	}
+
 	/**
 	 * Generic XML return
 	 * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
 	 * of $st and an optional text <message> of $message and terminates the current process.
 	 *
-	 * @param        $st
+	 * @param mixed  $status
 	 * @param string $message
 	 * @throws \Exception
+	 * @deprecated since 2023.09 Use BaseModule->httpExit() instead
 	 */
-	public static function xmlExit($st, $message = '')
+	public static function xmlExit($status, string $message = '')
 	{
-		$result = ['status' => $st];
+		$result = ['status' => $status];
 
 		if ($message != '') {
 			$result['message'] = $message;
 		}
 
-		if ($st) {
-			Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message);
+		if ($status) {
+			Logger::notice('xml_status returning non_zero: ' . $status . " message=" . $message);
 		}
 
-		DI::apiResponse()->setType(Response::TYPE_XML);
-		DI::apiResponse()->addContent(XML::fromArray(['result' => $result]));
-		DI::page()->exit(DI::apiResponse()->generate());
-
-		self::exit();
+		self::httpExit(XML::fromArray(['result' => $result]), Response::TYPE_XML);
 	}
 
 	/**
@@ -309,6 +338,7 @@ class System
 	 * @param string  $message Error message. Optional.
 	 * @param string  $content Response body. Optional.
 	 * @throws \Exception
+	 * @deprecated since 2023.09 Use BaseModule->httpError instead
 	 */
 	public static function httpError($httpCode, $message = '', $content = '')
 	{
@@ -316,29 +346,33 @@ class System
 			Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
 		}
 		DI::apiResponse()->setStatus($httpCode, $message);
-		DI::apiResponse()->addContent($content);
-		DI::page()->exit(DI::apiResponse()->generate());
 
-		self::exit();
+		self::httpExit($content);
 	}
 
 	/**
 	 * This function adds the content and a content-type HTTP header to the output.
 	 * After finishing the process is getting killed.
 	 *
-	 * @param string $content
-	 * @param string $type
+	 * @param string      $content
+	 * @param string      $type
 	 * @param string|null $content_type
 	 * @return void
+	 * @throws InternalServerErrorException
+	 * @deprecated since 2023.09 Use BaseModule->httpExit() instead
 	 */
-	public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null) {
+	public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null)
+	{
 		DI::apiResponse()->setType($type, $content_type);
 		DI::apiResponse()->addContent($content);
-		DI::page()->exit(DI::apiResponse()->generate());
+		self::echoResponse(DI::apiResponse()->generate());
 
 		self::exit();
 	}
 
+	/**
+	 * @deprecated since 2023.09 Use BaseModule->jsonError instead
+	 */
 	public static function jsonError($httpCode, $content, $content_type = 'application/json')
 	{
 		if ($httpCode >= 400) {
@@ -358,14 +392,12 @@ class System
 	 * @param mixed   $content      The input content
 	 * @param string  $content_type Type of the input (Default: 'application/json')
 	 * @param integer $options      JSON options
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws InternalServerErrorException
+	 * @deprecated since 2023.09 Use BaseModule->jsonExit instead
 	 */
-	public static function jsonExit($content, $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) {
-		DI::apiResponse()->setType(Response::TYPE_JSON, $content_type);
-		DI::apiResponse()->addContent(json_encode($content, $options));
-		DI::page()->exit(DI::apiResponse()->generate());
-
-		self::exit();
+	public static function jsonExit($content, string $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)
+	{
+		self::httpExit(json_encode($content, $options), Response::TYPE_JSON, $content_type);
 	}
 
 	/**
@@ -671,9 +703,7 @@ class System
 
 		if (DI::config()->get('system', 'tosdisplay')) {
 			$rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext');
-			$html = BBCode::convertForUriId(User::getSystemUriId(), $rulelist, BBCode::EXTERNAL);
-
-			$msg = HTML::toPlaintext($html, 0, true);
+			$msg = BBCode::toPlaintext($rulelist, false);
 			foreach (explode("\n", trim($msg)) as $line) {
 				$line = trim($line);
 				if ($line) {