From 3ebac0167bf20104fb7a2a55934765117760264c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 18 Aug 2014 03:53:18 -0400
Subject: [PATCH] Only add zen-mode text labels in compose step
---
program/steps/mail/mark.inc | 245 ++++++++++++++++++++++++++----------------------
1 files changed, 134 insertions(+), 111 deletions(-)
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c065b3f..4e83f97 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,9 +3,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/mark.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Mark the submitted messages with the specified flag |
@@ -13,115 +16,135 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
// only process ajax requests
-if (!$OUTPUT->ajax_call)
- return;
-
-$a_flags_map = array(
- 'undelete' => 'UNDELETED',
- 'delete' => 'DELETED',
- 'read' => 'SEEN',
- 'unread' => 'UNSEEN',
- 'flagged' => 'FLAGGED',
- 'unflagged' => 'UNFLAGGED');
-
-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();
- $old_pages = ceil($old_count / $IMAP->page_size);
- $count = sizeof(explode(',', $uids));
- }
-
- $marked = $IMAP->set_flag($uids, $flag);
-
- if ($marked == -1) {
- // send error message
- if ($_POST['_from'] != 'show')
- $OUTPUT->command('list_mailbox');
- $OUTPUT->show_message('errormarking', 'error');
- $OUTPUT->send();
- 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 ($read != -1 && !$CONFIG['skip_deleted'])
- $OUTPUT->command('flag_deleted_as_read', $uids);
- }
-
- if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
- $mbox_name = $IMAP->get_mailbox_name();
- $unseen = $IMAP->messagecount($mbox_name, 'UNSEEN');
- $old_unseen = $_SESSION['unseen_count'][$mbox_name];
- if ($old_unseen != $unseen) {
- $OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
- $_SESSION['unseen_count'][$mbox_name] = $unseen;
- }
- }
- 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'][$search_request] = $IMAP->refresh_search();
- }
-
- $msg_count = $IMAP->messagecount();
- $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 && $nextpage_count <= 0 && $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 = $_SESSION['unseen_count'][$mbox];
- if ($old_unseen != $unseen_count) {
- $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
- $_SESSION['unseen_count'][$mbox] = $unseen_count;
- }
- $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
-
- // add new rows from next page (if any)
- if (($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, $count);
-
- rcmail_js_message_list($a_headers, false, false);
- }
- }
- }
-
- $OUTPUT->send();
+if (!$OUTPUT->ajax_call) {
+ return;
}
-
-exit;
-?>
+
+$threading = (bool) $RCMAIL->storage->get_threading();
+$skip_deleted = (bool) $RCMAIL->config->get('skip_deleted');
+$read_deleted = (bool) $RCMAIL->config->get('read_when_deleted');
+
+$a_flags_map = array(
+ 'undelete' => 'UNDELETED',
+ 'delete' => 'DELETED',
+ 'read' => 'SEEN',
+ 'unread' => 'UNSEEN',
+ 'flagged' => 'FLAGGED',
+ 'unflagged' => 'UNFLAGGED',
+);
+
+if (($_uids = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST))
+ && ($flag = rcube_utils::get_input_value('_flag', rcube_utils::INPUT_POST))
+) {
+ $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
+
+ if ($flag == 'DELETED' && $skip_deleted && $_POST['_from'] != 'show') {
+ // count messages before changing anything
+ $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+ $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
+ }
+
+ foreach (rcmail::get_uids() as $mbox => $uids) {
+ $marked += (int)$RCMAIL->storage->set_flag($uids, $flag, $mbox);
+ $count += count($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' && $read_deleted && !empty($_POST['_ruid'])) {
+ $ruids = rcube_utils::get_input_value('_ruid', rcube_utils::INPUT_POST);
+ foreach (rcmail::get_uids($ruids) as $mbox => $uids) {
+ $read += (int)$RCMAIL->storage->set_flag($uids, 'SEEN', $mbox);
+ }
+
+ if ($read && !$skip_deleted) {
+ $OUTPUT->command('flag_deleted_as_read', $ruids);
+ }
+ }
+
+ if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$skip_deleted)) {
+ foreach (rcmail::get_uids() as $mbox => $uids) {
+ rcmail_send_unread_count($mbox);
+ }
+ }
+ else if ($flag == 'DELETED' && $skip_deleted) {
+ if ($_POST['_from'] == 'show') {
+ if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC))
+ $OUTPUT->command('show_message', $next);
+ else
+ $OUTPUT->command('command', 'list');
+ }
+ else {
+ $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
+
+ // refresh saved search set after moving some messages
+ if ($search_request && $RCMAIL->storage->get_search_set()) {
+ $_SESSION['search'] = $RCMAIL->storage->refresh_search();
+ }
+
+ $msg_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+ $page_size = $RCMAIL->storage->get_pagesize();
+ $page = $RCMAIL->storage->get_page();
+ $pages = ceil($msg_count / $page_size);
+ $nextpage_count = $old_count - $page_size * $page;
+ $remaining = $msg_count - $page_size * ($page - 1);
+
+ // jump back one page (user removed the whole last page)
+ if ($page > 1 && $remaining == 0) {
+ $page -= 1;
+ $RCMAIL->storage->set_page($page);
+ $_SESSION['page'] = $page;
+ $jump_back = true;
+ }
+
+ // update message count display
+ $OUTPUT->set_env('messagecount', $msg_count);
+ $OUTPUT->set_env('current_page', $page);
+ $OUTPUT->set_env('pagecount', $pages);
+
+ // update mailboxlist
+ $mbox = $RCMAIL->storage->get_folder();
+ $unseen_count = $msg_count ? $RCMAIL->storage->count($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 ($threading) {
+ $count = rcube_utils::get_input_value('_count', rcube_utils::INPUT_POST);
+ }
+
+ // add new rows from next page (if any)
+ if ($old_count && $_uids != '*' && ($jump_back || $nextpage_count > 0)) {
+ $a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
+ rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
+
+ rcmail_js_message_list($a_headers, false);
+ }
+ }
+ }
+}
+else {
+ $OUTPUT->show_message('internalerror', 'error');
+}
+
+$OUTPUT->send();
--
Gitblit v1.9.1