浏览代码

correctly check for messages in trash if the total is set, but is empty (since
that does not necessarily mean there aren't any messages in the trash..)

Erin Schnabel 20 年之前
父节点
当前提交
916a629e34
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      src/left_main.php

+ 7 - 3
src/left_main.php

@@ -120,9 +120,13 @@ function ListBoxes ($boxes, $j=0 ) {
 
     /* If there are unseen message, bold the line. */
     if (($move_to_trash) && ($mailbox == $trash_folder)) {
-        if (! isset($boxes->total)) {
-            $boxes->total = sqimap_status_messages($imapConnection, $mailbox);
+
+        if ( !is_numeric($boxes->total) ) {
+            $result = sqimap_status_messages($imapConnection, $mailbox);
+            $boxes->total = $result['MESSAGES'];
+            $boxes->unseen = $result['UNSEEN'];
         }
+        
         $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
         if ($unseen > 0) {
             $pre .= '<b>';
@@ -134,7 +138,7 @@ function ListBoxes ($boxes, $j=0 ) {
             if ($unseen_found) {
                 $end .= "&nbsp;<small>$unseen_string</small>";
             }
-            $end .= "\n\t<small>" .
+            $end .= "\n<small>" .
                  '&nbsp;&nbsp;[<a href="empty_trash.php">'._("Purge").'</a>]'.
                  '</small>';
         }