Branch 'roundcube-0.7' - 2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |    9 ++++++---
 plugins/calendar/lib/calendar_itip.php          |    7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 30c1bff8f058ae7fd84b2b75e8ecf121a30a1e64
Author: Thomas B <roundcube at gmail.com>
Date:   Tue Apr 24 10:18:48 2012 +0200

    Don't use REPLACE which is mysql only (#650)

diff --git a/plugins/calendar/lib/calendar_itip.php b/plugins/calendar/lib/calendar_itip.php
index 97865a6..76c4fb4 100644
--- a/plugins/calendar/lib/calendar_itip.php
+++ b/plugins/calendar/lib/calendar_itip.php
@@ -243,9 +243,12 @@ class calendar_itip
     // already stored this
     if ($stored[$base])
       return $token;
-    
+
+    // delete old entry
+    $this->rc->db->query("DELETE FROM itipinvitations WHERE token=?", $base);
+
     $query = $this->rc->db->query(
-      "REPLACE INTO itipinvitations
+      "INSERT INTO itipinvitations
        (token, event_uid, user_id, event, expires)
        VALUES(?, ?, ?, ?, ?)",
       $base,


commit a5c25804317e0241c1fbe52b17c13bb5f6a587a3
Author: Thomas B <roundcube at gmail.com>
Date:   Tue Apr 24 10:14:01 2012 +0200

    Don't use REPLACE INTO which is mysql only (#650)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 1978079..320a932 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -832,15 +832,18 @@ class kolab_driver extends calendar_driver
    */
   public function dismiss_alarm($event_id, $snooze = 0)
   {
+    // delete old alarm entry
+    $this->rc->db->query("DELETE FROM kolab_alarms WHERE event_id=?", $event_id);
+
     // set new notifyat time or unset if not snoozed
     $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
-    
+
     $query = $this->rc->db->query(
-      "REPLACE INTO kolab_alarms
+      "INSERT INTO kolab_alarms
        (event_id, dismissed, notifyat)
        VALUES(?, ?, ?)",
       $event_id,
-      $snooze > 0 ? 0 : 1, 
+      $snooze > 0 ? 0 : 1,
       $notifyat
     );