X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Faddressbook%2Fdelete.inc;h=eae4de79766e228da78c80e18b9a5bbda00e1f9b;hb=a2dd2e41259a5e90016efcd7d083020b95e25527;hp=d429dbad6a59089a4595826daee46115441a89b1;hpb=48e8459231a1efa3e97284d07a328776a5b7485b;p=roundcube.git

diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index d429dba..eae4de7 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/delete.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,37 +15,149 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: delete.inc 1361 2008-05-07 22:16:00Z richs $
+ $Id: delete.inc 4951 2011-07-21 11:15:18Z alec $
 
 */
 
-if (($cid = get_input_value('_cid', RCUBE_INPUT_POST)) &&
-    (preg_match('/^[0-9]+(,[0-9]+)*$/', $cid) ||
-     preg_match('/^[a-zA-Z0-9=]+(,[a-zA-Z0-9=]+)*$/', $cid))
-   )
-  {
-  $deleted = $CONTACTS->delete($cid);
-  if (!$deleted)
-    {
-    // send error message
-    exit;
+// process ajax requests only
+if (!$OUTPUT->ajax_call)
+    return;
+
+$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;
+    }
+
+    $plugin = $RCMAIL->plugins->exec_hook('contact_delete', array(
+        'id' => $cid, 'source' => $source));
+
+    $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result'];
+
+    if (!$deleted) {
+        $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'contactdelerror', 'error');
+        $OUTPUT->command('list_contacts');
+        $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 (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
+    $search  = (array)$_SESSION['search'][$search_request];
+    $records = array();
+
+    // Get records from all sources (refresh search)
+    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;
+
+    // create resultset object
+    $count  = count($records);
+    $first  = ($page-1) * $CONFIG['pagesize'];
+    $result = new rcube_result_set($count, $first);
+
+    // get records from the next page to add to the list
+    $pages = ceil((count($records) + $delcnt) / $CONFIG['pagesize']);
+    if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
+        // sort the records
+        ksort($records, SORT_LOCALE_STRING);
+
+        $first += $CONFIG['pagesize'];
+        // create resultset object
+        $res = new rcube_result_set($count, $first - $delcnt);
+
+        if ($CONFIG['pagesize'] < $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) / $CONFIG['pagesize']);
+    if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
+        $CONTACTS->set_page($page);
+        $records = $CONTACTS->list_records(null, -$delcnt);
     }
+}
 
-  // count contacts for this user
-  $result = $CONTACTS->count();
+// update message count display
+$OUTPUT->set_env('pagecount', ceil($result->count / $CONFIG['pagesize']));
+$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
 
-  // update message count display
-  $OUTPUT->set_env('pagecount', ceil($result->count / $CONTACTS->page_size));
-  $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result->count));
+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'));
 
-  // 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));
+    $OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time);
+}
+else {
+    $OUTPUT->show_message('contactdeleted', 'confirmation');
+}
 
-  // send response
-  $OUTPUT->send();
-  }
+// add new rows from next page (if any)
+if (!empty($records)) {
+    rcmail_js_contacts_list($records);
+}
 
-exit;
-?>
+// send response
+$OUTPUT->send();