From 7f5a849e7816e7b4c7b13a72d38a9c777632d7cd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 07 Jul 2011 07:44:26 -0400
Subject: [PATCH] - Added possibility to undo last contact delete operation
---
program/steps/addressbook/delete.inc | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index af9bdb1..f11752b 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -26,6 +26,9 @@
$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 @@
if (count($cids) == 1) {
$OUTPUT->show_message('contactdelerror', 'error');
$OUTPUT->command('list_contacts');
+ $OUTPUT->send();
}
continue;
}
@@ -52,10 +56,13 @@
}
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;
@@ -135,6 +142,17 @@
$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);
--
Gitblit v1.9.1