X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=f410f6aa2811ea7d39b3c3d97f020537f7882e6f;hb=c95d47b0b4d01552804ebcf26e5ae42fc576fc60;hp=4b1929a9989e6fa1741a8a54ed4124a28e84101d;hpb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;p=friendica.git diff --git a/src/App/Page.php b/src/App/Page.php index 4b1929a998..f410f6aa28 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -1,4 +1,23 @@ . + * + */ namespace Friendica\App; @@ -7,8 +26,8 @@ use DOMDocument; use DOMXPath; use Friendica\App; use Friendica\Content\Nav; -use Friendica\Core\Config\IConfig; -use Friendica\Core\PConfig\IPConfig; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; @@ -17,6 +36,7 @@ use Friendica\Module\Special\HTTPException as ModuleHTTPException; use Friendica\Network\HTTPException; use Friendica\Util\Network; use Friendica\Util\Strings; +use Friendica\Util\Profiler; /** * Contains the page specific environment variables for the current Page @@ -146,11 +166,10 @@ 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]); @@ -158,7 +177,7 @@ class Page implements ArrayAccess $path = mb_substr($path, mb_strlen($this->basePath . DIRECTORY_SEPARATOR)); } - $this->stylesheets[] = trim($path, '/'); + $this->stylesheets[trim($path, '/')] = $media; } /** @@ -171,15 +190,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 IConfig $config The Friendica configuration - * @param IPConfig $pConfig The Friendica personal configuration (for user) + * @param App $app The Friendica App instance + * @param ModuleController $module The loaded Friendica module + * @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, IConfig $config, IPConfig $pConfig) + private function initHead(App $app, ModuleController $module, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig) { $interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000); @@ -215,7 +234,7 @@ class Page implements ArrayAccess $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']); @@ -229,14 +248,37 @@ class Page implements ArrayAccess '$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' => array_unique($this->stylesheets), + '$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']. * @@ -257,8 +299,8 @@ class Page implements ArrayAccess // 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)) { @@ -270,9 +312,9 @@ class Page implements ArrayAccess */ 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, @@ -295,26 +337,23 @@ class Page implements ArrayAccess * - module content * - hooks for content * - * @param Module $module The module - * @param Mode $mode The Friendica execution mode + * @param ModuleController $module The module + * @param Mode $mode The Friendica execution mode * * @throws HTTPException\InternalServerErrorException */ - private function initContent(Module $module, Mode $mode) + private function initContent(ModuleController $module, Mode $mode) { $content = ''; try { - $moduleClass = $module->getClassName(); + $moduleClass = $module->getModule(); $arr = ['content' => $content]; - Hook::callAll($moduleClass . '_mod_content', $arr); + Hook::callAll($moduleClass->getClassName() . '_mod_content', $arr); $content = $arr['content']; - $arr = ['content' => call_user_func([$moduleClass, 'content'], $module->getParameters())]; - Hook::callAll($moduleClass . '_mod_aftercontent', $arr); - $content .= $arr['content']; } catch (HTTPException $e) { - $content = ModuleHTTPException::content($e); + $content = (new ModuleHTTPException())->content($e); } // initialise content region @@ -347,17 +386,17 @@ class Page implements ArrayAccess /** * 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 IConfig $config The Configuration of this node - * @param IPConfig $pconfig The personal/user configuration + * @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 * * @throws HTTPException\InternalServerErrorException */ - public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfig $pconfig) + public function run(App $app, BaseURL $baseURL, Mode $mode, ModuleController $module, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig) { $moduleName = $module->getName(); @@ -366,7 +405,9 @@ class Page implements ArrayAccess * * Sets the $Page->page['content'] variable */ + $timestamp = microtime(true); $this->initContent($module, $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(); @@ -437,7 +478,6 @@ class Page implements ArrayAccess } $page = $this->page; - $profile = $app->profile; header("X-Friendica-Version: " . FRIENDICA_VERSION); header("Content-type: text/html; charset=utf-8");