From cbeea3d4d092f6ae2310175a57fe15b43d608b33 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 17 Sep 2009 08:36:32 -0400
Subject: [PATCH] - some code improvements for r2959 change
---
program/steps/mail/list.inc | 10 +----
program/steps/mail/check_recent.inc | 19 +--------
program/steps/mail/func.inc | 48 +++++++++++++-----------
program/steps/mail/mark.inc | 8 ---
program/steps/mail/move_del.inc | 7 ---
5 files changed, 32 insertions(+), 60 deletions(-)
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index d091d61..58a8e7e 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -69,29 +69,14 @@
}
}
else {
- send_unread_count($mbox_name);
+ rcmail_send_unread_count($mbox_name, true);
}
}
else if ($check_all) {
- send_unread_count($mbox_name);
+ rcmail_send_unread_count($mbox_name, true);
}
}
$OUTPUT->send();
-
-
-function send_unread_count($mbox_name)
-{
- global $RCMAIL;
-
- $old_unseen = $_SESSION['unseen_count'][$mbox_name];
- $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', true);
-
- if ($unseen != $old_unseen)
- $RCMAIL->output->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
-
- // @TODO: this data is doubled (session and cache tables) if caching is enabled
- $_SESSION['unseen_count'][$mbox_name] = $unseen;
-}
?>
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 4cb2f81..35354eb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -489,9 +489,6 @@
}
-/**
- *
- */
function rcmail_messagecount_display($attrib)
{
global $IMAP, $OUTPUT;
@@ -505,9 +502,6 @@
}
-/**
- *
- */
function rcmail_quota_display($attrib)
{
global $OUTPUT, $COMM_PATH;
@@ -524,9 +518,6 @@
}
-/**
- *
- */
function rcmail_quota_content($quota=NULL, $attrib=NULL)
{
global $IMAP, $COMM_PATH, $RCMAIL;
@@ -579,9 +570,6 @@
}
-/**
- *
- */
function rcmail_get_messagecount_text($count=NULL, $page=NULL)
{
global $IMAP, $MESSAGE;
@@ -610,27 +598,43 @@
return Q($out);
}
-/**
- *
- */
+
function rcmail_mailbox_name_display($attrib)
{
- global $RCMAIL;
+ global $RCMAIL;
- if (!$attrib['id'])
- $attrib['id'] = 'rcmmailboxname';
+ if (!$attrib['id'])
+ $attrib['id'] = 'rcmmailboxname';
- $RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
+ $RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
- return html::span($attrib, rcmail_get_mailbox_name_text());
+ return html::span($attrib, rcmail_get_mailbox_name_text());
}
function rcmail_get_mailbox_name_text()
{
- global $RCMAIL;
- return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
+ global $RCMAIL;
+ return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
}
+
+function rcmail_send_unread_count($mbox_name, $force=false)
+{
+ global $RCMAIL;
+
+ $old_unseen = $_SESSION['unseen_count'][$mbox_name];
+ $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force);
+
+ if ($unseen != $old_unseen)
+ $RCMAIL->output->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+
+ // @TODO: this data is doubled (session and cache tables) if caching is enabled
+ $_SESSION['unseen_count'][$mbox_name] = $unseen;
+
+ return $unseen;
+}
+
+
/**
* Sets message is_safe flag according to 'show_images' option value
*
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index a40fce6..57bb919 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -60,14 +60,8 @@
if ($count = $IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh'])))
$a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
-// count UNSEEN messages...
-$old_unseen = $_SESSION['unseen_count'][$mbox_name];
-$unseen = $count ? $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh'])) : 0;
-$_SESSION['unseen_count'][$mbox_name] = $unseen;
-
-// ...and update mailboxlist
-if ($unseen != $old_unseen)
- $OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+// update mailboxlist
+rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']));
// update message count display
$pages = ceil($count/$IMAP->page_size);
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c065b3f..014108f 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -61,13 +61,7 @@
}
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;
- }
+ rcmail_send_unread_count($IMAP->get_mailbox_name());
}
else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
if ($_POST['_from'] == 'show') {
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 2a8cee6..30102d9 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -110,12 +110,7 @@
}
if ($RCMAIL->action=='moveto' && $target) {
- $unseen_count = $IMAP->messagecount($target, 'UNSEEN', true);
- $old_unseen = $_SESSION['unseen_count'][$target];
- if ($old_unseen != $unseen_count) {
- $OUTPUT->command('set_unread_count', $target, $unseen_count);
- $_SESSION['unseen_count'][$target] = $unseen_count;
- }
+ rcmail_send_unread_count($target, true);
}
$OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
--
Gitblit v1.9.1