X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FPage.php;h=d3365a16c130d2b5d0453f8618447175e6f3ddab;hb=b0086a49e2c28c528e178bcdd28203207feceef6;hp=7af0bc8995473b452d7aaef051569c66a127b19b;hpb=91ba4bb2aba53d74e5dc6d11dea6ad73b5e4fafe;p=friendica.git diff --git a/src/App/Page.php b/src/App/Page.php index 7af0bc8995..d3365a16c1 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -1,4 +1,23 @@ . + * + */ namespace Friendica\App; @@ -7,14 +26,16 @@ 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\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; /** * Contains the page specific environment variables for the current Page @@ -29,15 +50,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 +81,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' => '' - ]; } /** @@ -152,6 +171,8 @@ class Page implements ArrayAccess */ public function registerStylesheet($path) { + $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)); } @@ -169,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 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); @@ -224,15 +245,15 @@ 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?'), + '$update_interval' => $interval, + '$shortcut_icon' => $shortcut_icon, + '$touch_icon' => $touch_icon, + '$block_public' => intval($config->get('system', 'block_public')), + '$stylesheets' => array_unique($this->stylesheets), + ]) . $this->page['htmlhead']; } /** @@ -255,7 +276,7 @@ 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()) { + } elseif (!empty($app->user['nickname'])) { $homebase = 'profile/' . $app->user['nickname']; } @@ -282,8 +303,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']; } /** @@ -335,6 +356,8 @@ 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, '/'); @@ -343,17 +366,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 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, IConfig $config, IPConfig $pconfig) { $moduleName = $module->getName(); @@ -455,13 +478,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 @@ -470,7 +493,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; } }