Merge pull request #11480 from annando/gotosocial

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index a17fb3ec388cd64ab06175eb19b740279e308982..f7c929820d308640f7b3156d684b58d997417d70 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -580,7 +580,7 @@ class App
                try {
                        // Missing DB connection: ERROR
                        if ($this->mode->has(App\Mode::LOCALCONFIGPRESENT) && !$this->mode->has(App\Mode::DBAVAILABLE)) {
-                               throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.');
+                               throw new HTTPException\InternalServerErrorException($this->l10n->t('Apologies but the website is unavailable at the moment.'));
                        }
 
                        if (!$this->mode->isInstall()) {
@@ -600,29 +600,27 @@ class App
                        }
 
                        // ZRL
-                       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
-                                       if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
-                                               strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-                                               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'];
-                                                       }
+                       if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !local_user()) {
+                               // Only continue when the given profile link seems valid
+                               // Valid profile links contain a path with "/profile/" and no query parameters
+                               if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
+                                       strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
+                                       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);
-                                       } else {
-                                               // Someone came with an invalid parameter, maybe as a DDoS attempt
-                                               // We simply stop processing here
-                                               $this->logger->debug('Invalid ZRL parameter.', ['zrl' => $_GET['zrl']]);
-                                               throw new HTTPException\ForbiddenException();
                                        }
+
+                                       Model\Profile::zrlInit($this);
+                               } else {
+                                       // Someone came with an invalid parameter, maybe as a DDoS attempt
+                                       // We simply stop processing here
+                                       $this->logger->debug('Invalid ZRL parameter.', ['zrl' => $_GET['zrl']]);
+                                       throw new HTTPException\ForbiddenException();
                                }
                        }
 
@@ -709,7 +707,9 @@ class App
                        $input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
 
                        // Let the module run it's internal process (init, get, post, ...)
+                       $timestamp = microtime(true);
                        $response = $module->run($input);
+                       $this->profiler->set(microtime(true) - $timestamp, 'content');
                        if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
                                $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig);
                        } else {