mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When guessing the timezone, the offset might only be valid on a given timestamp

This commit is contained in:
Joas Schilling 2015-04-07 10:13:06 +02:00
parent e16d61e293
commit 3bde7c2f67
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/datetimezone.php
View File

@ -48,13 +48,14 @@ class DateTimeZone implements IDateTimeZone {
/** /**
* Get the timezone of the current user, based on his session information and config data * Get the timezone of the current user, based on his session information and config data
* *
* @param bool|int $timestamp
* @return \DateTimeZone * @return \DateTimeZone
*/ */
public function getTimeZone() { public function getTimeZone($timestamp = false) {
$timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null); $timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
if ($timeZone === null) { if ($timeZone === null) {
if ($this->session->exists('timezone')) { if ($this->session->exists('timezone')) {
return $this->guessTimeZoneFromOffset($this->session->get('timezone')); return $this->guessTimeZoneFromOffset($this->session->get('timezone'), $timestamp);
} }
$timeZone = $this->getDefaultTimeZone(); $timeZone = $this->getDefaultTimeZone();
} }
@ -74,9 +75,10 @@ class DateTimeZone implements IDateTimeZone {
* we try to find it manually, before falling back to UTC. * we try to find it manually, before falling back to UTC.
* *
* @param mixed $offset * @param mixed $offset
* @param bool|int $timestamp
* @return \DateTimeZone * @return \DateTimeZone
*/ */
protected function guessTimeZoneFromOffset($offset) { protected function guessTimeZoneFromOffset($offset, $timestamp) {
try { try {
// Note: the timeZone name is the inverse to the offset, // Note: the timeZone name is the inverse to the offset,
// so a positive offset means negative timeZone // so a positive offset means negative timeZone
@ -93,7 +95,13 @@ class DateTimeZone implements IDateTimeZone {
// we try to guess one timezone that has the same offset // we try to guess one timezone that has the same offset
foreach (\DateTimeZone::listIdentifiers() as $timeZone) { foreach (\DateTimeZone::listIdentifiers() as $timeZone) {
$dtz = new \DateTimeZone($timeZone); $dtz = new \DateTimeZone($timeZone);
$dtOffset = $dtz->getOffset(new \DateTime()); $dateTime = new \DateTime();
if ($timestamp !== false) {
$dateTime->setTimestamp($timestamp);
}
$dtOffset = $dtz->getOffset($dateTime);
if ($dtOffset == 3600 * $offset) { if ($dtOffset == 3600 * $offset) {
return $dtz; return $dtz;
} }

3
lib/public/idatetimezone.php
View File

@ -25,7 +25,8 @@ namespace OCP;
interface IDateTimeZone { interface IDateTimeZone {
/** /**
* @param bool|int $timestamp
* @return \DateTimeZone * @return \DateTimeZone
*/ */
public function getTimeZone(); public function getTimeZone($timestamp = false);
} }