extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to leave actual server setting alone, just change the EGw setting

Browse Source
This commit is contained in:
nathangray 2017-10-18 09:51:04 +02:00
parent fe0e980d52
commit e123402bff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/test/TimezoneTest.php
View File

@ -169,6 +169,9 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
// Check original event // Check original event
$this->checkEvent($timezones, $this->cal_id, $times); $this->checkEvent($timezones, $this->cal_id, $times);
// Clean up exception
$this->bo->delete($exception_id);
} }
/** /**
@ -314,7 +317,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
{ {
$event = array( $event = array(
'title' => ($whole_day ? 'Whole day ' : '')."Test for " . $this->tzString($timezones), 'title' => ($whole_day ? 'Whole day ' : '')."Test for " . $this->tzString($timezones),
'des' => ($whole_day ? 'Whole day ' : '').'Test for test ' . $this->getName() . ' ' . $this->tzString($timezones), 'description' => ($whole_day ? 'Whole day ' : '').'Test for test ' . $this->getName() . ' ' . $this->tzString($timezones),
'start' => \mktime($whole_day ? 0 : $times['start'], 0, 0, date('m'), date('d')+1, date('Y')), 'start' => \mktime($whole_day ? 0 : $times['start'], 0, 0, date('m'), date('d')+1, date('Y')),
'end' => $whole_day ? \mktime(23, 59, 59, date('m'), date('d')+1, date('Y')) : \mktime($times['end'], 0, 0, date('m'), date('d')+1, date('Y')), 'end' => $whole_day ? \mktime(23, 59, 59, date('m'), date('d')+1, date('Y')) : \mktime($times['end'], 0, 0, date('m'), date('d')+1, date('Y')),
'tzid' => $timezones['event'], 'tzid' => $timezones['event'],
@ -342,7 +345,6 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
protected function setTimezones($timezones) protected function setTimezones($timezones)
{ {
// Set the client preference & server preference // Set the client preference & server preference
date_default_timezone_set($timezones['server']);
$GLOBALS['egw_info']['server']['server_timezone'] = $timezones['server']; $GLOBALS['egw_info']['server']['server_timezone'] = $timezones['server'];
$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $timezones['client']; $GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $timezones['client'];