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

Move timezone logic out of server.php

This commit is contained in:
Joas Schilling 2014-12-16 15:34:55 +01:00
parent 5b9c453071
commit 26100a6dfb
4 changed files with 104 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/private/datetimezone.php Normal file
View File

@ -0,0 +1,62 @@
<?php
/**
* ownCloud
*
* @author Joas Schilling
* @copyright 2014 Joas Schilling nickvergessen@owncloud.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC;
use OCP\IConfig;
use OCP\IDateTimeZone;
use OCP\ISession;
class DateTimeZone implements IDateTimeZone {
/** @var IConfig */
protected $config;
/** @var ISession */
protected $session;
/**
* Constructor
*
* @param IConfig $config
* @param ISession $session
*/
public function __construct(IConfig $config, ISession $session) {
$this->config = $config;
$this->session = $session;
}
/**
* Get the timezone of the current user, based on his session information and config data
*
* @return \DateTimeZone
*/
public function getTimeZone() {
$timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
if ($timeZone === null) {
if ($this->session->exists('timezone')) {
$offsetHours = $this->session->get('timezone');
// Note: the timeZone name is the inverse to the offset,
// so a positive offset means negative timeZone
// and the other way around.
if ($offsetHours > 0) {
return new \DateTimeZone('Etc/GMT-' . $offsetHours);
} else {
return new \DateTimeZone('Etc/GMT+' . abs($offsetHours));
}
} else {
return new \DateTimeZone('UTC');
}
}
return new \DateTimeZone($timeZone);
}
}

43
lib/private/server.php
View File

@ -274,11 +274,19 @@ class Server extends SimpleContainer implements IServerContainer {
$groupManager = $c->getGroupManager();
return new \OC\App\AppManager($userSession, $appConfig, $groupManager);
});
$this->registerService('DateTimeZone', function(Server $c) {
return new DateTimeZone(
$c->getConfig(),
$c->getSession()
);
});
$this->registerService('DateTimeFormatter', function(Server $c) {
$timeZone = $c->getTimeZone();
$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
return new \OC\DateTimeFormatter($timeZone, $c->getL10N('lib', $language));
return new DateTimeFormatter(
$c->getDateTimeZone()->getTimeZone(),
$c->getL10N('lib', $language)
);
});
$this->registerService('MountConfigManager', function () {
$loader = \OC\Files\Filesystem::getLoader();
@ -696,28 +704,17 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
* Get the timezone of the current user, based on his session information and config data
*
* @return \DateTimeZone
* @return \OCP\IDateTimeZone
*/
public function getTimeZone() {
$timeZone = $this->getConfig()->getUserValue($this->getSession()->get('user_id'), 'core', 'timezone', null);
if ($timeZone === null) {
if ($this->getSession()->exists('timezone')) {
$offsetHours = $this->getSession()->get('timezone');
// Note: the timeZone name is the inverse to the offset,
// so a positive offset means negative timeZone
// and the other way around.
if ($offsetHours > 0) {
return new \DateTimeZone('Etc/GMT-' . $offsetHours);
} else {
return new \DateTimeZone('Etc/GMT+' . abs($offsetHours));
}
} else {
return new \DateTimeZone('UTC');
}
}
return new \DateTimeZone($timeZone);
public function getDateTimeZone() {
return $this->query('DateTimeZone');
}
/**
* @return \OCP\IDateTimeFormatter
*/
public function getDateTimeFormatter() {
return $this->query('DateTimeFormatter');
}
/**

21
lib/public/idatetimezone.php Normal file
View File

@ -0,0 +1,21 @@
<?php
/**
* ownCloud
*
* @author Joas Schilling
* @copyright 2014 Joas Schilling nickvergessen@owncloud.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OCP;
interface IDateTimeZone {
/**
* @return \DateTimeZone
*/
public function getTimeZone();
}

2
tests/lib/util.php
View File

@ -57,7 +57,7 @@ class Test_Util extends \Test\TestCase {
$oldDateTimeFormatter = \OC::$server->query('DateTimeFormatter');
\OC::$server->getSession()->set('timezone', 3);
$newDateTimeFormatter = new \OC\DateTimeFormatter(\OC::$server->getTimeZone(), new \OC_L10N('lib', 'en'));
$newDateTimeFormatter = new \OC\DateTimeFormatter(\OC::$server->getDateTimeZone()->getTimeZone(), new \OC_L10N('lib', 'en'));
$this->setDateFormatter($newDateTimeFormatter);
$result = OC_Util::formatDate(1350129205, false);