3 files changed, 113 insertions, 2 deletions

diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index af9bdb10a..f11752b70 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -26,6 +26,9 @@ if (!$OUTPUT->ajax_call)
 $cids   = rcmail_get_cids();
 $delcnt = 0;
 
+// remove previous deletes
+$RCMAIL->session->remove('contact_undo');
+
 foreach ($cids as $source => $cid)
 {
     $CONTACTS = rcmail_contact_source($source);
@@ -36,6 +39,7 @@ foreach ($cids as $source => $cid)
         if (count($cids) == 1) {
             $OUTPUT->show_message('contactdelerror', 'error');
             $OUTPUT->command('list_contacts');
+            $OUTPUT->send();
         }
         continue;
     }
@@ -52,11 +56,14 @@ foreach ($cids as $source => $cid)
     }
     else {
         $delcnt += $deleted;
+
+        // store deleted contacts IDs in session for undelete
+        if ($CONTACTS->undelete) {
+            $_SESSION['contact_undo']['data'][$source] = $cid;
+        }
     }
 }
 
-$OUTPUT->show_message('contactdeleted', 'confirmation');
-
 $page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;
 
 // update saved search after data changed
@@ -135,6 +142,17 @@ else {
 $OUTPUT->set_env('pagecount', ceil($result->count / $CONFIG['pagesize']));
 $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
 
+if (!empty($_SESSION['contact_undo'])) {
+    $_SESSION['contact_undo']['ts'] = time();
+    $msg = html::span(null, rcube_label(array('name' => 'itemsdeleted', 'vars' => array('num' => $deleted))))
+        . ' ' . html::a(array('onclick' => JS_OBJECT_NAME.".command('undo', '', this)"), rcube_label('undo'));
+
+    $OUTPUT->show_message($msg, 'confirmation', null, true, $RCMAIL->config->get('undo_timeout', 15));
+}
+else {
+    $OUTPUT->show_message('contactdeleted', 'confirmation');
+}
+
 // add new rows from next page (if any)
 if (!empty($records)) {
     rcmail_js_contacts_list($records);
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 4c930c80b..a895b617f 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -88,6 +88,12 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
     $CONTACTS = rcmail_contact_source($source, true);
 }
 
+// remove undo information...
+if ($undo = $_SESSION['contact_undo']) {
+    // ...after 30 seconds
+    if ($undo['ts'] < time() - 30)
+        $RCMAIL->session->remove('contact_undo');
+}
 
 // instantiate a contacts object according to the given source
 function rcmail_contact_source($source=null, $init_env=false)
diff --git a/program/steps/addressbook/undo.inc b/program/steps/addressbook/undo.inc
new file mode 100644
index 000000000..936f11086
--- /dev/null
+++ b/program/steps/addressbook/undo.inc
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/addressbook/undo.inc                                    |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011, Kolab Systems AG                                  |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Undelete contacts (CIDs) from last delete action                    |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+// process ajax requests only
+if (!$OUTPUT->ajax_call)
+    return;
+
+$undo   = $_SESSION['contact_undo'];
+$delcnt = 0;
+
+foreach ((array)$undo['data'] as $source => $cid)
+{
+    $CONTACTS = rcmail_contact_source($source);
+
+    $plugin = $RCMAIL->plugins->exec_hook('contact_undelete', array(
+        'id' => $cid, 'source' => $source));
+
+    $restored = !$plugin['abort'] ? $CONTACTS->undelete($cid) : $plugin['result'];
+
+    if (!$restored) {
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'contactrestoreerror', 'error');
+        $OUTPUT->command('list_contacts');
+        $OUTPUT->send();
+    }
+    else {
+        $delcnt += $restored;
+    }
+}
+
+// update saved search after data changed
+if ($delcnt && ($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
+    $search  = (array)$_SESSION['search'][$search_request];
+
+    foreach ($search as $s => $set) {
+        $source = $RCMAIL->get_address_book($s);
+
+        // reset page
+        $source->set_page(1);
+        $source->set_pagesize(9999);
+        $source->set_search_set($set);
+
+        // get records
+        $result = $source->list_records(array('name', 'email'));
+
+        if (!$result->count) {
+            unset($search[$s]);
+            continue;
+        }
+
+        while ($row = $result->next()) {
+            $row['sourceid'] = $s;
+            $key = $row['name'] . ':' . $row['sourceid'];
+            $records[$key] = $row;
+        }
+        unset($result);
+
+        $search[$s] = $source->get_search_set();
+    }
+
+    $_SESSION['search'][$search_request] = $search;
+}
+
+$RCMAIL->session->remove('contact_undo');
+
+$OUTPUT->show_message('contactrestored', 'confirmation');
+$OUTPUT->command('list_contacts');
+
+// send response
+$OUTPUT->send();