<?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
*
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\Core\System;
use Friendica\Core\Theme;
-use Friendica\Module\Special\HTTPException as ModuleHTTPException;
+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
* - head.tpl template
*
* @param App $app The Friendica App instance
- * @param ModuleController $module The loaded Friendica module
+ * @param Arguments $args The Friendica App Arguments
* @param L10n $l10n The l10n language instance
* @param IManageConfigValues $config The Friendica configuration
* @param IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
*
* @throws HTTPException\InternalServerErrorException
*/
- private function initHead(App $app, ModuleController $module, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
+ private function initHead(App $app, Arguments $args, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
{
$interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
}
// Default title: current module called
- if (empty($this->page['title']) && $module->getName()) {
- $this->page['title'] = ucfirst($module->getName());
+ if (empty($this->page['title']) && $args->getModuleName()) {
+ $this->page['title'] = ucfirst($args->getModuleName());
}
// Prepend the sitename to the page title
$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');
if (!empty($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) {
$pageURL .= "s";
}
-
+
$pageURL .= "://";
-
+
if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
$pageURL .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
} else {
* - module content
* - hooks for content
*
- * @param ModuleController $module The module
- * @param Mode $mode The Friendica execution mode
+ * @param ResponseInterface $response The Module response class
+ * @param Mode $mode The Friendica execution mode
*
* @throws HTTPException\InternalServerErrorException
*/
- private function initContent(ModuleController $module, Mode $mode)
+ private function initContent(ResponseInterface $response, Mode $mode)
{
- $content = '';
-
- try {
- $moduleClass = $module->getModule();
-
- $arr = ['content' => $content];
- Hook::callAll($moduleClass->getClassName() . '_mod_content', $arr);
- $content = $arr['content'];
- } catch (HTTPException $e) {
- $content = (new ModuleHTTPException())->content($e);
- }
-
// initialise content region
if ($mode->isNormal()) {
Hook::callAll('page_content_top', $this->page['content']);
}
- $this->page['content'] .= $content;
+ $this->page['content'] .= (string)$response->getBody();
}
/**
$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
*
- * @param App $app The Friendica App
- * @param BaseURL $baseURL The Friendica Base URL
- * @param Mode $mode The current node mode
- * @param ModuleController $module The loaded Friendica module
- * @param L10n $l10n The l10n language class
- * @param IManageConfigValues $config The Configuration of this node
- * @param IManagePersonalConfigValues $pconfig The personal/user configuration
+ * @param App $app The Friendica App
+ * @param BaseURL $baseURL The Friendica Base URL
+ * @param Arguments $args The Friendica App arguments
+ * @param Mode $mode The current node mode
+ * @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
+ * @throws HTTPException\InternalServerErrorException|HTTPException\ServiceUnavailableException
*/
- public function run(App $app, BaseURL $baseURL, Mode $mode, ModuleController $module, 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 = $module->getName();
+ $moduleName = $args->getModuleName();
/* Create the page content.
* Calls all hooks which are including content operations
* Sets the $Page->page['content'] variable
*/
$timestamp = microtime(true);
- $this->initContent($module, $mode);
- $profiler->set(microtime(true) - $timestamp, 'content');
+ $this->initContent($response, $mode);
// Load current theme info after module has been initialized as theme could have been set in module
$currentTheme = $app->getCurrentTheme();
* all the module functions have executed so that all
* theme choices made by the modules can take effect.
*/
- $this->initHead($app, $module, $l10n, $config, $pconfig);
+ $this->initHead($app, $args, $l10n, $config, $pconfig);
/* Build the page ending -- this is stuff that goes right before
* the closing </body> tag
*/
$this->initFooter($app, $mode, $l10n);
+ $profiler->set(microtime(true) - $timestamp, 'aftermath');
+
if (!$mode->isAjax()) {
Hook::callAll('page_end', $this->page['content']);
}
$this->page['nav'] = Nav::build($app);
}
+ 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");
+ }
+ }
+
// Build the page - now that we have all the components
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
$doc = new DOMDocument();
}
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);
}
}
projects / friendica.git / blobdiff