Merge pull request #12935 from HankG/fix-sending-dms-with-oauth-user

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 378ddbc9de032429c864b68d4835b489d6036a88..d36eb253a7cd729d3be2d81e40b11b50d3973a4e 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -64,7 +64,7 @@ class App
 {
        const PLATFORM = 'Friendica';
        const CODENAME = 'Giant Rhubarb';
-       const VERSION  = '2023.03-dev';
+       const VERSION  = '2023.03-rc';
 
        // Allow themes to control internal parameters
        // by changing App values in theme.php
@@ -357,8 +357,6 @@ class App
                $this->profiler->reset();
 
                if ($this->mode->has(App\Mode::DBAVAILABLE)) {
-                       $this->profiler->update($this->config);
-
                        Core\Hook::loadHooks();
                        $loader = (new Config())->createConfigFileManager($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
@@ -542,25 +540,6 @@ class App
                return Core\Theme::getStylesheetPath($this->getCurrentTheme());
        }
 
-       /**
-        * Sets the base url for use in cmdline programs which don't have
-        * $_SERVER variables
-        */
-       public function checkURL()
-       {
-               $url = $this->config->get('system', 'url');
-
-               // if the url isn't set or the stored url is radically different
-               // than the currently visited url, store the current value accordingly.
-               // "Radically different" ignores common variations such as http vs https
-               // and www.example.com vs example.com.
-               // We will only change the url to an ip address if there is no existing setting
-
-               if (empty($url) || (!Util\Strings::compareLink($url, $this->baseURL->get())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) {
-                       $this->config->set('system', 'url', $this->baseURL->get());
-               }
-       }
-
        /**
         * Frontend App script
         *
@@ -576,11 +555,12 @@ class App
         * @param ModuleHTTPException         $httpException The possible HTTP Exception container
         * @param HTTPInputData               $httpInput  A library for processing PHP input streams
         * @param float                       $start_time The start time of the overall script execution
+        * @param array                       $server     The $_SERVER array
         *
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time)
+       public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time, array $server)
        {
                $this->profiler->set($start_time, 'start');
                $this->profiler->set(microtime(true), 'classinit');
@@ -596,10 +576,12 @@ class App
 
                        if (!$this->mode->isInstall()) {
                                // Force SSL redirection
-                               if ($this->baseURL->checkRedirectHttps()) {
-                                       System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString());
+                               if ($this->config->get('system', 'force_ssl') &&
+                                       (empty($server['HTTPS']) || $server['HTTPS'] === 'off') &&
+                                       !empty($server['REQUEST_METHOD']) &&
+                                       $server['REQUEST_METHOD'] === 'GET') {
+                                       System::externalRedirect($this->baseURL . '/' . $this->args->getQueryString());
                                }
-
                                Core\Hook::callAll('init_1');
                        }
 
@@ -659,7 +641,6 @@ class App
                        if ($this->mode->isInstall() && $moduleName !== 'install') {
                                $this->baseURL->redirect('install');
                        } else {
-                               $this->checkURL();
                                Core\Update::check($this->getBasePath(), false);
                                Core\Addon::loadAddons();
                                Core\Hook::loadHooks();