X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fmove_del.inc;h=30928d499aa0d0f3e8ebd09b7ec1852a5af6d920;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=013acbd0e0619c3f6730751851a1406cd0b6f8c0;hpb=3adad46e27086084a8b28a32fc4fbc953dbfef6c;p=roundcube.git

diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 013acbd..30928d4 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/move_del.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,101 +15,130 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: move_del.inc 2018 2008-10-27 10:53:56Z alec $
+ $Id: move_del.inc 5266 2011-09-22 07:49:33Z alec $
 
 */
 
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+  return;
+
 // count messages before changing anything
-$old_count = $IMAP->messagecount();
+$old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
 $old_pages = ceil($old_count / $IMAP->page_size);
 
 // move messages
-if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
+if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
     $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
-    $target = get_input_value('_target_mbox', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-
-    // flag messages as read before moving them
-    if ($CONFIG['read_when_deleted'] && $target == $CONFIG['trash_mbox'])
-	$IMAP->set_flag($uids, 'SEEN');
+    $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
 
     $moved = $IMAP->move_message($uids, $target, $mbox);
-  
+
     if (!$moved) {
         // send error message
-        $OUTPUT->command('list_mailbox');
-        $OUTPUT->show_message('errormoving', 'error');
+	    if ($_POST['_from'] != 'show')
+            $OUTPUT->command('list_mailbox');
+        rcmail_display_server_error('errormoving');
         $OUTPUT->send();
         exit;
     }
+    else {
+      $OUTPUT->show_message('messagemoved', 'confirmation');
+    }
 
-    if (!$CONFIG['flag_for_deletion'])
-        $addrows = true;
+    $addrows = true;
 }
 // delete messages 
 else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
     $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+
     $del = $IMAP->delete_message($uids, $mbox);
-  
+
     if (!$del) {
         // send error message
-        $OUTPUT->command('list_mailbox');
-        $OUTPUT->show_message('errordeleting', 'error');
+	    if ($_POST['_from'] != 'show')
+            $OUTPUT->command('list_mailbox');
+        rcmail_display_server_error('errordeleting');
         $OUTPUT->send();
         exit;
     }
-    
+    else {
+      $OUTPUT->show_message('messagedeleted', 'confirmation');
+    }
+
     $addrows = true;
 }
 // unknown action or missing query param
 else {
     exit;
 }
+
 // refresh saved search set after moving some messages
 if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
-    $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+    $_SESSION['search'] = $IMAP->refresh_search();
 }
 
-$msg_count      = $IMAP->messagecount();
-$pages          = ceil($msg_count / $IMAP->page_size);
-$nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
-$remaining      = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
-
-// jump back one page (user removed the whole last page)
-if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) {
+if ($_POST['_from'] == 'show')
+{
+  if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC))
+    $OUTPUT->command('show_message', $next);
+  else
+    $OUTPUT->command('command', 'list');
+}
+else
+{
+  $msg_count      = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
+  $pages          = ceil($msg_count / $IMAP->page_size);
+  $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
+  $remaining      = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
+
+  // jump back one page (user removed the whole last page)
+  if ($IMAP->list_page > 1 && $remaining == 0) {
     $IMAP->set_page($IMAP->list_page-1);
     $_SESSION['page'] = $IMAP->list_page;
     $jump_back = true;
-}
+  }
 
-// update message count display
-$OUTPUT->set_env('pagecount', $pages);
-$OUTPUT->set_env('messagecount', $msg_count);
-$OUTPUT->set_env('current_page', $IMAP->list_page);
-$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
+  // update message count display
+  $OUTPUT->set_env('messagecount', $msg_count);
+  $OUTPUT->set_env('current_page', $IMAP->list_page);
+  $OUTPUT->set_env('pagecount', $pages);
 
-// update mailboxlist
-$mbox = $IMAP->get_mailbox_name();
-$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX'));
+  // update mailboxlist
+  $mbox = $IMAP->get_mailbox_name();
+  $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0;
+  $old_unseen = rcmail_get_unseen_count($mbox);
 
-if ($RCMAIL->action=='moveto' && $target) {
-    $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN'));
-}
+  if ($old_unseen != $unseen_count) {
+    $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
+    rcmail_set_unseen_count($mbox, $unseen_count);
+  }
+
+  if ($RCMAIL->action == 'moveto' && strlen($target)) {
+    rcmail_send_unread_count($target, true);
+  }
+
+  $OUTPUT->command('set_quota', rcmail_quota_content());
+  $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
 
-$OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+  if ($IMAP->threading)
+    $count = get_input_value('_count', RCUBE_INPUT_POST);
 
-// add new rows from next page (if any)
-if ($addrows && $_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) {
+  // add new rows from next page (if any)
+  if ($addrows && $count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
     $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
     $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
-  
-    $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
-    if (!$jump_back) {
-        $a_headers = array_slice($a_headers, -$count, $count);
-    }
-    rcmail_js_message_list($a_headers);
+
+    $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
+      $jump_back ? NULL : $count);
+
+    rcmail_js_message_list($a_headers, false);
+  }
 }
 
 // send response
 $OUTPUT->send();
+
+