<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\App;
use DOMXPath;
use Friendica\App;
use Friendica\Content\Nav;
-use Friendica\Core\Config\IConfiguration;
-use Friendica\Core\Config\IPConfiguration;
+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\Theme;
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
* 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;
}
/**
* - 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 IConfiguration $config The Friendica configuration
- * @param IPConfiguration $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, IConfiguration $config, IPConfiguration $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);
$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']);
'$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'].
*
// 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)) {
*/
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,
* - 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'];
+ $content .= $module->getModule()->content();
} catch (HTTPException $e) {
- $content = ModuleHTTPException::content($e);
+ $content = (new ModuleHTTPException())->content($e);
}
// initialise content region
*/
public function registerFooterScript($path)
{
+ $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]);
+
$url = str_replace($this->basePath . DIRECTORY_SEPARATOR, '', $path);
$this->footerScripts[] = trim($url, '/');
/**
* 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 IConfiguration $config The Configuration of this node
- * @param IPConfiguration $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, IConfiguration $config, IPConfiguration $pconfig)
+ public function run(App $app, BaseURL $baseURL, Mode $mode, ModuleController $module, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
{
$moduleName = $module->getName();
*
* 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();
}
$page = $this->page;
- $profile = $app->profile;
header("X-Friendica-Version: " . FRIENDICA_VERSION);
header("Content-type: text/html; charset=utf-8");
projects / friendica.git / blobdiff