Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kolab_date_recurrence improvements with some tests

Browse source
This commit is contained in:
Aleksander Machniak 2019-03-15 11:16:51 +00:00
parent a71caa9a51
commit aef7452bd3
2 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
plugins/libkolab/lib/kolab_date_recurrence.php
View file

@ -32,8 +32,7 @@ class kolab_date_recurrence
private /* DateTime */ $next; private /* DateTime */ $next;
private /* cDateTime */ $cnext; private /* cDateTime */ $cnext;
private /* DateInterval */ $duration; private /* DateInterval */ $duration;
private /* string */ $start_time; private /* bool */ $allday;
private /* string */ $end_time;
/** /**
@ -48,15 +47,9 @@ class kolab_date_recurrence
$this->object = $object; $this->object = $object;
$this->engine = $object->to_libcal(); $this->engine = $object->to_libcal();
$this->start = $this->next = $data['start']; $this->start = $this->next = $data['start'];
$this->allday = !empty($data['allday']);
$this->cnext = kolab_format::get_datetime($this->next); $this->cnext = kolab_format::get_datetime($this->next);
if ($this->start && !empty($data['allday'])) {
$this->start_time = $data['start']->format('H:i:s');
if ($data['end']) {
$this->end_time = $data['end']->format('H:i:s');
}
}
if (is_object($data['start']) && is_object($data['end'])) { if (is_object($data['start']) && is_object($data['end'])) {
$this->duration = $data['start']->diff($data['end']); $this->duration = $data['start']->diff($data['end']);
} }
@ -71,6 +64,7 @@ class kolab_date_recurrence
* Get date/time of the next occurence of this event * Get date/time of the next occurence of this event
* *
* @param boolean Return a Unix timestamp instead of a DateTime object * @param boolean Return a Unix timestamp instead of a DateTime object
*
* @return mixed DateTime object/unix timestamp or False if recurrence ended * @return mixed DateTime object/unix timestamp or False if recurrence ended
*/ */
public function next_start($timestamp = false) public function next_start($timestamp = false)
@ -79,9 +73,16 @@ class kolab_date_recurrence
if ($this->engine && $this->next) { if ($this->engine && $this->next) {
if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) { if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
$next = kolab_format::php_datetime($cnext); $next = kolab_format::php_datetime($cnext, $this->start->getTimezone());
$time = $timestamp ? $next->format('U') : $next; $time = $timestamp ? $next->format('U') : $next;
if ($this->allday) {
// it looks that for allday events the occurrence time
// is reset to 00:00:00, this is causing various issues
$next->setTime($this->start->format('G'), $this->start->format('i'), $this->start->format('s'));
$next->_dateonly = true;
}
$this->cnext = $cnext; $this->cnext = $cnext;
$this->next = $next; $this->next = $next;
} }
@ -101,25 +102,10 @@ class kolab_date_recurrence
$next_end = clone $next_start; $next_end = clone $next_start;
$next_end->add($this->duration); $next_end->add($this->duration);
$next = $this->object->to_array(); $next = $this->object->to_array();
// it looks that for allday events the occurrence time
// is reset to 00:00:00, this is causing various issues
if (!empty($next['allday'])) {
if ($this->start_time) {
$time = explode(':', $this->start_time);
$next_start->setTime((int)$time[0], (int)$time[1], (int)$time[2]);
}
if ($this->start_end) {
$time = explode(':', $this->start_end);
$next_end->setTime((int)$time[0], (int)$time[1], (int)$time[2]);
}
}
$next['start'] = $next_start;
$next['end'] = $next_end;
$recurrence_id_format = libkolab::recurrence_id_format($next); $recurrence_id_format = libkolab::recurrence_id_format($next);
$next['start'] = $next_start;
$next['end'] = $next_end;
$next['recurrence_date'] = clone $next_start; $next['recurrence_date'] = clone $next_start;
$next['_instance'] = $next_start->format($recurrence_id_format); $next['_instance'] = $next_start->format($recurrence_id_format);
@ -227,10 +213,6 @@ class kolab_date_recurrence
while ($next = $recurrence->next_start()) { while ($next = $recurrence->next_start()) {
$start = $next; $start = $next;
if ($next->format('Y-m-d') >= $orig_date) { if ($next->format('Y-m-d') >= $orig_date) {
if ($event['allday']) {
$next->setTime($orig_start->format('G'), $orig_start->format('i'), $orig_start->format('s'));
}
$found = true; $found = true;
break; break;
} }
@ -247,7 +229,7 @@ class kolab_date_recurrence
return null; return null;
} }
if ($event['allday']) { if ($this->allday) {
$start->_dateonly = true; $start->_dateonly = true;
} }

26
plugins/libkolab/tests/kolab_date_recurrence.php
View file

@ -230,5 +230,29 @@ class kolab_date_recurrence_test extends PHPUnit_Framework_TestCase
$this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : ''); $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
} }
}
/**
* kolab_date_recurrence::next_instance()
*/
function test_next_instance()
{
date_default_timezone_set('America/New_York');
$start = new DateTime('2017-08-31 11:00:00', new DateTimeZone('Europe/Berlin'));
$event = array(
'start' => $start,
'recurrence' => array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
'allday' => true,
);
$object = kolab_format::factory('event', 3.0);
$object->set($event);
$recurrence = new kolab_date_recurrence($object);
$next = $recurrence->next_instance();
$this->assertEquals($start->format('2017-09-07 H:i:s'), $next['start']->format('Y-m-d H:i:s'), 'Same time');
$this->assertEquals($start->getTimezone()->getName(), $next['start']->getTimezone()->getName(), 'Same timezone');
$this->assertSame($next['start']->_dateonly, true, '_dateonly flag');
}
}