X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=0f14d9f6e6530106ecbb87b0bd922a894ddcf4e8;hb=2edbd1a3e2b90430b378de32f79a7cbd3537d9de;hp=0efdc120510f7f08c8ffcb60c18d5979a44b94cc;hpb=b5d2d32b443f7aa8ec6e0e91f36da3cc0a0f2a82;p=friendica.git diff --git a/src/App/Page.php b/src/App/Page.php index 0efdc12051..0f14d9f6e6 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -1,6 +1,6 @@ timestamp = microtime(true); $this->basePath = $basepath; } + public function setLogging(string $method, string $module, string $command) + { + $this->method = $method; + $this->module = $module; + $this->command = $command; + } + + public function logRuntime(IManageConfigValues $config, string $origin = '') + { + $ignore = $config->get('system', 'runtime_ignore'); + if (in_array($this->module, $ignore) || in_array($this->command, $ignore)) { + return; + } + + $signature = !empty($_SERVER['HTTP_SIGNATURE']); + $load = number_format(System::currentLoad(), 2); + $runtime = number_format(microtime(true) - $this->timestamp, 3); + if ($runtime > $config->get('system', 'runtime_loglimit')) { + Logger::debug('Runtime', ['method' => $this->method, 'module' => $this->module, 'runtime' => $runtime, 'load' => $load, 'origin' => $origin, 'signature' => $signature, 'request' => $_SERVER['REQUEST_URI'] ?? '']); + } + } + /** * Whether a offset exists * @@ -100,7 +130,7 @@ class Page implements ArrayAccess * The return value will be casted to boolean if non-boolean was returned. * @since 5.0.0 */ - public function offsetExists($offset) + public function offsetExists($offset): bool { return isset($this->page[$offset]); } @@ -170,9 +200,9 @@ class Page implements ArrayAccess * @param string $media * @see Page::initHead() */ - public function registerStylesheet($path, string $media = 'screen') + public function registerStylesheet(string $path, string $media = 'screen') { - $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]); + $path = Network::appendQueryParam($path, ['v' => App::VERSION]); if (mb_strpos($path, $this->basePath . DIRECTORY_SEPARATOR) === 0) { $path = mb_substr($path, mb_strlen($this->basePath . DIRECTORY_SEPARATOR)); @@ -191,17 +221,18 @@ class Page implements ArrayAccess * - Infinite scroll data * - head.tpl template * - * @param App $app The Friendica App instance - * @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) + * @param App $app The Friendica App instance + * @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) + * @param int $localUID The local user id * * @throws HTTPException\InternalServerErrorException */ - private function initHead(App $app, Arguments $args, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig) + private function initHead(App $app, Arguments $args, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, int $localUID) { - $interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000); + $interval = ($localUID ? $pConfig->get($localUID, 'system', 'update_interval') : 40000); // If the update is 'deactivated' set it to the highest integer number (~24 days) if ($interval < 0) { @@ -230,7 +261,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'); @@ -246,8 +277,8 @@ class Page implements ArrayAccess * being first */ $this->page['htmlhead'] = Renderer::replaceMacros($tpl, [ - '$local_user' => local_user(), - '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, + '$local_user' => $localUID, + '$generator' => 'Friendica' . ' ' . App::VERSION, '$delitem' => $l10n->t('Delete this item?'), '$blockAuthor' => $l10n->t('Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'), '$update_interval' => $interval, @@ -263,15 +294,15 @@ class Page implements ArrayAccess * * Taken from http://webcheatsheet.com/php/get_current_page_url.php */ - private function curPageURL() + private function curPageURL(): string { $pageURL = 'http'; 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 { @@ -338,30 +369,19 @@ class Page implements ArrayAccess * - module content * - hooks for content * - * @param ICanHandleRequests $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(ICanHandleRequests $module, Mode $mode) + private function initContent(ResponseInterface $response, Mode $mode) { - $content = ''; - - try { - $arr = ['content' => $content]; - Hook::callAll($module->getClassName() . '_mod_content', $arr); - $content = $arr['content']; - $content .= $module->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(); } /** @@ -376,39 +396,72 @@ class Page implements ArrayAccess */ public function registerFooterScript($path) { - $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]); + $path = Network::appendQueryParam($path, ['v' => App::VERSION]); $url = str_replace($this->basePath . DIRECTORY_SEPARATOR, '', $path); $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 Arguments $args The Friendica App arguments - * @param Mode $mode The current node mode - * @param ICanHandleRequests $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 + * @param int $localUID The UID of the local user * - * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException|HTTPException\ServiceUnavailableException */ - public function run(App $app, BaseURL $baseURL, Arguments $args, Mode $mode, ICanHandleRequests $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, int $localUID) { $moduleName = $args->getModuleName(); + $this->command = $moduleName; + $this->method = $args->getMethod(); + /* 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(); @@ -429,13 +482,15 @@ class Page implements ArrayAccess * all the module functions have executed so that all * theme choices made by the modules can take effect. */ - $this->initHead($app, $args, $l10n, $config, $pconfig); + $this->initHead($app, $args, $l10n, $config, $pconfig, $localUID); /* Build the page ending -- this is stuff that goes right before * the closing tag */ $this->initFooter($app, $mode, $l10n); + $profiler->set(microtime(true) - $timestamp, 'aftermath'); + if (!$mode->isAjax()) { Hook::callAll('page_end', $this->page['content']); } @@ -446,6 +501,20 @@ class Page implements ArrayAccess $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(); @@ -470,17 +539,13 @@ 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); } } $page = $this->page; - header("X-Friendica-Version: " . FRIENDICA_VERSION); + header("X-Friendica-Version: " . App::VERSION); header("Content-type: text/html; charset=utf-8"); if ($config->get('system', 'hsts') && ($baseURL->getSSLPolicy() == BaseURL::SSL_POLICY_FULL)) {