X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=7c7496c3baf138a0b47d66b9241d2653d39354eb;hb=c3554ac0f4dbcc4516ca3c9a9cd8c8fa9f9163ea;hp=df15bf095ec681b494f01551495b0b518342f467;hpb=9cc4682e0a6957d40ecc9a931ddd5b8f32c594b6;p=friendica.git

diff --git a/src/App.php b/src/App.php
index df15bf095e..7c7496c3ba 100644
--- a/src/App.php
+++ b/src/App.php
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
+use Friendica\Factory\ConfigFactory;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
@@ -56,20 +57,16 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-	public $user;
-	public $data = [];
-	/** @deprecated 2019.09 - use App\Arguments->getArgv() or Arguments->get() */
-	public $argv;
-	/** @deprecated 2019.09 - use App\Arguments->getArgc() */
-	public $argc;
-	public $theme_info = [];
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php
-
-	public $videowidth              = 425;
-	public $videoheight             = 350;
-	public $theme_events_in_profile = true;
-
+	private $theme_info = [
+		'videowidth'        => 425,
+		'videoheight'       => 350,
+		'events_in_profile' => true
+	];
+
+	private $user_id       = 0;
+	private $nickname      = '';
 	private $timezone      = '';
 	private $profile_owner = 0;
 	private $contact_id    = 0;
@@ -130,6 +127,51 @@ class App
 	 */
 	private $pConfig;
 
+	/**
+	 * Set the user ID
+	 *
+	 * @param int $user_id
+	 * @return void
+	 */
+	public function setLoggedInUserId(int $user_id)
+	{
+		$this->user_id = $user_id;
+	}
+
+	/**
+	 * Set the nickname
+	 *
+	 * @param int $user_id
+	 * @return void
+	 */
+	public function setLoggedInUserNickname(string $nickname)
+	{
+		$this->nickname = $nickname;
+	}
+
+	public function isLoggedIn()
+	{
+		return local_user() && $this->user_id && ($this->user_id == local_user());
+	}
+
+	/**
+	 * Fetch the user id
+	 * @return int 
+	 */
+	public function getLoggedInUserId()
+	{
+		return $this->user_id;
+	}
+
+	/**
+	 * Fetch the user nick name
+	 * @return string
+	 */
+	public function getLoggedInUserNickname()
+	{
+		return $this->nickname;
+	}
+
 	/**
 	 * Set the profile owner ID
 	 *
@@ -193,21 +235,53 @@ class App
 		return $this->timezone;
 	}
 
+	/**
+	 * Set workerqueue information
+	 *
+	 * @param array $queue 
+	 * @return void 
+	 */
 	public function setQueue(array $queue)
 	{
 		$this->queue = $queue;
 	}
 
+	/**
+	 * Fetch workerqueue information
+	 *
+	 * @return array 
+	 */
 	public function getQueue()
 	{
 		return $this->queue ?? [];
 	}
 
+	/**
+	 * Fetch a specific workerqueue field
+	 *
+	 * @param string $index 
+	 * @return mixed 
+	 */
 	public function getQueueValue(string $index)
 	{
 		return $this->queue[$index] ?? null;
 	}
 
+	public function setThemeInfoValue(string $index, $value)
+	{
+		$this->theme_info[$index] = $value;
+	}
+
+	public function getThemeInfo()
+	{
+		return $this->theme_info;
+	}
+
+	public function getThemeInfoValue(string $index, $default = null)
+	{
+		return $this->theme_info[$index] ?? $default;
+	}
+
 	/**
 	 * Returns the current config cache of this node
 	 *
@@ -254,9 +328,6 @@ class App
 		$this->process  = $process;
 		$this->pConfig  = $pConfig;
 
-		$this->argv         = $args->getArgv();
-		$this->argc         = $args->getArgc();
-
 		$this->load();
 	}
 
@@ -282,7 +353,7 @@ class App
 			$this->profiler->update($this->config);
 
 			Core\Hook::loadHooks();
-			$loader = new ConfigFileLoader($this->getBasePath());
+			$loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
 			Core\Hook::callAll('load_config', $loader);
 		}