X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=25770dd782e072e2add1532e68bb23667c7cf504;hb=d87585477cb5c68d24442fb329581f88c1dfe8e9;hp=95b0716e2808a784ddaa686980d6451ef99b615e;hpb=d369f1e1e03ffeb0d86b3bbf5b34298db132888f;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 95b0716e28..25770dd782 100644
--- a/src/App.php
+++ b/src/App.php
@@ -26,7 +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\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Model\User;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\ValueObject\Cache;
@@ -61,14 +62,13 @@ class App
 {
 	const PLATFORM = 'Friendica';
 	const CODENAME = 'Giant Rhubarb';
-	const VERSION  = '2022.12-dev';
+	const VERSION  = '2022.12-rc';
 
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php
 	private $theme_info = [
 		'videowidth'        => 425,
 		'videoheight'       => 350,
-		'events_in_profile' => true
 	];
 
 	private $user_id       = 0;
@@ -129,7 +129,7 @@ class App
 	private $pConfig;
 
 	/**
-	 * @var IHandleSessions
+	 * @var IHandleUserSessions
 	 */
 	private $session;
 
@@ -157,21 +157,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()
+			]);
 	}
 
 	/**
@@ -259,8 +261,8 @@ class App
 	/**
 	 * Set workerqueue information
 	 *
-	 * @param array $queue 
-	 * @return void 
+	 * @param array $queue
+	 * @return void
 	 */
 	public function setQueue(array $queue)
 	{
@@ -334,9 +336,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 IHandleSessions             $session  The Session handler
+	 * @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, IHandleSessions $session)
+	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;
@@ -495,11 +497,11 @@ 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'];
 			}
 		}
@@ -528,10 +530,10 @@ 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');
 			}
 		}
@@ -628,7 +630,7 @@ 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) == '') &&
@@ -736,7 +738,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);
 			}