Fix alarms: don't display alarms before they're scheduled

This commit is contained in:
Thomas Bruederli 2014-05-20 12:05:52 +02:00
parent 3a2d5eed5a
commit 69d9d3b27f

View file

@ -844,7 +844,7 @@ class kolab_driver extends calendar_driver
foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) { foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) {
// add to list if alarm is set // add to list if alarm is set
$alarm = libcalendaring::get_next_alarm($e); $alarm = libcalendaring::get_next_alarm($e);
if ($alarm && $alarm['time'] && $alarm['time'] <= $time && in_array($alarm['action'], $this->alarm_types)) { if ($alarm && $alarm['time'] && $alarm['time'] >= $last && in_array($alarm['action'], $this->alarm_types)) {
$id = $alarm['id']; // use alarm-id as primary identifier $id = $alarm['id']; // use alarm-id as primary identifier
$candidates[$id] = array( $candidates[$id] = array(
'id' => $id, 'id' => $id,