if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
$mailbox = $regs[2];
}
-
- list($unseen_string, $unseen) = create_unseen_string($real_box, $box_array, $imapConnection);
+ $unseen = 0;
+ $status = array();
+ if (($unseen_notify == 2 && $real_box == 'INBOX') ||
+ $unseen_notify == 3) {
+ $status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
+ if ($status !== false) {
+ list($unseen_string, $unseen) = $status;
+ } else {
+ list($unseen_string, $unseen) = array(_("Not available"),'');
+ }
+ } else {
+ list($unseen_string, $unseen) = array('','');
+ }
$special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
/* Start off with a blank line. */
if ($unseen > 0) { $line .= '<B>'; }
/* Create the link for this folder. */
- $line .= '<a href="right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox='.
- $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
-
+ if ($status !== false) {
+ $line .= '<a href="right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox='.
+ $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+ }
if ($special_color) {
$line .= "<font color=\"$color[11]\">";
}
}
if ($special_color == TRUE)
$line .= '</font>';
- $line .= '</a>';
+ if ($status !== false) {
+ $line .= '</a>';
+ }
/* If there are unseen message, close bolding. */
if ($unseen > 0) { $line .= "</B>"; }
* @return array[0] unseen message string (for display)
* @return array[1] unseen message count
*/
-function create_unseen_string($boxName, $boxArray, $imapConnection) {
- global $boxes, $unseen_type, $color;
+function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) {
+ global $boxes, $unseen_type, $color, $unseen_cum;
/* Initialize the return value. */
$result = array(0,0);
$totalMessageCount = 0;
/* Collect the counts for this box alone. */
- $boxUnseenCount = sqimap_unseen_messages($imapConnection, $boxName);
+ $status = sqimap_status_messages($imapConnection, $boxName);
+ $boxUnseenCount = $status['UNSEEN'];
+ if ($boxUnseenCount === false) {
+ return false;
+ }
if ($unseen_type == 2) {
- $boxMessageCount = sqimap_get_num_messages($imapConnection, $boxName);
+ $boxMessageCount = $status['MESSAGES'];
}
/* Initialize the total counts. */
- if ($boxArray['collapse'] == SM_BOX_COLLAPSED) {
+ if ($boxArray['collapse'] == SM_BOX_COLLAPSED && $unseen_cum) {
/* Collect the counts for this boxes subfolders. */
$curBoxLength = strlen($boxName);
$boxCount = count($boxes);
if (($boxName != $boxes[$i]['unformatted'])
&& (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
&& !in_array('noselect', $boxes[$i]['flags'])) {
- $subUnseenCount = sqimap_unseen_messages($imapConnection, $boxes[$i]['unformatted']);
+ $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+ $subUnseenCount = $status['UNSEEN'];
if ($unseen_type == 2) {
- $subMessageCount = sqimap_get_num_messages($imapConnection, $boxes[$i]['unformatted']);
+ $subMessageCount = $status['MESSAGES'];;
}
-
/* Add the counts for this subfolder to the total. */
$totalUnseenCount += $subUnseenCount;
$totalMessageCount += $subMessageCount;
if (($move_to_trash) && ($mailbox == $trash_folder)) {
if (! isset($numMessages)) {
- $numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
+ $status = sqimap_status_messages($imapConnection, $mailbox);
+ $numMessages = $status['MESSAGES'];
}
if ($numMessages > 0) {