From 1883f8edbd391c64c4d2c33d3aba4ad0592b6bc1 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Mon, 30 May 2011 23:04:21 +0200
Subject: [PATCH] Don't show alarms of past events

---
 plugins/calendar/drivers/database/database_driver.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 565bfc8d..45623aa0 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -522,8 +522,9 @@ class database_driver extends calendar_driver
       $result = $this->rc->db->query(sprintf(
         "SELECT * FROM " . $this->db_events . "
          WHERE calendar_id IN (%s)
-         AND notifyat <= %s",
+         AND notifyat <= %s AND end <= %s",
          join(',', $calendar_ids),
+         $this->rc->db->fromunixtime($time),
          $this->rc->db->fromunixtime($time)
        ));