X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=d80fdd781590391ca48b72dd392d791c4aa2c709;hb=f7196031c2f53609c6f0e6886dbd45d5f9b7e914;hp=e4547ca3f15d639dc18dd6b006123452de1c0903;hpb=8885aa1e33d1b2acadacbd87b7c3e23271515206;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index e4547ca3..d80fdd78 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -48,19 +48,24 @@
 
    displayHtmlHeader();
 
-   function formatMailboxName($imapConnection, $box_array, $delimeter) {
+   function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
       global $folder_prefix, $trash_folder, $sent_folder;
       global $color, $move_to_sent, $move_to_trash;
-      global $unseen_notify, $unseen_type, $collapse_folders;
-
-      $real_box = $box_array['unformatted'];
-      $mailbox = $box_array['formatted'];
-      $mailboxURL = urlencode($real_box);
+      global $unseen_notify, $unseen_type;
       
-      $unseen = 0;
+      $mailboxURL = urlencode($real_box);
       
-      if (($unseen_notify == 2 && $real_box == "INBOX") ||
-          $unseen_notify == 3) {
+      if ($unseen_notify == 2 && $real_box == "INBOX") {
+	 $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+         if ($unseen_type == 1 && $unseen > 0) {
+            $unseen_string = "($unseen)";
+            $unseen_found = true;
+         } else if ($unseen_type == 2) {
+            $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+            $unseen_string = "<font color=\"$color[11]\">($unseen/$numMessages)</font>";
+            $unseen_found = true;
+         }
+      } else if ($unseen_notify == 3) {
 	 $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
@@ -72,43 +77,29 @@
          }
       }
       
+      $line = "<NOBR>";
+      if ($unseen > 0)
+         $line .= "<B>";
+
       $special_color = false;
       if ((strtolower($real_box) == "inbox") ||
 	  (($real_box == $trash_folder) && ($move_to_trash)) ||
 	  (($real_box == $sent_folder) && ($move_to_sent)))
 	 $special_color = true;
-	 
-      $spaces = '';
-      $line = "<NOBR>";
-      if (ereg("^( *)([^ ]*)$", $mailbox, $regs))
-      {
-          $spaces = $regs[1];
-	  $mailbox = $regs[2];
-      }
       
-      if ($unseen > 0)
-          $line .= "<B>";
-      $line .= str_replace(' ', '&nbsp;', $spaces);
-      
-      if ($collapse_folders)
-      {
-         if (isset($box_array['parent']))
-  	    $line .= FoldLink($box_array['unformatted'], $box_array['parent']);
-         else
-            $line .= '&nbsp;&nbsp;';
+      if ($special_color == true) {
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT COLOR=\"$color[11]\">";
+         $line .= replace_spaces($mailbox);
+         $line .= "</font></a>";
+      } else {
+         $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+         $line .= replace_spaces($mailbox);
+         $line .= "</a>";
       }
-	  
-      $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
-      if ($special_color == true)
-         $line .= "<FONT COLOR=\"$color[11]\">";
-      $line .= str_replace(' ', '&nbsp;', $mailbox);
-      if ($special_color == true)
-         $line .= "</font>";
-      $line .= "</a>";
 
       if ($unseen > 0)
          $line .= "</B>";
-
+      
       if (isset($unseen_found) && $unseen_found) {
          $line .= "&nbsp;<small>$unseen_string</small>";
       }
@@ -116,7 +107,7 @@
       if (($move_to_trash == true) && ($real_box == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $line .= "\n<small>\n";
-         $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
+         $line .= "  &nbsp;&nbsp;(<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
          $line .= "\n</small>\n";
       }
       $line .= "</NOBR>";
@@ -143,76 +134,22 @@
    echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
 
-   if ($collapse_folders)
-   {
-      if (isset($fold))
-         setPref($data_dir, $username, 'collapse_folder_' . $fold, 1);
-      if (isset($unfold))
-         setPref($data_dir, $username, 'collapse_folder_' . $unfold, 0);
-      $IAmAParent = array();
-      for ($i = 0; $i < count($boxes); $i ++)
-      {
-          $parts = explode($delimeter, $boxes[$i]['unformatted']);
-	  $box_name = array_pop($parts);
-	  $box_parent = implode($delimeter, $parts);
-	  $hidden = 0;
-	  if (isset($box_parent))
-	  {
-	      $hidden = getPref($data_dir, $username, 
-	          'collapse_folder_' . $box_parent);
-	      $IAmAParent[$box_parent] = $hidden;
-	  }
-	  $boxes[$i]['folded'] = $hidden;
-      }
-   }
-
    for ($i = 0;$i < count($boxes); $i++) {
-      if (! isset($boxes[$i]['folded']) || ! $boxes[$i]['folded'])
-      {
-         $line = "";
-         $mailbox = $boxes[$i]["formatted"];
-
-         if ($collapse_folders && 
-	     isset($IAmAParent[$boxes[$i]['unformatted']]))
-         {
-	    $boxes[$i]['parent'] = $IAmAParent[$boxes[$i]['unformatted']];
-         }
-
-         if (in_array('noselect', $boxes[$i]['flags'])) {
-            $line .= "<FONT COLOR=\"$color[10]\">";
-	    if (ereg("^([\\s]*)([^\\s]*)$", $mailbox, $regs))
-	    {
-		$line .= str_replace(' ', '&nbsp;', $regs[1]);
-		if ($boxes[$i]['parent'])
-		    $line .= FoldLink($boxes[$i]['unformatted'], 
-		        $boxes[$i]['parent']);
-		else
-		    $line .= '&nbsp;&nbsp;';
-		$line .= str_replace(' ', '&nbsp;', $regs[2]);
-	    }
-            $line .= '</FONT>';
-         } else {
-            $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
-         }
-         echo "$line<BR>\n";
+      $line = "";
+      $mailbox = $boxes[$i]["formatted"];
+      
+      if (in_array('noselect', $boxes[$i]['flags'])) {
+         $line .= "<FONT COLOR=\"$color[10]\">";
+         $line .= replace_spaces($mailbox);
+         $line .= '</FONT>';
+      } else {
+	 if (! isset($boxes[$i]['unseen'])) 
+	    $boxes[$i]['unseen'] = '';
+         $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
       }
+      echo "$line<BR>\n";
    }
    sqimap_logout($imapConnection);
    do_hook("left_main_after");
-
-
-
-   function FoldLink($mailbox, $folded)
-   {
-       $mailbox = urlencode($mailbox);
-       echo '<tt><a target="left" style="text-decoration:none" ';
-       echo 'href="left_main.php?';
-       if ($folded)
-           echo "unfold=$mailbox\">+";
-       else
-           echo "fold=$mailbox\">-";
-       echo '</a></tt>&nbsp;';
-   }
-   
 ?>
 </BODY></HTML>