X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=925b24c9e7b6ace3705e901014e0ed7022770f1d;hb=0a4119adaf6294bf43d135a0f435c1dd677c50e0;hp=71b64bdb64781a899c257cf7d10ba9f94fd39b3b;hpb=c1dbb256561ecdb19fe0541628b1ec0f06d95dfa;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 71b64bdb64..925b24c9e7 100644
--- a/src/App.php
+++ b/src/App.php
@@ -7,7 +7,6 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Page;
 use Friendica\App\Authentication;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\IConfiguration;
@@ -29,7 +28,7 @@ use Psr\Log\LoggerInterface;
  *
  * class: App
  *
- * @brief Our main application structure for the life of this page.
+ * Our main application structure for the life of this page.
  *
  * Primarily deals with the URL that got us here
  * and tries to make some sense of it, and
@@ -40,10 +39,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-	/**
-	 * @var Page The current page environment
-	 */
-	public $page;
 	public $profile;
 	public $profile_uid;
 	public $user;
@@ -122,6 +117,11 @@ class App
 	 */
 	private $process;
 
+	/**
+	 * @var IPConfiguration
+	 */
+	private $pConfig;
+
 	/**
 	 * Returns the current config cache of this node
 	 *
@@ -153,8 +153,9 @@ class App
 	 * @param L10n            $l10n     The translator instance
 	 * @param App\Arguments   $args     The Friendica Arguments of the call
 	 * @param Core\Process    $process  The process methods
+	 * @param IPConfiguration $pConfig  Personal configuration
 	 */
-	public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, App\Page $page, Core\Process $process)
+	public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfiguration $pConfig)
 	{
 		$this->database = $database;
 		$this->config   = $config;
@@ -165,10 +166,10 @@ class App
 		$this->l10n     = $l10n;
 		$this->args     = $args;
 		$this->process  = $process;
+		$this->pConfig  = $pConfig;
 
 		$this->argv         = $args->getArgv();
 		$this->argc         = $args->getArgc();
-		$this->page         = $page;
 
 		$this->load();
 	}
@@ -341,7 +342,7 @@ class App
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
 			$user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
-			if ($this->database->isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
+			if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
 				$page_theme = $user['theme'];
 			}
 		}
@@ -373,8 +374,8 @@ class App
 		if ($this->profile_uid && ($this->profile_uid != local_user())) {
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
-			if (!Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
-				$page_mobile_theme = Core\PConfig::get($this->profile_uid, 'system', 'mobile-theme');
+			if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+				$page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme');
 			}
 		}
 
@@ -392,8 +393,6 @@ class App
 	}
 
 	/**
-	 * @brief Return full URL to theme which is currently in effect.
-	 *
 	 * Provide a sane default if nothing is chosen or the specified theme does not exist.
 	 *
 	 * @return string
@@ -435,10 +434,11 @@ class App
 	 * @param App\Router     $router
 	 * @param IPConfiguration $pconfig
 	 * @param Authentication $auth The Authentication backend of the node
+	 * @param App\Page $page The Friendica page printing container
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth)
+	public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth, App\Page $page)
 	{
 		$moduleName = $module->getName();
 
@@ -567,7 +567,7 @@ class App
 			}
 
 			// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-			$this->page['page_title'] = $moduleName;
+			$page['page_title'] = $moduleName;
 
 			// determine the module class and save it to the module instance
 			// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
@@ -579,7 +579,7 @@ class App
 			ModuleHTTPException::rawContent($e);
 		}
 
-		$this->page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
+		$page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
 	}
 
 	/**