X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=2dd8f9d1ab1e0581a74f38b7432cb1b4492a822e;hb=c732027b04f674d186ee8652280313f25eedbd9a;hp=44a5eb40dfcd95430a988ff535f81700cb4c44c7;hpb=58eea1adaa185acdfdd420783ded92f908813209;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 44a5eb40df..2dd8f9d1ab 100644
--- a/src/App.php
+++ b/src/App.php
@@ -21,10 +21,11 @@
 
 namespace Friendica;
 
+use Dice\Dice;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Module;
+use Friendica\App\ModuleController;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
@@ -118,9 +119,9 @@ class App
 	private $args;
 
 	/**
-	 * @var Core\Process The process methods
+	 * @var Core\System The system methods
 	 */
-	private $process;
+	private $system;
 
 	/**
 	 * @var IManagePersonalConfigValues
@@ -154,6 +155,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 
@@ -313,10 +328,10 @@ class App
 	 * @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 Core\System                 $system   The system methods
 	 * @param IManagePersonalConfigValues $pConfig  Personal configuration
 	 */
-	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IManagePersonalConfigValues $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 +341,7 @@ class App
 		$this->logger   = $logger;
 		$this->l10n     = $l10n;
 		$this->args     = $args;
-		$this->process  = $process;
+		$this->system   = $system;
 		$this->pConfig  = $pConfig;
 
 		$this->load();
@@ -552,16 +567,16 @@ class App
 	 *
 	 * This probably should change to limit the size of this monster method.
 	 *
-	 * @param App\Module                  $module The determined module
+	 * @param App\ModuleController        $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
+	 * @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, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, float $start_time)
+	public function runFrontend(App\ModuleController $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Dice $dice, float $start_time)
 	{
 		$this->profiler->set($start_time, 'start');
 		$this->profiler->set(microtime(true), 'classinit');
@@ -574,14 +589,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()) {
@@ -696,11 +703,11 @@ class App
 			$page['page_title'] = $moduleName;
 
 			if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
-				$module = new Module('maintenance', Maintenance::class);
+				$module = new ModuleController('maintenance', new Maintenance());
 			} else {
 				// determine the module class and save it to the module instance
 				// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
-				$module = $module->determineClass($this->args, $router, $this->config);
+				$module = $module->determineClass($this->args, $router, $this->config, $dice);
 			}
 
 			// Let the module run it's internal process (init, get, post, ...)