X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=14f0101ef07eb6f49d0207ec7620274c917a62c7;hb=204e52ea307b182175ae0c64d6eb69c71a104658;hp=7996dca94fbba6b11a3e35e7fd4f8e94cc2eb5c5;hpb=561aba18e3a230c0912ad9483c6df43cc40e09d6;p=friendica.git

diff --git a/src/App/Page.php b/src/App/Page.php
index 7996dca94f..14f0101ef0 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,18 +25,20 @@ use ArrayAccess;
 use DOMDocument;
 use DOMXPath;
 use Friendica\App;
-use Friendica\Capabilities\IRespondToRequests;
 use Friendica\Content\Nav;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Core\Theme;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\Profiler;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Contains the page specific environment variables for the current Page
@@ -229,7 +231,7 @@ class Page implements ArrayAccess
 
 		$shortcut_icon = $config->get('system', 'shortcut_icon');
 		if ($shortcut_icon == '') {
-			$shortcut_icon = 'images/friendica-32.png';
+			$shortcut_icon = 'images/friendica.svg';
 		}
 
 		$touch_icon = $config->get('system', 'touch_icon');
@@ -337,19 +339,19 @@ class Page implements ArrayAccess
 	 * - module content
 	 * - hooks for content
 	 *
-	 * @param IRespondToRequests $response The Module response class
+	 * @param ResponseInterface  $response The Module response class
 	 * @param Mode               $mode     The Friendica execution mode
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private function initContent(IRespondToRequests $response, Mode $mode)
+	private function initContent(ResponseInterface $response, Mode $mode)
 	{
 		// initialise content region
 		if ($mode->isNormal()) {
 			Hook::callAll('page_content_top', $this->page['content']);
 		}
 
-		$this->page['content'] .= $response->getContent();
+		$this->page['content'] .= (string)$response->getBody();
 	}
 
 	/**
@@ -371,6 +373,36 @@ class Page implements ArrayAccess
 		$this->footerScripts[] = trim($url, '/');
 	}
 
+	/**
+	 * Directly exit with the current response (include setting all headers)
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function exit(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 (empty($key)) {
+				header($header_str);
+			} else {
+				header("$key: $header_str");
+			}
+		}
+
+		echo $response->getBody();
+	}
+
 	/**
 	 * Executes the creation of the current page and prints it to the screen
 	 *
@@ -378,14 +410,14 @@ class Page implements ArrayAccess
 	 * @param BaseURL                     $baseURL  The Friendica Base URL
 	 * @param Arguments                   $args     The Friendica App arguments
 	 * @param Mode                        $mode     The current node mode
-	 * @param IRespondToRequests          $response The Response of the module class, including type, content & headers
+	 * @param ResponseInterface           $response The Response of the module class, including type, content & headers
 	 * @param L10n                        $l10n     The l10n language class
 	 * @param IManageConfigValues         $config   The Configuration of this node
 	 * @param IManagePersonalConfigValues $pconfig  The personal/user configuration
 	 *
 	 * @throws HTTPException\InternalServerErrorException|HTTPException\ServiceUnavailableException
 	 */
-	public function run(App $app, BaseURL $baseURL, Arguments $args, Mode $mode, IRespondToRequests $response, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
+	public function run(App $app, BaseURL $baseURL, Arguments $args, Mode $mode, ResponseInterface $response, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
 	{
 		$moduleName = $args->getModuleName();
 
@@ -396,7 +428,6 @@ class Page implements ArrayAccess
 		 */
 		$timestamp = microtime(true);
 		$this->initContent($response, $mode);
-		$profiler->set(microtime(true) - $timestamp, 'content');
 
 		// Load current theme info after module has been initialized as theme could have been set in module
 		$currentTheme = $app->getCurrentTheme();
@@ -424,6 +455,8 @@ class Page implements ArrayAccess
 		 */
 		$this->initFooter($app, $mode, $l10n);
 
+		$profiler->set(microtime(true) - $timestamp, 'aftermath');
+
 		if (!$mode->isAjax()) {
 			Hook::callAll('page_end', $this->page['content']);
 		}
@@ -434,13 +467,17 @@ class Page implements ArrayAccess
 			$this->page['nav']      = Nav::build($app);
 		}
 
-		foreach ($response->getHeaders() as $key => $values) {
-			if (is_array($values)) {
-				foreach ($values as $value) {
-					header($key, $value);
-				}
+		foreach ($response->getHeaders() as $key => $header) {
+			if (is_array($header)) {
+				$header_str = implode(',', $header);
 			} else {
-				header($key, $values);
+				$header_str = $header;
+			}
+
+			if (empty($key)) {
+				header($header_str);
+			} else {
+				header("$key: $header_str");
 			}
 		}
 
@@ -468,11 +505,7 @@ class Page implements ArrayAccess
 			}
 
 			if ($_GET["mode"] == "raw") {
-				header("Content-type: text/html; charset=utf-8");
-
-				echo substr($target->saveHTML(), 6, -8);
-
-				exit();
+				System::httpExit(substr($target->saveHTML(), 6, -8), Response::TYPE_HTML);
 			}
 		}