X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FApp.php;h=abad4ee35d1f153ce760c53adbda23ffaec745e7;hb=9fbdcb5459e4acb158961427837612999253e046;hp=55b3e72e0eb6ca974e8f06c28ede845c91cf2c90;hpb=abf52c0c110b71505f9e86ae858a94120c9d74e9;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 55b3e72e0e..abad4ee35d 100644
--- a/src/App.php
+++ b/src/App.php
@@ -26,6 +26,8 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Factory\Config;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Model\User;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\ValueObject\Cache;
@@ -127,6 +129,11 @@ class App
 	 */
 	private $pConfig;
 
+	/**
+	 * @var IHandleUserSessions
+	 */
+	private $session;
+
 	/**
 	 * Set the user ID
 	 *
@@ -151,21 +158,23 @@ class App
 
 	public function isLoggedIn(): bool
 	{
-		return local_user() && $this->user_id && ($this->user_id == local_user());
+		return $this->session->getLocalUserId() && $this->user_id && ($this->user_id == $this->session->getLocalUserId());
 	}
 
 	/**
 	 * Check if current user has admin role.
 	 *
 	 * @return bool true if user is an admin
+	 * @throws Exception
 	 */
 	public function isSiteAdmin(): bool
 	{
-		$admin_email = $this->config->get('config', 'admin_email');
-
-		$adminlist = explode(',', str_replace(' ', '', $admin_email));
-
-		return local_user() && $admin_email && $this->database->exists('user', ['uid' => $this->getLoggedInUserId(), 'email' => $adminlist]);
+		return
+			$this->session->getLocalUserId()
+			&& $this->database->exists('user', [
+				'uid'   => $this->getLoggedInUserId(),
+				'email' => User::getAdminEmailList()
+			]);
 	}
 
 	/**
@@ -253,8 +262,8 @@ class App
 	/**
 	 * Set workerqueue information
 	 *
-	 * @param array $queue 
-	 * @return void 
+	 * @param array $queue
+	 * @return void
 	 */
 	public function setQueue(array $queue)
 	{
@@ -328,8 +337,9 @@ class App
 	 * @param L10n                        $l10n     The translator instance
 	 * @param App\Arguments               $args     The Friendica Arguments of the call
 	 * @param IManagePersonalConfigValues $pConfig  Personal configuration
+	 * @param IHandleUserSessions         $session  The (User)Session handler
 	 */
-	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig)
+	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleUserSessions $session)
 	{
 		$this->database = $database;
 		$this->config   = $config;
@@ -340,6 +350,7 @@ class App
 		$this->l10n     = $l10n;
 		$this->args     = $args;
 		$this->pConfig  = $pConfig;
+		$this->session  = $session;
 
 		$this->load();
 	}
@@ -415,7 +426,7 @@ class App
 		}
 
 		// Specific mobile theme override
-		if (($this->mode->isMobile() || $this->mode->isTablet()) && Core\Session::get('show-mobile', true)) {
+		if (($this->mode->isMobile() || $this->mode->isTablet()) && $this->session->get('show-mobile', true)) {
 			$user_mobile_theme = $this->getCurrentMobileTheme();
 
 			// --- means same mobile theme as desktop
@@ -487,16 +498,16 @@ class App
 
 		$page_theme = null;
 		// Find the theme that belongs to the user whose stuff we are looking at
-		if (!empty($this->profile_owner) && ($this->profile_owner != local_user())) {
+		if (!empty($this->profile_owner) && ($this->profile_owner != $this->session->getLocalUserId())) {
 			// 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_owner]);
-			if ($this->database->isResult($user) && !local_user()) {
+			if ($this->database->isResult($user) && !$this->session->getLocalUserId()) {
 				$page_theme = $user['theme'];
 			}
 		}
 
-		$theme_name = $page_theme ?: Core\Session::get('theme', $system_theme);
+		$theme_name = $page_theme ?: $this->session->get('theme', $system_theme);
 
 		$theme_name = Strings::sanitizeFilePathItem($theme_name);
 		if ($theme_name
@@ -520,15 +531,15 @@ class App
 
 		$page_mobile_theme = null;
 		// Find the theme that belongs to the user whose stuff we are looking at
-		if (!empty($this->profile_owner) && ($this->profile_owner != local_user())) {
+		if (!empty($this->profile_owner) && ($this->profile_owner != $this->session->getLocalUserId())) {
 			// 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 (!local_user()) {
+			if (!$this->session->getLocalUserId()) {
 				$page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme');
 			}
 		}
 
-		$mobile_theme_name = $page_mobile_theme ?: Core\Session::get('mobile-theme', $system_mobile_theme);
+		$mobile_theme_name = $page_mobile_theme ?: $this->session->get('mobile-theme', $system_mobile_theme);
 
 		$mobile_theme_name = Strings::sanitizeFilePathItem($mobile_theme_name);
 		if ($mobile_theme_name == '---'
@@ -620,14 +631,14 @@ class App
 			}
 
 			// ZRL
-			if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !local_user()) {
+			if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->session->getLocalUserId()) {
 				// Only continue when the given profile link seems valid
 				// Valid profile links contain a path with "/profile/" and no query parameters
 				if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
 					strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) {
-					if (Core\Session::get('visitor_home') != $_GET['zrl']) {
-						Core\Session::set('my_url', $_GET['zrl']);
-						Core\Session::set('authenticated', 0);
+					if ($this->session->get('visitor_home') != $_GET['zrl']) {
+						$this->session->set('my_url', $_GET['zrl']);
+						$this->session->set('authenticated', 0);
 
 						$remote_contact = Contact::getByURL($_GET['zrl'], false, ['subscribe']);
 						if (!empty($remote_contact['subscribe'])) {
@@ -728,7 +739,7 @@ class App
 			$response = $module->run($input);
 			$this->profiler->set(microtime(true) - $timestamp, 'content');
 			if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
-				$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig);
+				$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $this->session->getLocalUserId());
 			} else {
 				$page->exit($response);
 			}