makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5916 from rxu/ticket/13426

Browse source 
[ticket/13426] Improve user timezone initialization
This commit is contained in:
Marc Alexander 2020-04-16 22:08:54 +02:00
commit 46cee69804
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
phpBB/phpbb/user.php
View file

@ -227,15 +227,7 @@ class user extends \phpbb\session
$this->language->set_user_language($user_lang_name); $this->language->set_user_language($user_lang_name);
try $this->create_timezone($user_timezone);
{
$this->timezone = new \DateTimeZone($user_timezone);
}
catch (\Exception $e)
{
// If the timezone the user has selected is invalid, we fall back to UTC.
$this->timezone = new \DateTimeZone('UTC');
}
$this->add_lang($lang_set); $this->add_lang($lang_set);
unset($lang_set); unset($lang_set);
@ -635,7 +627,7 @@ class user extends \phpbb\session
if (!$format_date_override) if (!$format_date_override)
{ {
$time = new $this->datetime($this, '@' . (int) $gmepoch, $utc); $time = new $this->datetime($this, '@' . (int) $gmepoch, $utc);
$time->setTimezone($this->timezone); $time->setTimezone($this->create_timezone());
return $time->format($format, $forcedate); return $time->format($format, $forcedate);
} }
@ -645,6 +637,36 @@ class user extends \phpbb\session
} }
} }
/**
* Create a DateTimeZone object in the context of the current user
*
* @param string $user_timezone Time zone of the current user.
* @return DateTimeZone DateTimeZone object linked to the current users locale
*/
public function create_timezone($user_timezone = null)
{
if (!$this->timezone)
{
if (!$user_timezone)
{
global $config;
$user_timezone = ($this->data['user_id'] != ANONYMOUS) ? $this->data['user_timezone'] : $config['board_timezone'];
}
try
{
$this->timezone = new \DateTimeZone($user_timezone);
}
catch (\Exception $e)
{
// If the timezone the user has selected is invalid, we fall back to UTC.
$this->timezone = new \DateTimeZone('UTC');
}
}
return $this->timezone;
}
/** /**
* Create a \phpbb\datetime object in the context of the current user * Create a \phpbb\datetime object in the context of the current user
* *
@ -655,7 +677,7 @@ class user extends \phpbb\session
*/ */
public function create_datetime($time = 'now', \DateTimeZone $timezone = null) public function create_datetime($time = 'now', \DateTimeZone $timezone = null)
{ {
$timezone = $timezone ?: $this->timezone; $timezone = $timezone ?: $this->create_timezone();
return new $this->datetime($this, $time, $timezone); return new $this->datetime($this, $time, $timezone);
} }
@ -669,7 +691,7 @@ class user extends \phpbb\session
*/ */
public function get_timestamp_from_format($format, $time, \DateTimeZone $timezone = null) public function get_timestamp_from_format($format, $time, \DateTimeZone $timezone = null)
{ {
$timezone = $timezone ?: $this->timezone; $timezone = $timezone ?: $this->create_timezone();
$date = \DateTime::createFromFormat($format, $time, $timezone); $date = \DateTime::createFromFormat($format, $time, $timezone);
return ($date !== false) ? $date->format('U') : false; return ($date !== false) ? $date->format('U') : false;
} }