[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/src left_main.php,1.161,1.162
From:       Marc Groot Koerkamp <stekkel () users ! sourceforge ! net>
Date:       2003-06-29 10:56:07
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9373

Modified Files:
	left_main.php 
Log Message:
removal of status call requests.



Index: left_main.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/left_main.php,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -w -r1.161 -r1.162
--- left_main.php	24 Jun 2003 23:16:46 -0000	1.161
+++ left_main.php	29 Jun 2003 10:56:05 -0000	1.162
@@ -100,10 +100,6 @@
                     "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" \
style=\"text-decoration:none\">"._("purge")."</A>)" .  "</small>";
         }
-    } else {
-        $line .= concat_hook_function('left_main_after_each_folder',
-                                      array(isset($numMessages) ? $numMessages : '',
-                                            $real_box, $imapConnection));
     }
 
     /* Return the final product. */
@@ -297,29 +293,24 @@
     if (isset($boxes) && !empty($boxes)) {
         $mailbox = $boxes->mailboxname_full;
         $leader = '<tt>';
-        $leader .= str_repeat('&nbsp;&nbsp;',$j);
+        $leader .= str_repeat('&nbsp;&nbsp;&nbsp;',$j);
         $mailboxURL = urlencode($mailbox);
-
         /* get unseen/total messages information */
-        if ($boxes->unseen||$boxes->total) {
+        if ($boxes->unseen !== false || $boxes->total !== false) {
             $unseen = $boxes->unseen;
             $unseen_string = "($unseen)";
             if ($unseen>0||$boxes->total>0) {
                 $unseen_found = TRUE;
             }
-
             $unseen_before = '<font color="' . $color[11] . '">';
             $unseen_after = '</font>';
-
             if ((($unseen_notify == 2) && (strtolower($mailbox) == 'inbox')) || \
($unseen_notify == 3)) {  $unseen_string = '(' . $unseen;
                 
                 if ($unseen_type > 1) {
                     $unseen_string .= '/' . $boxes->total;
                 }
-
                 $unseen_string .= ')';
-
                 $unseen_string = $unseen_before . $unseen_string . $unseen_after;
             }
         } else {
@@ -343,25 +334,19 @@
         }
 
         /* If there are unseen message, bold the line. */
-
         if (($move_to_trash) && ($mailbox == $trash_folder)) {
-            if (! isset($numMessages)) {
-                $status = sqimap_status_messages($imapConnection, $mailbox);
-                $numMessages = $status['MESSAGES'];
+            if (! isset($boxes->total)) {
+                $boxes->total = sqimap_status_messages($imapConnection, $mailbox);
             }
-
             if ($unseen > 0) {
                 $pre .= '<b>';
             }
-
             $pre .= "<a \
href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" \
                target=\"right\" style=\"text-decoration:none\">";
-
             if ($unseen > 0) {
                 $end .= '</b>';
             }
-
             $end .= '</a>';
-            if ($numMessages > 0) {
+            if ($boxes->total > 0) {
                 if ($unseen > 0) {
                     $pre .= '<b>';
                 }
@@ -428,7 +413,7 @@
     $mailboxURL = urlencode($mailbox);
 
     /* get unseen/total messages information */
-        if ($boxes->unseen) {
+    if ($boxes->unseen !== false) {
         $unseen = $boxes->unseen;
             $unseen_string = "($unseen)";
         if ($unseen>0) $unseen_found = TRUE;
@@ -987,6 +972,7 @@
         echo '</div></small>'."\n";
         echo '</form>'."\n";
     } else {
+        //sqimap_get_status_mbx_tree($imap_stream,$boxes)    
         ListBoxes($boxes);
     }
 } /* if ($oldway) else ... */



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]