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

diff --git a/src/App.php b/src/App.php
index c9aafe14eb..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,8 +57,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-	public $user;
-
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php
 	private $theme_info = [
@@ -66,6 +65,8 @@ class App
 		'events_in_profile' => true
 	];
 
+	private $user_id       = 0;
+	private $nickname      = '';
 	private $timezone      = '';
 	private $profile_owner = 0;
 	private $contact_id    = 0;
@@ -126,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
 	 *
@@ -307,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);
 		}