X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=772d273c521f7e1555a9e121b009a6cc0106bfaa;hb=f5f919aead458a7a003fff02e8956932a913c514;hp=892a4c7790e4955283f13f05de000326e3f92645;hpb=3f57e16a1a49326a0c13a88a10c7a6bfb87c4878;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 892a4c7790..772d273c52 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1,13 +1,32 @@
 <?php
 /**
- * @file src/App.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica;
 
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Authentication;
+use Friendica\App\Module;
+use Friendica\Module\Maintenance;
+use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;
@@ -25,9 +44,6 @@ use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
 /**
- *
- * class: App
- *
  * Our main application structure for the life of this page.
  *
  * Primarily deals with the URL that got us here
@@ -63,7 +79,6 @@ class App
 	public $sourcename              = '';
 	public $videowidth              = 425;
 	public $videoheight             = 350;
-	public $force_max_items         = 0;
 	public $theme_events_in_profile = true;
 	public $queue;
 
@@ -226,22 +241,6 @@ class App
 		}
 	}
 
-	/**
-	 * Returns the current UserAgent as a String
-	 *
-	 * @return string the UserAgent as a String
-	 * @throws HTTPException\InternalServerErrorException
-	 */
-	public function getUserAgent()
-	{
-		return
-			FRIENDICA_PLATFORM . " '" .
-			FRIENDICA_CODENAME . "' " .
-			FRIENDICA_VERSION . '-' .
-			DB_UPDATE_VERSION . '; ' .
-			$this->baseURL->get();
-	}
-
 	/**
 	 * Returns the current theme name. May be overriden by the mobile theme name.
 	 *
@@ -418,8 +417,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 {
@@ -445,12 +447,7 @@ 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()) {
+			if ($this->mode->isNormal() && !$this->mode->isBackend()) {
 				$requester = HTTPSignature::getSigner('', $_SERVER);
 				if (!empty($requester)) {
 					Profile::addVisitorCookieForHandle($requester);
@@ -458,7 +455,7 @@ class App
 			}
 
 			// ZRL
-			if (!empty($_GET['zrl']) && $this->mode->isNormal()) {
+			if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend()) {
 				if (!local_user()) {
 					// Only continue when the given profile link seems valid
 					// Valid profile links contain a path with "/profile/" and no query parameters
@@ -504,8 +501,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);
@@ -549,17 +544,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);
 	}
 
 	/**