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

Avoid fatal errors when setting recurrence until date for tasks (#4852)

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-16 14:41:50 +01:00
parent 96442eae9d
commit c51c60eff8
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/libkolab/lib/kolab_format_task.php
View file

@ -116,6 +116,20 @@ class kolab_format_task extends kolab_format_xcal
return $this->data;
}
/**
* Return the reference date for recurrence and alarms
*
* @return mixed DateTime instance of null if no refdate is available
*/
public function get_reference_date()
{
if ($this->data['due'] && $this->data['due'] instanceof DateTime) {
return $this->data['due'];
}
return self::php_datetime($this->obj->due()) ?: parent::get_reference_date();
}
/**
* Callback for kolab_storage_cache to get object specific tags to cache
*

19
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -184,7 +184,10 @@ abstract class kolab_format_xcal extends kolab_format
$object['recurrence']['COUNT'] = $count;
}
else if ($until = self::php_datetime($rr->end())) {
$until->setTime($object['start']->format('G'), $object['start']->format('i'), 0);
$refdate = $this->get_reference_date();
if ($refdate && $refdate instanceof DateTime && !$refdate->_dateonly) {
$until->setTime($refdate->format('G'), $refdate->format('i'), 0);
}
$object['recurrence']['UNTIL'] = $until;
}
@ -567,6 +570,20 @@ abstract class kolab_format_xcal extends kolab_format
$this->set_attachments($object);
}
/**
* Return the reference date for recurrence and alarms
*
* @return mixed DateTime instance of null if no refdate is available
*/
public function get_reference_date()
{
if ($this->data['start'] && $this->data['start'] instanceof DateTime) {
return $this->data['start'];
}
return self::php_datetime($this->obj->start());
}
/**
* Callback for kolab_storage_cache to get words to index for fulltext search
*