Allow setting user avatar in the console at creation

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 3d650abc1ab4615da04b2002165b47cc8034ad50..4c5f6bfa9d2132148e4e40aeff3164494826576e 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -63,8 +63,8 @@ use Psr\Log\LoggerInterface;
 class App
 {
        const PLATFORM = 'Friendica';
-       const CODENAME = 'Giant Rhubarb';
-       const VERSION  = '2023.06-dev';
+       const CODENAME = 'Yellow Archangel';
+       const VERSION  = '2024.03-dev';
 
        // Allow themes to control internal parameters
        // by changing App values in theme.php
@@ -339,7 +339,6 @@ class App
                        set_time_limit((int)$this->config->get('system', 'ini_max_execution_time'));
                }
 
-               // This has to be quite large to deal with embedded private photos
                if ($this->config->get('system', 'ini_pcre_backtrack_limit') !== false) {
                        ini_set('pcre.backtrack_limit', (int)$this->config->get('system', 'ini_pcre_backtrack_limit'));
                }
@@ -566,6 +565,10 @@ class App
         */
        public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time, array $server)
        {
+               $requeststring = ($_SERVER['REQUEST_METHOD'] ?? '') . ' ' . ($_SERVER['REQUEST_URI'] ?? '') . ' ' . ($_SERVER['SERVER_PROTOCOL'] ?? '');
+               $this->logger->debug('Request received', ['address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+               $request_start = microtime(true);
+
                $this->profiler->set($start_time, 'start');
                $this->profiler->set(microtime(true), 'classinit');
 
@@ -582,6 +585,7 @@ class App
                                // Force SSL redirection
                                if ($this->config->get('system', 'force_ssl') &&
                                        (empty($server['HTTPS']) || $server['HTTPS'] === 'off') &&
+                                       (empty($server['HTTP_X_FORWARDED_PROTO']) || $server['HTTP_X_FORWARDED_PROTO'] === 'http') &&
                                        !empty($server['REQUEST_METHOD']) &&
                                        $server['REQUEST_METHOD'] === 'GET') {
                                        System::externalRedirect($this->baseURL . '/' . $this->args->getQueryString());
@@ -695,6 +699,9 @@ class App
                                $module = $router->getModule();
                        }
 
+                       // Display can change depending on the requested language, so it shouldn't be cached whole
+                       header('Vary: Accept-Language', false);
+
                        // Processes data from GET requests
                        $httpinput = $httpInput->process();
                        $input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
@@ -703,12 +710,16 @@ class App
                        $timestamp = microtime(true);
                        $response = $module->run($httpException, $input);
                        $this->profiler->set(microtime(true) - $timestamp, 'content');
+
+                       // Wrapping HTML responses in the theme template
                        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, $nav, $this->session->getLocalUserId());
-                       } else {
-                               $page->exit($response);
+                               $response = $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId());
                        }
+
+                       $this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]);
+                       System::echoResponse($response);
                } catch (HTTPException $e) {
+                       $this->logger->debug('Request processed with exception', ['response' => $e->getCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]);
                        $httpException->rawContent($e);
                }
                $page->logRuntime($this->config, 'runFrontend');