Fixed collapsed folder bug. When de-activating collapsable folders collapsed

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index 30bd66942a9b86ea13e9b68eb474f4acfd4c378a..0d48932ea693ab729378f09fb8d2534eed105bd1 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -19,6 +19,8 @@
     define('SM_BOX_UNCOLLAPSED', 0);
     define('SM_BOX_COLLAPSED',   1);
 
+    global $delimiter;
+
     // open a connection on the imap port (143)
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
 
@@ -58,7 +60,7 @@
         session_register('auto_create_done');
     }
 
-   function formatMailboxName($imapConnection, $box_array, $delimeter) {
+   function formatMailboxName($imapConnection, $box_array) {
       global $folder_prefix, $trash_folder, $sent_folder;
       global $color, $move_to_sent, $move_to_trash;
       global $unseen_notify, $unseen_type, $collapse_folders;
@@ -130,7 +132,7 @@
          if ($numMessages > 0) {
             $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;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("empty")."</A>)";
             $line .= "\n</small>\n";
          }
       }
@@ -143,7 +145,7 @@
    /* END OF FUNCTION - BACK TO MAIN */
    /**********************************/
 
-    if (isset($left_refresh) && ($left_refresh != 'None') && ($left_refresh != '')) {
+    if (isset($left_refresh) && ($left_refresh != 'none') && ($left_refresh != '')) {
         echo "<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">\n";
         echo "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"; 
         echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">\n";
@@ -158,7 +160,7 @@
     echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
-    if($date_format != 6) { 
+    if ($date_format != 6) { 
         /* First, display the clock. */
         if ($hour_format == 1) {
           if ($date_format == 4) {
@@ -198,10 +200,9 @@
     echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">';
     echo _("refresh folder list");
     echo '</A>)</SMALL></CENTER><BR>';
-    $delimeter = sqimap_get_delimiter($imapConnection);
 
     /* Lastly, display the folder list. */
-    if (isset($collapse_folders) && $collapse_folders) {
+    if (isset($collapse_folders) && $collapse_folders ) {
         /* If directed, collapse or uncollapse a folder. */
         if (isset($fold)) {
             setPref($data_dir, $username, 'collapse_folder_' . $fold, SM_BOX_COLLAPSED);
@@ -223,7 +224,7 @@
     for ($i = 0;$i < count($boxes); $i++) {
         if ($boxes[$i]['visible'] == true) {
             $mailbox = $boxes[$i]['formatted'];
-            $mblevel = substr_count($boxes[$i]['unformatted'], $delimeter) + 1;
+            $mblevel = substr_count($boxes[$i]['unformatted'], $delimiter) + 1;
 
             /* Create the prefix for the folder name and link. */
             $prefix = str_repeat('  ',$mblevel);
@@ -244,7 +245,7 @@
                 }
                 $line .= '</FONT>';
             } else {
-                $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
+                $line .= formatMailboxName($imapConnection, $boxes[$i]);
             }
 
             /* Put the final touches on our folder line. */
@@ -284,12 +285,12 @@
      * This simple function checks if a box is another box's parent.
      */
     function is_parent_box($curbox_name, $parbox_name) {
-        global $delimeter;
+        global $delimiter;
 
         /* Extract the name of the parent of the current box. */
-        $curparts = explode($delimeter, $curbox_name);
+        $curparts = explode($delimiter, $curbox_name);
         $curname = array_pop($curparts);
-        $actual_parname = implode($delimeter, $curparts);
+        $actual_parname = implode($delimiter, $curparts);
         $actual_parname = substr($actual_parname,0,strlen($parbox_name));
 
         /* Compare the actual with the given parent name. */
@@ -302,7 +303,7 @@
      * status and parent (or not parent) status for all children boxes.
      */
     function compute_folder_children(&$parbox, $boxcount) {
-        global $boxes, $data_dir, $username;
+        global $boxes, $data_dir, $username, $collapse_folders;
         $nextbox = $parbox + 1;
 
         /* Retreive the name for the parent box. */
@@ -312,16 +313,19 @@
         $boxes[$parbox]['parent'] = false;
 
         /* Compute the collapse status for this box. */
-        $collapse = 0;
-        $collapse = getPref($data_dir, $username, 'collapse_folder_' . $parbox_name);
-        $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
+        if( isset($collapse_folders) && $collapse_folders ) {
+            $collapse = getPref($data_dir, $username, 'collapse_folder_' . $parbox_name);
+            $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
+        } else {
+            $collapse = SM_BOX_UNCOLLAPSED;
+        }
         $boxes[$parbox]['collapse'] = $collapse;
 
         /* Otherwise, get the name of the next box. */
-       if (isset($boxes[$nextbox]['unformatted']))
-           $nextbox_name = $boxes[$nextbox]['unformatted'];
-       else
-          $nextbox_name = '';
+       if (isset($boxes[$nextbox]['unformatted']))
+               $nextbox_name = $boxes[$nextbox]['unformatted'];
+       else
+          $nextbox_name = '';
 
         /* Compute any children boxes for this box. */
         while (($nextbox < $boxcount) &&