Fix notices because of unknown Hubzilla activity type

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index c69abf212748239dbb1cba3a5890eca8736426d4..5c74b1b539388750f7b2c8300351ac34a07795dd 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,8 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
+use Friendica\App\Module;
+use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
 use Friendica\Core\Config\IConfig;
@@ -32,6 +34,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
@@ -415,8 +418,11 @@ class App
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page)
+       public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page, float $start_time)
        {
+               $this->profiler->set($start_time, 'start');
+               $this->profiler->set(microtime(true), 'classinit');
+
                $moduleName = $module->getName();
 
                try {
@@ -442,11 +448,6 @@ class App
                                Core\Hook::callAll('init_1');
                        }
 
-                       // Exclude the backend processes from the session management
-                       if ($this->mode->isBackend()) {
-                               Core\Worker::executeIfIdle();
-                       }
-
                        if ($this->mode->isNormal() && !$this->mode->isBackend()) {
                                $requester = HTTPSignature::getSigner('', $_SERVER);
                                if (!empty($requester)) {
@@ -464,6 +465,11 @@ class App
                                                if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
                                                        Core\Session::set('my_url', $_GET['zrl']);
                                                        Core\Session::set('authenticated', 0);
+
+                                                       $remote_contact = Contact::getByURL($_GET['zrl'], false, ['subscribe']);
+                                                       if (!empty($remote_contact['subscribe'])) {
+                                                               $_SESSION['remote_comment'] = $remote_contact['subscribe'];
+                                                       }
                                                }
 
                                                Model\Profile::zrlInit($this);
@@ -501,8 +507,6 @@ class App
                        // but we need "view" module for stylesheet
                        if ($this->mode->isInstall() && $moduleName !== 'install') {
                                $this->baseURL->redirect('install');
-                       } elseif (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'maintenance') {
-                               $this->baseURL->redirect('maintenance');
                        } else {
                                $this->checkURL();
                                Core\Update::check($this->getBasePath(), false, $this->mode);
@@ -546,17 +550,21 @@ class App
                        // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
                        $page['page_title'] = $moduleName;
 
-                       // 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);
+                       if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
+                               $module = new Module('maintenance', Maintenance::class);
+                       } 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);
+                       }
 
                        // Let the module run it's internal process (init, get, post, ...)
-                       $module->run($this->l10n, $this->baseURL, $this->logger, $_SERVER, $_POST);
+                       $module->run($this->l10n, $this->baseURL, $this->logger, $this->profiler, $_SERVER, $_POST);
                } catch (HTTPException $e) {
                        ModuleHTTPException::rawContent($e);
                }
 
-               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
+               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->profiler, $this->config, $pconfig);
        }
 
        /**