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

diff --git a/src/App.php b/src/App.php
index 993045ac5f..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;
@@ -36,7 +37,6 @@ use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;
@@ -57,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 = [
@@ -135,7 +133,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setUserId(int $user_id)
+	public function setLoggedInUserId(int $user_id)
 	{
 		$this->user_id = $user_id;
 	}
@@ -146,16 +144,21 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setNickname(string $nickname)
+	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 getUserId()
+	public function getLoggedInUserId()
 	{
 		return $this->user_id;
 	}
@@ -164,30 +167,11 @@ class App
 	 * Fetch the user nick name
 	 * @return string
 	 */
-	public function getNickname()
+	public function getLoggedInUserNickname()
 	{
 		return $this->nickname;
 	}
 
-	/**
-	 * Fetch a specific user field
-	 *
-	 * @param string $index 
-	 * @return mixed 
-	 */
-	public function getUserValue(string $index)
-	{
-		if (empty($this->user_id)) {
-			return null;
-		}
-
-		if (empty($this->user)) {
-			$this->user = User::getById($this->user_id);
-		}
-
-		return $this->user[$index] ?? null;
-	}
-
 	/**
 	 * Set the profile owner ID
 	 *
@@ -369,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);
 		}