Imported Upstream version 0.2~stable

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

diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index d81264a088e8b38b4bad2bd30d5208359831d3aa..b7edeb4a83611f5ae72ba35beb5a8ef3956de0ab 100644 (file)
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -14,7 +14,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: mark.inc 1292 2008-04-12 17:37:22Z alec $
+ $Id: mark.inc 1962 2008-10-09 06:25:43Z alec $
 
 */
 
@@ -22,7 +22,9 @@ $a_flags_map = array(
   'undelete' => 'UNDELETED',
   'delete' => 'DELETED',
   'read' => 'SEEN',
-  'unread' => 'UNSEEN');
+  'unread' => 'UNSEEN',
+  'flagged' => 'FLAGGED',
+  'unflagged' => 'UNFLAGGED');
 
 if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_value('_flag', RCUBE_INPUT_POST)))
 {
@@ -38,12 +40,13 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       $OUTPUT->command('flag_deleted_as_read', $uids);
     }
 
-  if ($marked != -1)
+  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'));
-    $OUTPUT->send();
   }
+
+  $OUTPUT->send();
 }
   
 exit;