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

diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index b7edeb4..2d50391 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,8 +3,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/mark.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:                                                              |
@@ -14,10 +14,14 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: mark.inc 1962 2008-10-09 06:25:43Z alec $
+ $Id: mark.inc 5266 2011-09-22 07:49:33Z alec $
 
 */
 
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+  return;
+
 $a_flags_map = array(
   'undelete' => 'UNDELETED',
   'delete' => 'DELETED',
@@ -29,25 +33,97 @@ $a_flags_map = array(
 if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_value('_flag', RCUBE_INPUT_POST)))
 {
   $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
+
+  if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
+    // count messages before changing anything
+    $old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
+    $old_pages = ceil($old_count / $IMAP->page_size);
+    $count = sizeof(explode(',', $uids));
+  }
+
   $marked = $IMAP->set_flag($uids, $flag);
 
-  if($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid']))
-    {
-    $uids = get_input_value('_ruid', RCUBE_INPUT_POST);
-    $read = $IMAP->set_flag($uids, 'SEEN');
-    
-    if ($read != -1)
-      $OUTPUT->command('flag_deleted_as_read', $uids);
-    }
+  if (!$marked) {
+    // send error message
+    if ($_POST['_from'] != 'show')
+      $OUTPUT->command('list_mailbox');
+    rcmail_display_server_error('errormarking');
+    $OUTPUT->send();
+    exit;
+  }
+  else if (empty($_POST['_quiet'])) {
+    $OUTPUT->show_message('messagemarked', 'confirmation');
+  }
+
+  if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
+    $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
+    $read = $IMAP->set_flag($ruids, 'SEEN');
+
+    if ($read && !$CONFIG['skip_deleted'])
+      $OUTPUT->command('flag_deleted_as_read', $ruids);
+  }
 
-  if ($marked != -1 && ($flag == 'SEEN' || $flag == 'UNSEEN'))
-  {
-    $mbox_name = $IMAP->get_mailbox_name();
-    $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
+  if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
+    rcmail_send_unread_count($IMAP->get_mailbox_name());
+  }
+  else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
+    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 {
+      // refresh saved search set after moving some messages
+      if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
+        $_SESSION['search'] = $IMAP->refresh_search();
+      }
+
+      $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('messagecount', $msg_count);
+      $OUTPUT->set_env('current_page', $IMAP->list_page);
+      $OUTPUT->set_env('pagecount', $pages);
+
+      // update mailboxlist
+      $mbox = $IMAP->get_mailbox_name();
+      $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0;
+      $old_unseen = rcmail_get_unseen_count($mbox);
+
+      if ($old_unseen != $unseen_count) {
+        $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
+        rcmail_set_unseen_count($mbox, $unseen_count);
+      }
+      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
+
+      if ($IMAP->threading)
+	    $count = get_input_value('_count', RCUBE_INPUT_POST);
+
+      // add new rows from next page (if any)
+      if ($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,
+	    $jump_back ? NULL : $count);
+
+        rcmail_js_message_list($a_headers, false);
+      }
+    }
   }
 
   $OUTPUT->send();
 }
-  
+
 exit;
-?>
\ No newline at end of file
+