plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69d9d3b27f6cb0ef5d1e6a89a588af37ffb0bd7d
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue May 20 12:05:52 2014 +0200

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

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 28eb8ba..a9ea3ee 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -844,7 +844,7 @@ class kolab_driver extends calendar_driver
       foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) {
         // add to list if alarm is set
         $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
           $candidates[$id] = array(
             'id'       => $id,