From 6973bbcaee2d9591aa3a7864aae61948ee8876f2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 10 May 2012 21:24:48 +0200
Subject: [PATCH] Implement undelete with new storage backend; remove cruft

---
 plugins/calendar/drivers/kolab/kolab_calendar.php | 12 +++++++++++-
 plugins/calendar/drivers/kolab/kolab_driver.php   |  4 ----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 53a8d83f..6104972c 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -352,7 +352,17 @@ class kolab_calendar
    */
   public function restore_event($event)
   {
-    // TODO: re-implement this with new kolab_storege backend
+    if ($this->storage->undelete($event['id'])) {
+        return true;
+    }
+    else {
+        raise_error(array(
+          'code' => 600, 'type' => 'php',
+          'file' => __FILE__, 'line' => __LINE__,
+          'message' => "Error undeleting a contact object $uid from the Kolab server"),
+        true, false);
+    }
+
     return false;
   }
 
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index aea6783c..6ce7a845 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -401,7 +401,6 @@ class kolab_driver extends calendar_driver
         }
       }
 
-      $GLOBALS['conf']['kolab']['no_triggering'] = true;
       $success = $storage->insert_event($event);
       
       if ($success)
@@ -472,7 +471,6 @@ class kolab_driver extends calendar_driver
       $master = $event;
 
       $this->rc->session->remove('calendar_restore_event_data');
-      $GLOBALS['conf']['kolab']['no_triggering'] = true;
 
       // read master if deleting a recurring event
       if ($event['recurrence'] || $event['recurrence_id']) {
@@ -614,8 +612,6 @@ class kolab_driver extends calendar_driver
     if ($old['recurrence']['EXDATE'])
       $event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];
 
-    $GLOBALS['conf']['kolab']['no_triggering'] = true;
-
     switch ($savemode) {
       case 'new':
         // save submitted data as new (non-recurring) event