X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=5c85c9f26d46ad29a7260c44d117bee4676750fd;hb=3153e098b0e83910a550773f5661d4e8541b14b7;hp=d779a48d6ebf668ba82b6886403e8bd108fc42c3;hpb=9f01052dd252828df1e033684acb8ed72ef58ae9;p=friendica.git

diff --git a/src/App.php b/src/App.php
index d779a48d6e..5c85c9f26d 100644
--- 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;
@@ -132,7 +134,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setUserId(int $user_id)
+	public function setLoggedInUserId(int $user_id)
 	{
 		$this->user_id = $user_id;
 	}
@@ -143,7 +145,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setNickname(string $nickname)
+	public function setLoggedInUserNickname(string $nickname)
 	{
 		$this->nickname = $nickname;
 	}
@@ -157,7 +159,7 @@ class App
 	 * Fetch the user id
 	 * @return int 
 	 */
-	public function getUserId()
+	public function getLoggedInUserId()
 	{
 		return $this->user_id;
 	}
@@ -166,7 +168,7 @@ class App
 	 * Fetch the user nick name
 	 * @return string
 	 */
-	public function getNickname()
+	public function getLoggedInUserNickname()
 	{
 		return $this->nickname;
 	}
@@ -216,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);
 	}
 
 	/**
@@ -337,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);
 
@@ -352,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);
 		}
 
@@ -371,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);
 	}
 
 	/**