Removed unused code

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index cd217c34e7ec715212962b6ed530e759b43d5a71..75f5314af53b72dc2df815a017a7a77776bc6e70 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -25,12 +25,12 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
-use Friendica\Core\Config\Factory\ConfigFactory;
+use Friendica\Core\Config\Factory\Config;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
-use Friendica\Core\Config\Cache\Cache;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
@@ -88,7 +88,7 @@ class App
        private $currentMobileTheme;
 
        /**
-        * @var IConfig The config
+        * @var IManageConfigValues The config
         */
        private $config;
 
@@ -118,12 +118,12 @@ class App
        private $args;
 
        /**
-        * @var Core\Process The process methods
+        * @var Core\System The system methods
         */
-       private $process;
+       private $system;
 
        /**
-        * @var IPConfig
+        * @var IManagePersonalConfigValues
         */
        private $pConfig;
 
@@ -154,6 +154,20 @@ class App
                return local_user() && $this->user_id && ($this->user_id == local_user());
        }
 
+       /**
+        * Check if current user has admin role.
+        *
+        * @return bool true if user is an admin
+        */
+       public function isSiteAdmin()
+       {
+               $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]);
+       }
+
        /**
         * Fetch the user id
         * @return int 
@@ -305,18 +319,18 @@ class App
        }
 
        /**
-        * @param Database        $database The Friendica Database
-        * @param IConfig         $config   The Configuration
-        * @param App\Mode        $mode     The mode of this Friendica app
-        * @param BaseURL         $baseURL  The full base URL of this Friendica app
-        * @param LoggerInterface $logger   The current app logger
-        * @param Profiler        $profiler The profiler of this application
-        * @param L10n            $l10n     The translator instance
-        * @param App\Arguments   $args     The Friendica Arguments of the call
-        * @param Core\Process    $process  The process methods
-        * @param IPConfig        $pConfig  Personal configuration
+        * @param Database                    $database The Friendica Database
+        * @param IManageConfigValues         $config   The Configuration
+        * @param App\Mode                    $mode     The mode of this Friendica app
+        * @param BaseURL                     $baseURL  The full base URL of this Friendica app
+        * @param LoggerInterface             $logger   The current app logger
+        * @param Profiler                    $profiler The profiler of this application
+        * @param L10n                        $l10n     The translator instance
+        * @param App\Arguments               $args     The Friendica Arguments of the call
+        * @param Core\System                 $system   The system methods
+        * @param IManagePersonalConfigValues $pConfig  Personal configuration
         */
-       public function __construct(Database $database, IConfig $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfig $pConfig)
+       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\System $system, IManagePersonalConfigValues $pConfig)
        {
                $this->database = $database;
                $this->config   = $config;
@@ -326,7 +340,7 @@ class App
                $this->logger   = $logger;
                $this->l10n     = $l10n;
                $this->args     = $args;
-               $this->process  = $process;
+               $this->system   = $system;
                $this->pConfig  = $pConfig;
 
                $this->load();
@@ -357,7 +371,7 @@ class App
                        $this->profiler->update($this->config);
 
                        Core\Hook::loadHooks();
-                       $loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
+                       $loader = (new Config())->createConfigFileLoader($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
                }
 
@@ -552,16 +566,16 @@ class App
         *
         * This probably should change to limit the size of this monster method.
         *
-        * @param App\Module     $module The determined module
-        * @param App\Router     $router
-        * @param IPConfig       $pconfig
-        * @param Authentication $auth The Authentication backend of the node
-        * @param App\Page       $page The Friendica page printing container
+        * @param App\Module                  $module The determined module
+        * @param App\Router                  $router
+        * @param IManagePersonalConfigValues $pconfig
+        * @param Authentication              $auth The Authentication backend of the node
+        * @param App\Page                    $page The Friendica page printing container
         *
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page, float $start_time)
+       public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, float $start_time)
        {
                $this->profiler->set($start_time, 'start');
                $this->profiler->set(microtime(true), 'classinit');
@@ -574,14 +588,6 @@ class App
                                throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.');
                        }
 
-                       // Max Load Average reached: ERROR
-                       if ($this->process->isMaxProcessesReached() || $this->process->isMaxLoadReached()) {
-                               header('Retry-After: 120');
-                               header('Refresh: 120; url=' . $this->baseURL->get() . "/" . $this->args->getQueryString());
-
-                               throw new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.');
-                       }
-
                        if (!$this->mode->isInstall()) {
                                // Force SSL redirection
                                if ($this->baseURL->checkRedirectHttps()) {