- s/RoundCube/Roundcube/

alecpl

2010-09-25 e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8

 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-2009, RoundCube Dev. - Switzerland                 |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -42,7 +42,7 @@
  }

  $marked = $IMAP->set_flag($uids, $flag);
  

  if ($marked == -1) {
    // send error message
    if ($_POST['_from'] != 'show')
@@ -52,14 +52,14 @@
    exit;
  }

  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 ($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 != -1 && !$CONFIG['skip_deleted'])
      $OUTPUT->command('flag_deleted_as_read', $uids);
      $OUTPUT->command('flag_deleted_as_read', $ruids);
  }
    

  if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
    rcmail_send_unread_count($IMAP->get_mailbox_name());
  }
@@ -99,28 +99,28 @@

      if ($old_unseen != $unseen_count) {
        $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
   $_SESSION['unseen_count'][$mbox] = $unseen_count;
       $_SESSION['unseen_count'][$mbox] = $unseen_count;
      }
      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));

      if ($IMAP->threading)
   $count = get_input_value('_count', RCUBE_INPUT_POST);
       $count = get_input_value('_count', RCUBE_INPUT_POST);

      // add new rows from next page (if any)
      if ($count && ($jump_back || $nextpage_count > 0)) {
      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, false);
       $jump_back ? NULL : $count);

        rcmail_js_message_list($a_headers, false);
      }
    }
  }
  

  $OUTPUT->send();
}
  

exit;
?>