X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=75f5314af53b72dc2df815a017a7a77776bc6e70;hb=aeb75c19a3576a33ce900cb2833c6323b49fd387;hp=44a5eb40dfcd95430a988ff535f81700cb4c44c7;hpb=58eea1adaa185acdfdd420783ded92f908813209;p=friendica.git diff --git a/src/App.php b/src/App.php index 44a5eb40df..75f5314af5 100644 --- a/src/App.php +++ b/src/App.php @@ -118,9 +118,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 +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 @@ -313,10 +327,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 +340,7 @@ class App $this->logger = $logger; $this->l10n = $l10n; $this->args = $args; - $this->process = $process; + $this->system = $system; $this->pConfig = $pConfig; $this->load(); @@ -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()) {