Remove deprecated, impossible code for discarding with FID

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index c9aafe14eb25228f88a19cb733f0cd8244f485f2..5c85c9f26d46ad29a7260c44d117bee4676750fd 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
+use Friendica\Factory\ConfigFactory;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
@@ -39,6 +40,7 @@ use Friendica\Model\Profile;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
@@ -56,8 +58,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       public $user;
-
        // Allow themes to control internal parameters
        // by changing App values in theme.php
        private $theme_info = [
@@ -66,6 +66,8 @@ class App
                'events_in_profile' => true
        ];
 
+       private $user_id       = 0;
+       private $nickname      = '';
        private $timezone      = '';
        private $profile_owner = 0;
        private $contact_id    = 0;
@@ -126,6 +128,51 @@ class App
         */
        private $pConfig;
 
+       /**
+        * Set the user ID
+        *
+        * @param int $user_id
+        * @return void
+        */
+       public function setLoggedInUserId(int $user_id)
+       {
+               $this->user_id = $user_id;
+       }
+
+       /**
+        * Set the nickname
+        *
+        * @param int $user_id
+        * @return void
+        */
+       public function setLoggedInUserNickname(string $nickname)
+       {
+               $this->nickname = $nickname;
+       }
+
+       public function isLoggedIn()
+       {
+               return local_user() && $this->user_id && ($this->user_id == local_user());
+       }
+
+       /**
+        * Fetch the user id
+        * @return int 
+        */
+       public function getLoggedInUserId()
+       {
+               return $this->user_id;
+       }
+
+       /**
+        * Fetch the user nick name
+        * @return string
+        */
+       public function getLoggedInUserNickname()
+       {
+               return $this->nickname;
+       }
+
        /**
         * Set the profile owner ID
         *
@@ -171,12 +218,13 @@ class App
        /**
         * Set the timezone
         *
-        * @param int $timezone
+        * @param string $timezone A valid time zone identifier, see https://www.php.net/manual/en/timezones.php
         * @return void
         */
        public function setTimeZone(string $timezone)
        {
-               $this->timezone = $timezone;
+               $this->timezone = (new \DateTimeZone($timezone))->getName();
+               DateTimeFormat::setLocalTimeZone($this->timezone);
        }
 
        /**
@@ -292,6 +340,9 @@ class App
        {
                set_time_limit(0);
 
+               // Ensure that all "strtotime" operations do run timezone independent
+               date_default_timezone_set('UTC');
+
                // This has to be quite large to deal with embedded private photos
                ini_set('pcre.backtrack_limit', 500000);
 
@@ -307,7 +358,7 @@ class App
                        $this->profiler->update($this->config);
 
                        Core\Hook::loadHooks();
-                       $loader = new ConfigFileLoader($this->getBasePath());
+                       $loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
                }
 
@@ -326,15 +377,13 @@ class App
        private function loadDefaultTimezone()
        {
                if ($this->config->get('system', 'default_timezone')) {
-                       $this->timezone = $this->config->get('system', 'default_timezone');
+                       $timezone = $this->config->get('system', 'default_timezone', 'UTC');
                } else {
                        global $default_timezone;
-                       $this->timezone = !empty($default_timezone) ? $default_timezone : 'UTC';
+                       $timezone = $default_timezone ?? '' ?: 'UTC';
                }
 
-               if ($this->timezone) {
-                       date_default_timezone_set($this->timezone);
-               }
+               $this->setTimeZone($timezone);
        }
 
        /**