From 3d8b54edf74792e3996d861a6a30c41d82976261 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 12 Apr 2011 14:05:36 -0400
Subject: [PATCH] Keep all submitted data if contact form validation fails (#1487865)
---
program/steps/mail/getunread.inc | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index 431ba8a..4ae7e05 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/getunread.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -23,17 +23,26 @@
if (!empty($a_folders))
{
- $inbox = ($IMAP->get_mailbox_name() == 'INBOX');
- foreach ($a_folders as $mbox_row) {
- $unseen = $IMAP->messagecount($mbox_row, 'UNSEEN', !isset($_SESSION['unseen_count'][$mbox_row]));
+ $current = $IMAP->get_mailbox_name();
+ $inbox = ($current == 'INBOX');
+ $check_all = (bool)$RCMAIL->config->get('check_all_folders');
- if ($unseen || !isset($_SESSION['unseen_count'][$mbox_row])) {
+ foreach ($a_folders as $mbox_row) {
+ $unseen_old = rcmail_get_unseen_count($mbox_row);
+
+ if (!$check_all && $unseen_old !== null && $mbox_row != $current)
+ $unseen = $unseen_old;
+ else
+ $unseen = $IMAP->messagecount($mbox_row, 'UNSEEN', $unseen_old === null);
+
+ if ($unseen || $unseen_old === null) {
$OUTPUT->command('set_unread_count', $mbox_row, $unseen, $inbox && $mbox_row == 'INBOX');
}
- $_SESSION['unseen_count'][$mbox_row] = $unseen;
+
+ rcmail_set_unseen_count($mbox_row, $unseen);
}
}
$OUTPUT->send();
-?>
+
--
Gitblit v1.9.1