Changeset 9281884 in github

Timestamp:

Sep 18, 2008 5:29:57 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

095d05e

Parents:

b8817ea

Message:

• don't add new row to messages list if only marking as deleted (flag_for_deletion=true)

File:

• program/steps/mail/move_del.inc (modified) (5 diffs)

program/steps/mail/move_del.inc

@@ -28 +28 @@
     $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);
+    $moved = $IMAP->move_message($uids, $target, $mbox);
   
-    if ($moved) {
-        // flag old messages as read because rcube_imap will not send expunge command after moving
-        if ($CONFIG['read_when_deleted'])
-            $IMAP->set_flag($uids, 'SEEN');
-    }
-    else {
+    if (!$moved) {
         // send error message
         $OUTPUT->command('list_mailbox');
@@ -42 +38 @@
         exit;
     }
+
+    // flag old messages as read because rcube_imap will not send expunge command after moving
+    if ($CONFIG['read_when_deleted'])
+        $IMAP->set_flag($uids, 'SEEN');
+
+    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) {
@@ -55 +59 @@
         exit;
     }
+    
+    $addrows = true;
 }
 // unknown action or missing query param
@@ -83 +89 @@
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
-
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
@@ -95 +100 @@
 
 // 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'];