From 39c90d6b616b61a7f7cca56595e6f7f55082b94d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 08 Dec 2013 04:03:00 -0500
Subject: [PATCH] Make sure selected group is listed after delete error (#1489463)
---
program/steps/addressbook/delete.inc | 152 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 30 deletions(-)
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index da83757..e8aafe5 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/addressbook/delete.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Delete the submitted contacts (CIDs) from the users address book |
@@ -14,39 +17,128 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-if ($OUTPUT->ajax_call &&
- ($cid = get_input_value('_cid', RCUBE_INPUT_POST)) &&
- preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)
-) {
- $plugin = $RCMAIL->plugins->exec_hook('delete_contact', array('id' => $cid, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+// process ajax requests only
+if (!$OUTPUT->ajax_call)
+ return;
- $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid) : false;
- if (!$deleted)
- {
- // send error message
- exit;
+$cids = rcmail_get_cids();
+$delcnt = 0;
+
+// remove previous deletes
+$undo_time = $RCMAIL->config->get('undo_timeout', 0);
+$RCMAIL->session->remove('contact_undo');
+
+foreach ($cids as $source => $cid)
+{
+ $CONTACTS = rcmail_contact_source($source);
+
+ if ($CONTACTS->readonly) {
+ // more sources? do nothing, probably we have search results from
+ // more than one source, some of these sources can be readonly
+ if (count($cids) == 1) {
+ $OUTPUT->show_message('contactdelerror', 'error');
+ $OUTPUT->command('list_contacts');
+ $OUTPUT->send();
+ }
+ continue;
}
- // count contacts for this user
- $result = $CONTACTS->count();
+ $plugin = $RCMAIL->plugins->exec_hook('contact_delete', array(
+ 'id' => $cid, 'source' => $source));
- // update message count display
- $OUTPUT->set_env('pagecount', ceil($result->count / $CONTACTS->page_size));
- $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result->count));
+ $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result'];
- // add new rows from next page (if any)
- $pages = ceil(($result->count + $deleted) / $CONTACTS->page_size);
- if ($_GET['_from'] != 'show' && $pages > 1 && $CONTACTS->list_page < $pages)
- rcmail_js_contacts_list($CONTACTS->list_records(null, -$deleted));
+ if (!$deleted) {
+ if ($plugin['message']) {
+ $error = $plugin['message'];
+ }
+ else if (($error = $CONTACTS->get_error()) && $error['message']) {
+ $error = $error['message'];
+ }
+ else {
+ $error = 'contactdelerror';
+ }
- // send response
- $OUTPUT->send();
- }
+ $source = get_input_value('_source', RCUBE_INPUT_GPC);
+ $group = get_input_value('_gid', RCUBE_INPUT_GPC);
-exit;
-?>
+ $OUTPUT->show_message($error, 'error');
+ $OUTPUT->command('list_contacts', $source, $group);
+ $OUTPUT->send();
+ }
+ else {
+ $delcnt += $deleted;
+
+ // store deleted contacts IDs in session for undo action
+ if ($undo_time > 0 && $CONTACTS->undelete) {
+ $_SESSION['contact_undo']['data'][$source] = $cid;
+ }
+ }
+}
+
+$page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;
+
+// update saved search after data changed
+if (($records = rcmail_search_update(true)) !== false) {
+ // create resultset object
+ $count = count($records);
+ $first = ($page-1) * $PAGE_SIZE;
+ $result = new rcube_result_set($count, $first);
+ $pages = ceil((count($records) + $delcnt) / $PAGE_SIZE);
+
+ // get records from the next page to add to the list
+ if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
+ // sort the records
+ ksort($records, SORT_LOCALE_STRING);
+
+ $first += $PAGE_SIZE;
+ // create resultset object
+ $res = new rcube_result_set($count, $first - $delcnt);
+
+ if ($PAGE_SIZE < $count) {
+ $records = array_slice($records, $first - $delcnt, $delcnt);
+ }
+
+ $res->records = array_values($records);
+ $records = $res;
+ }
+ else {
+ unset($records);
+ }
+}
+else {
+ // count contacts for this user
+ $result = $CONTACTS->count();
+
+ // get records from the next page to add to the list
+ $pages = ceil(($result->count + $delcnt) / $PAGE_SIZE);
+ if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
+ $CONTACTS->set_page($page);
+ $records = $CONTACTS->list_records(null, -$delcnt);
+ }
+}
+
+// update message count display
+$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
+$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('contactdeleted'))
+ . ' ' . html::a(array('onclick' => JS_OBJECT_NAME.".command('undo', '', this)"), rcube_label('undo'));
+
+ $OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time);
+}
+else {
+ $OUTPUT->show_message('contactdeleted', 'confirmation');
+}
+
+// add new rows from next page (if any)
+if (!empty($records)) {
+ rcmail_js_contacts_list($records);
+}
+
+// send response
+$OUTPUT->send();
--
Gitblit v1.9.1