X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=14f0101ef07eb6f49d0207ec7620274c917a62c7;hb=204e52ea307b182175ae0c64d6eb69c71a104658;hp=5298a66cbd0f2e097d765e5c6264a5c4d92d2781;hpb=aba23abfaa67a84f57fb18b335dc22dfdebd524a;p=friendica.git diff --git a/src/App/Page.php b/src/App/Page.php index 5298a66cbd..14f0101ef0 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -1,4 +1,23 @@ . + * + */ namespace Friendica\App; @@ -7,14 +26,19 @@ use DOMDocument; use DOMXPath; use Friendica\App; use Friendica\Content\Nav; -use Friendica\Core\Config\Configuration; -use Friendica\Core\Config\PConfiguration; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Hook; -use Friendica\Core\L10n\L10n; +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 @@ -29,15 +53,26 @@ class Page implements ArrayAccess /** * @var array Contains all stylesheets, which should get loaded during page */ - private $stylesheets; + private $stylesheets = []; /** * @var array Contains all scripts, which are added to the footer at last */ - private $footerScripts; + private $footerScripts = []; /** * @var array The page content, which are showed directly */ - private $page; + private $page = [ + 'aside' => '', + 'bottom' => '', + 'content' => '', + 'footer' => '', + 'htmlhead' => '', + 'nav' => '', + 'page_title' => '', + 'right_aside' => '', + 'template' => '', + 'title' => '', + ]; /** * @var string The basepath of the page */ @@ -49,19 +84,6 @@ class Page implements ArrayAccess public function __construct(string $basepath) { $this->basePath = $basepath; - - $this->page = [ - 'aside' => '', - 'bottom' => '', - 'content' => '', - 'footer' => '', - 'htmlhead' => '', - 'nav' => '', - 'page_title' => '', - 'right_aside' => '', - 'template' => '', - 'title' => '' - ]; } /** @@ -146,17 +168,18 @@ class Page implements ArrayAccess * The path can be absolute or relative to the Friendica installation base folder. * * @param string $path - * + * @param string $media * @see Page::initHead() - * */ - public function registerStylesheet($path) + public function registerStylesheet($path, string $media = 'screen') { + $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]); + if (mb_strpos($path, $this->basePath . DIRECTORY_SEPARATOR) === 0) { $path = mb_substr($path, mb_strlen($this->basePath . DIRECTORY_SEPARATOR)); } - $this->stylesheets[] = trim($path, '/'); + $this->stylesheets[trim($path, '/')] = $media; } /** @@ -169,15 +192,15 @@ class Page implements ArrayAccess * - Infinite scroll data * - head.tpl template * - * @param App $app The Friendica App instance - * @param Module $module The loaded Friendica module - * @param L10n $l10n The l10n language instance - * @param Configuration $config The Friendica configuration - * @param PConfiguration $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) * * @throws HTTPException\InternalServerErrorException */ - private function initHead(App $app, Module $module, L10n $l10n, Configuration $config, PConfiguration $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); @@ -191,8 +214,8 @@ class Page implements ArrayAccess } // 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 @@ -208,12 +231,12 @@ 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'); if ($touch_icon == '') { - $touch_icon = 'images/friendica-128.png'; + $touch_icon = 'images/friendica-192.png'; } Hook::callAll('head', $this->page['htmlhead']); @@ -224,17 +247,40 @@ class Page implements ArrayAccess * being first */ $this->page['htmlhead'] = Renderer::replaceMacros($tpl, [ - '$local_user' => local_user(), - '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, - '$delitem' => $l10n->t('Delete this item?'), - '$update_interval' => $interval, - '$shortcut_icon' => $shortcut_icon, - '$touch_icon' => $touch_icon, - '$block_public' => intval($config->get('system', 'block_public')), - '$stylesheets' => $this->stylesheets, - ]) . $this->page['htmlhead']; + '$local_user' => local_user(), + '$generator' => 'Friendica' . ' ' . FRIENDICA_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, + '$shortcut_icon' => $shortcut_icon, + '$touch_icon' => $touch_icon, + '$block_public' => intval($config->get('system', 'block_public')), + '$stylesheets' => $this->stylesheets, + ]) . $this->page['htmlhead']; } + /** + * Returns the complete URL of the current page, e.g.: http(s)://something.com/network + * + * Taken from http://webcheatsheet.com/php/get_current_page_url.php + */ + private function curPageURL() + { + $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 { + $pageURL .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"]; + } + return $pageURL; + } + /** * Initializes Page->page['footer']. * @@ -245,17 +291,18 @@ class Page implements ArrayAccess * - footer.tpl template * * @param App $app The Friendica App instance + * @param Mode $mode The Friendica runtime mode * @param L10n $l10n The l10n instance * * @throws HTTPException\InternalServerErrorException */ - private function initFooter(App $app, L10n $l10n) + private function initFooter(App $app, Mode $mode, L10n $l10n) { // If you're just visiting, let javascript take you home if (!empty($_SESSION['visitor_home'])) { $homebase = $_SESSION['visitor_home']; - } elseif (local_user()) { - $homebase = 'profile/' . $app->user['nickname']; + } elseif (!empty($app->getLoggedInUserNickname())) { + $homebase = 'profile/' . $app->getLoggedInUserNickname(); } if (isset($homebase)) { @@ -265,11 +312,11 @@ class Page implements ArrayAccess /* * Add a "toggle mobile" link if we're using a mobile device */ - if ($app->is_mobile || $app->is_tablet) { + if ($mode->isMobile() || $mode->isTablet()) { if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { - $link = 'toggle_mobile?address=' . urlencode(curPageURL()); + $link = 'toggle_mobile?address=' . urlencode($this->curPageURL()); } else { - $link = 'toggle_mobile?off=1&address=' . urlencode(curPageURL()); + $link = 'toggle_mobile?off=1&address=' . urlencode($this->curPageURL()); } $this->page['footer'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("toggle_mobile_footer.tpl"), [ '$toggle_link' => $link, @@ -281,8 +328,8 @@ class Page implements ArrayAccess $tpl = Renderer::getMarkupTemplate('footer.tpl'); $this->page['footer'] = Renderer::replaceMacros($tpl, [ - '$footerScripts' => $this->footerScripts, - ]) . $this->page['footer']; + '$footerScripts' => array_unique($this->footerScripts), + ]) . $this->page['footer']; } /** @@ -292,34 +339,19 @@ class Page implements ArrayAccess * - module content * - hooks for content * - * @param Module $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(Module $module, Mode $mode) + private function initContent(ResponseInterface $response, Mode $mode) { - $content = ''; - - try { - $moduleClass = $module->getClassName(); - - $arr = ['content' => $content]; - Hook::callAll($moduleClass . '_mod_content', $arr); - $content = $arr['content']; - $arr = ['content' => call_user_func([$moduleClass, 'content'])]; - Hook::callAll($moduleClass . '_mod_aftercontent', $arr); - $content .= $arr['content']; - } catch (HTTPException $e) { - $content = 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(); } /** @@ -334,34 +366,80 @@ class Page implements ArrayAccess */ public function registerFooterScript($path) { + $path = Network::appendQueryParam($path, ['v' => FRIENDICA_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 Mode $mode The current node mode - * @param Module $module The loaded Friendica module - * @param L10n $l10n The l10n language class - * @param Configuration $config The Configuration of this node - * @param PConfiguration $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, Module $module, L10n $l10n, Configuration $config, PConfiguration $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 */ - $this->initContent($module, $mode); + $timestamp = microtime(true); + $this->initContent($response, $mode); + + // Load current theme info after module has been initialized as theme could have been set in module + $currentTheme = $app->getCurrentTheme(); + $theme_info_file = 'view/theme/' . $currentTheme . '/theme.php'; + if (file_exists($theme_info_file)) { + require_once $theme_info_file; + } + + if (function_exists(str_replace('-', '_', $currentTheme) . '_init')) { + $func = str_replace('-', '_', $currentTheme) . '_init'; + $func($app); + } /* Create the page head after setting the language * and getting any auth credentials. @@ -370,14 +448,16 @@ 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, $module, $l10n, $config, $pconfig); + $this->initHead($app, $args, $l10n, $config, $pconfig); /* Build the page ending -- this is stuff that goes right before * the closing tag */ - $this->initFooter($app, $l10n); + $this->initFooter($app, $mode, $l10n); + + $profiler->set(microtime(true) - $timestamp, 'aftermath'); - if (!$app->isAjax()) { + if (!$mode->isAjax()) { Hook::callAll('page_end', $this->page['content']); } @@ -387,6 +467,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(); @@ -411,16 +505,11 @@ 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; - $profile = $app->profile; header("X-Friendica-Version: " . FRIENDICA_VERSION); header("Content-type: text/html; charset=utf-8"); @@ -442,13 +531,13 @@ class Page implements ArrayAccess * to load another page template than the default one. * The page templates are located in /view/php/ or in the theme directory. */ - if (isset($_GET["mode"])) { - $template = Theme::getPathForFile($_GET["mode"] . '.php'); + if (isset($_GET['mode'])) { + $template = Theme::getPathForFile('php/' . Strings::sanitizeFilePathItem($_GET['mode']) . '.php'); } // If there is no page template use the default page template if (empty($template)) { - $template = Theme::getPathForFile("default.php"); + $template = Theme::getPathForFile('php/default.php'); } // Theme templates expect $a as an App instance @@ -457,7 +546,6 @@ class Page implements ArrayAccess // Used as is in view/php/default.php $lang = $l10n->getCurrentLang(); - /// @TODO Looks unsafe (remote-inclusion), is maybe not but Core\Theme::getPathForFile() uses file_exists() but does not escape anything require_once $template; } }