Merge pull request #8075 from annando/html-escaping

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index 7b3bc286f335e95299d7db129d230e34a07931d0..5efb9f7ca3d64deae2f9fd1da93fce07964395d4 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -7,8 +7,8 @@ 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\IConfiguration;
+use Friendica\Core\Config\IPConfiguration;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n\L10n;
 use Friendica\Core\Renderer;
@@ -30,15 +30,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
         */
@@ -50,19 +61,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'       => ''
-               ];
        }
 
        /**
@@ -173,12 +171,12 @@ class Page implements ArrayAccess
         * @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 IConfiguration  $config  The Friendica configuration
+        * @param IPConfiguration $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, IConfiguration $config, IPConfiguration $pConfig)
        {
                $interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
 
@@ -349,12 +347,12 @@ class Page implements ArrayAccess
         * @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 IConfiguration  $config  The Configuration of this node
+        * @param IPConfiguration $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, IConfiguration $config, IPConfiguration $pconfig)
        {
                $moduleName = $module->getName();