<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Configuration;
-use Friendica\Core\Config\PConfiguration;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\PConfig\IPConfig;
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
/**
* @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
*/
public function __construct(string $basepath)
{
$this->basePath = $basepath;
-
- $this->page = [
- 'aside' => '',
- 'bottom' => '',
- 'content' => '',
- 'footer' => '',
- 'htmlhead' => '',
- 'nav' => '',
- 'page_title' => '',
- 'right_aside' => '',
- 'template' => '',
- 'title' => ''
- ];
}
/**
* 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 Configuration $config The Friendica configuration
- * @param PConfiguration $pConfig The Friendica personal configuration (for user)
+ * @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)
*
* @throws HTTPException\InternalServerErrorException
*/
- private function initHead(App $app, Module $module, L10n $l10n, Configuration $config, PConfiguration $pConfig)
+ private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfig $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']);
'$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'];
}
// If you're just visiting, let javascript take you home
if (!empty($_SESSION['visitor_home'])) {
$homebase = $_SESSION['visitor_home'];
- } elseif (local_user()) {
+ } elseif (!empty($app->user['nickname'])) {
$homebase = 'profile/' . $app->user['nickname'];
}
*/
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 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 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
*
* @throws HTTPException\InternalServerErrorException
*/
- public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Configuration $config, PConfiguration $pconfig)
+ public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Profiler $profiler, IConfig $config, IPConfig $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();
projects / friendica.git / blobdiff