Imported Upstream version 0.2~stable

[roundcube.git] / program / steps / mail / move_del.inc

diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 0e4ed17534c7651a92a763541b8eaa2b57d96e84..013acbd0e0619c3f6730751851a1406cd0b6f8c0 100644 (file)
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: move_del.inc 1359 2008-05-06 16:56:42Z alec $
+ $Id: move_del.inc 2018 2008-10-27 10:53:56Z alec $
 
 */
 
@@ -27,7 +27,13 @@ $old_pages = ceil($old_count / $IMAP->page_size);
 if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
     $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
     $target = get_input_value('_target_mbox', RCUBE_INPUT_POST);
-    $moved = $IMAP->move_message($uids, $target, get_input_value('_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');
+
+    $moved = $IMAP->move_message($uids, $target, $mbox);
   
     if (!$moved) {
         // send error message
@@ -36,11 +42,15 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe
         $OUTPUT->send();
         exit;
     }
+
+    if (!$CONFIG['flag_for_deletion'])
+        $addrows = true;
 }
 // delete messages 
 else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
     $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
-    $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST));
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $del = $IMAP->delete_message($uids, $mbox);
   
     if (!$del) {
         // send error message
@@ -49,6 +59,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
         $OUTPUT->send();
         exit;
     }
+    
+    $addrows = true;
 }
 // unknown action or missing query param
 else {
@@ -77,7 +89,6 @@ $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 mailboxlist
 $mbox = $IMAP->get_mailbox_name();
 $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX'));
@@ -89,7 +100,7 @@ if ($RCMAIL->action=='moveto' && $target) {
 $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
 
 // add new rows from next page (if any)
-if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0)) {
+if ($addrows && $_POST['_from']!='show' && ($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'];