Merge pull request #12277 from nupplaphil/mod/fbrowser

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 1933b359e7a688f353d0c922c52f25e236ca98a2..abad4ee35d1f153ce760c53adbda23ffaec745e7 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -26,8 +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;
@@ -129,15 +129,10 @@ class App
         */
        private $pConfig;
 
-       /**
-        * @var IHandleSessions
-        */
-       private $session;
-
        /**
         * @var IHandleUserSessions
         */
-       private $userSession;
+       private $session;
 
        /**
         * Set the user ID
@@ -163,21 +158,23 @@ class App
 
        public function isLoggedIn(): bool
        {
-               return $this->userSession->getLocalUserId() && $this->user_id && ($this->user_id == $this->userSession->getLocalUserId());
+               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 $this->userSession->getLocalUserId() && $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()
+                       ]);
        }
 
        /**
@@ -265,8 +262,8 @@ class App
        /**
         * Set workerqueue information
         *
-        * @param array $queue 
-        * @return void 
+        * @param array $queue
+        * @return void
         */
        public function setQueue(array $queue)
        {
@@ -340,21 +337,20 @@ 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
-        */
-       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleSessions $session, IHandleUserSessions $userSession)
-       {
-               $this->database    = $database;
-               $this->config      = $config;
-               $this->mode        = $mode;
-               $this->baseURL     = $baseURL;
-               $this->profiler    = $profiler;
-               $this->logger      = $logger;
-               $this->l10n        = $l10n;
-               $this->args        = $args;
-               $this->pConfig     = $pConfig;
-               $this->session     = $session;
-               $this->userSession = $userSession;
+        * @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, IHandleUserSessions $session)
+       {
+               $this->database = $database;
+               $this->config   = $config;
+               $this->mode     = $mode;
+               $this->baseURL  = $baseURL;
+               $this->profiler = $profiler;
+               $this->logger   = $logger;
+               $this->l10n     = $l10n;
+               $this->args     = $args;
+               $this->pConfig  = $pConfig;
+               $this->session  = $session;
 
                $this->load();
        }
@@ -502,11 +498,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 != $this->userSession->getLocalUserId())) {
+               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) && !$this->userSession->getLocalUserId()) {
+                       if ($this->database->isResult($user) && !$this->session->getLocalUserId()) {
                                $page_theme = $user['theme'];
                        }
                }
@@ -535,10 +531,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 != $this->userSession->getLocalUserId())) {
+               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 (!$this->userSession->getLocalUserId()) {
+                       if (!$this->session->getLocalUserId()) {
                                $page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme');
                        }
                }
@@ -635,7 +631,7 @@ class App
                        }
 
                        // ZRL
-                       if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->userSession->getLocalUserId()) {
+                       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) == '') &&
@@ -743,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, $this->userSession->getLocalUserId());
+                               $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $this->session->getLocalUserId());
                        } else {
                                $page->exit($response);
                        }