X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=f410f6aa2811ea7d39b3c3d97f020537f7882e6f;hb=c95d47b0b4d01552804ebcf26e5ae42fc576fc60;hp=c2bfb388788085ccbdbdc176f0a9db74bb32b447;hpb=c9c6eca8a60681360f1222739d0603e4ed99d663;p=friendica.git diff --git a/src/App/Page.php b/src/App/Page.php index c2bfb38878..f410f6aa28 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -1,6 +1,6 @@ get(local_user(), 'system', 'update_interval') : 40000); @@ -233,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']); @@ -247,6 +248,7 @@ 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, @@ -255,6 +257,28 @@ class Page implements ArrayAccess ]) . $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']. * @@ -275,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 (!empty($app->user['nickname'])) { - $homebase = 'profile/' . $app->user['nickname']; + } elseif (!empty($app->getLoggedInUserNickname())) { + $homebase = 'profile/' . $app->getLoggedInUserNickname(); } if (isset($homebase)) { @@ -288,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, @@ -313,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 @@ -365,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(); @@ -384,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(); @@ -455,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");