* Removed the unnecessary function replace_escaped_spaces (never used)

* Changed all instances of replace_spaces to the actual function call
  (removing the silly wrapper function replace_spaces)
* Added a collapseable folder list for left_main.php
* Added the option for it under Options -> Folders

(Sorry that I didn't do this in smaller commits that only did one or two of
the above actions.)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1110 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index c1d693e4fa55214cf51f422b09105bb7db98b7c6..f8ca3d0ddbf14ff677cb0edf7cbbc60f46112751 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Version 1.0.3 -- DEVELOPMENT
 ----------------------------
 - Made folder drop-down list consistant in look to the other drop-downs
+- Added collapseable folder listing (an option that can be turned on)
 
 Version 1.0.2 -- February 8, 2001 
 ---------------------------------

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 44f502f0fe53a7cb9e69dcf8f6544ed63ba20a37..afb0549db12686a4b40851782511aa54b7214672 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -512,7 +512,7 @@
       for ($i = 0; $i < count($boxes); $i++) {
          if (!in_array("noselect", $boxes[$i]['flags'])) {
             $box = $boxes[$i]['unformatted'];
-            $box2 = replace_spaces($boxes[$i]['unformatted-disp']);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
          }
       }

diff --git a/functions/strings.php b/functions/strings.php
index 1048f680d3daa28ff79fdbd3061d2a8482875e1b..bac77cb20e99ebf18263697f21757ece7847bd0a 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -232,7 +232,7 @@
    function getLineOfAddrs($array) {
       if (is_array($array)) {
         $to_line = implode(', ', $array);
-        $to_line = trim(ereg_replace(',,+', ',', $to_line));
+        $to_line = trim(ereg_replace(', (, )+', ', ', $to_line));
       } else {
         $to_line = '';
       }
@@ -300,14 +300,11 @@
 
    }
 
+   // Depreciated.  :-)  I always wanted to say that.
    function replace_spaces ($string) {
       return str_replace(' ', ' ', $string);
    }
 
-   function replace_escaped_spaces ($string) {
-      return str_replace(' ', ' ', $string);
-   }
-
    function get_location () {
       # This determines the location to forward to relative
       # to your server.  If this doesnt work correctly for

diff --git a/src/folders.php b/src/folders.php
index a3acfa8137beb7c5ccbb3249835107863019bbe7..846220a32e0d42595c2d91b3b75a1ea7cf8b4b08 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -132,7 +132,7 @@
              strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
            {
               $box = $boxes[$i]["unformatted-dm"];
-              $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+              $box2 = str_replace(' ', ' ', $boxes[$i]["unformatted-disp"]);
               echo "         <OPTION VALUE=\"$box\">$box2\n";
            }
       }
@@ -168,11 +168,11 @@
       if (!in_array('noinferiors', $boxes[$i]['flags'])) {
          if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
             echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
          } else {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
            if (strtolower($imap_server_type) != "courier" ||
                strtolower($box) != "inbox.trash")
              echo "<OPTION VALUE=\"$box\">$box2\n";
@@ -206,7 +206,7 @@
             ($boxes[$i]["unformatted"] != $sent_folder)) 
            {   
               $box = $boxes[$i]["unformatted-dm"];
-              $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+              $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
               if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
                  echo "<OPTION VALUE=\"$box\">$box2\n";
            }
@@ -239,7 +239,7 @@
             ($boxes[$i]["unformatted"] != $sent_folder)) 
            {   
               $box = $boxes[$i]["unformatted-dm"];
-              $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+              $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
               echo "         <OPTION VALUE=\"$box\">$box2\n";
            }
       }

diff --git a/src/left_main.php b/src/left_main.php
index d80fdd781590391ca48b72dd392d791c4aa2c709..efaa2522fab199f8856f83e0cc1370d9a6b13575 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -48,24 +48,19 @@
 
    displayHtmlHeader();
 
-   function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
+   function formatMailboxName($imapConnection, $box_array, $delimeter) {
       global $folder_prefix, $trash_folder, $sent_folder;
       global $color, $move_to_sent, $move_to_trash;
-      global $unseen_notify, $unseen_type;
-      
+      global $unseen_notify, $unseen_type, $collapse_folders;
+
+      $real_box = $box_array['unformatted'];
+      $mailbox = $box_array['formatted'];
       $mailboxURL = urlencode($real_box);
       
-      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 = 0;
+      
+      if (($unseen_notify == 2 && $real_box == "INBOX") ||
+          $unseen_notify == 3) {
         $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
@@ -77,29 +72,43 @@
          }
       }
       
-      $line = "<NOBR>";
-      if ($unseen > 0)
-         $line .= "<B>";
-
       $special_color = false;
-      if ((strtolower($real_box) == "inbox") ||
+      if (($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 ($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>";
+      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;';
       }
+         
+      $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>";
       }
@@ -107,7 +116,7 @@
       if (($move_to_trash == true) && ($real_box == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $line .= "\n<small>\n";
-         $line .= "  &nbsp;&nbsp;(<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
+         $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
          $line .= "\n</small>\n";
       }
       $line .= "</NOBR>";
@@ -134,22 +143,74 @@
    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++) {
-      $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"]);
+      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']);
+               $line .= str_replace(' ', '&nbsp;', $regs[2]);
+           }
+            $line .= '</FONT>';
+         } else {
+            $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
+         }
+         echo "$line<BR>\n";
       }
-      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>

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 31389dfc4f6f59187ac97506b99f83c545fd8e60..9723c6c4e8c46d9e781673576c230836c17a5e79 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -182,6 +182,8 @@
    $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons');
    if ($location_of_buttons == '')
        $location_of_buttons = 'between';
+       
+   $collapse_folders = getPref($data_dir, $username, 'collapse_folders');
 
    do_hook("loading_prefs");
 

diff --git a/src/options.php b/src/options.php
index 643f3e79e21f80771604f18c1e745039010fb0e0..b3f2e00abf0d536a109bd781a3fb25c3d29970f8 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -91,9 +91,12 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       } 
-      setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       setPref($data_dir, $username, 'unseen_notify', $unseennotify);
       setPref($data_dir, $username, 'unseen_type', $unseentype);
+      if (isset($collapsefolders))
+          setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
+      else
+          removePref($data_dir, $username, 'collapse_folders');
       do_hook('options_folders_save');
       echo '<br><center><b>'._("Successfully saved folder preferences!").'</b><br>';
       echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a></center><br>';

diff --git a/src/options_folder.php b/src/options_folder.php
index 750db9bee2b4348f12e73c931539f741e1e84d6f..d1cc444fd8de7021684fae62408704c0856bc98b 100644 (file)
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -42,7 +42,7 @@
    </td></tr></table>
 
    <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="2" border="0">
+      <table width="100%" cellpadding="0" cellspacing="5" border="0">
 
 <?php if ($show_prefix_option == true) {   ?>   
          <tr>
@@ -74,7 +74,7 @@
          }
          if ($use_folder == true) {
             $box = $boxes[$i]['unformatted-dm'];
-            $box2 = replace_spaces($boxes[$i]['formatted']);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
             if (($boxes[$i]['unformatted'] == $trash_folder) && ($move_to_trash == true))
                echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
             else
@@ -102,7 +102,7 @@
          }
          if ($use_folder == true) {
             $box = $boxes[$i]['unformatted-dm'];
-            $box2 = replace_spaces($boxes[$i]['formatted']);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
             if (($boxes[$i]['unformatted'] == $sent_folder) && ($move_to_sent == true))
                echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
             else
@@ -114,26 +114,32 @@
 ?>
          <tr>
             <td valign=top align=right>
-               <br>
                <?php echo _("Unseen message notification"); ?>:
             </td>
             <td>
                <input type=radio name=unseennotify value=1<?php if ($unseen_notify == 1) echo " checked"; ?>> <?php echo _("No notification") ?><br>
                <input type=radio name=unseennotify value=2<?php if ($unseen_notify != 1 && $unseen_notify != 3) echo " checked"; ?>> <?php echo _("Only INBOX") ?><br>
                <input type=radio name=unseennotify value=3<?php if ($unseen_notify == 3) echo " checked"; ?>> <?php echo _("All Folders") ?><br>
-               <br>
             </td>
          </tr>
          <tr>
             <td valign=top align=right>
-               <br>
                <?php echo _("Unseen message notification type"); ?>:
             </td>
-            <td>
-               <input type=radio name=unseentype value=1<?php if ($unseen_type < 2 || $unseen_type > 2) echo " checked"; ?>> <?php echo _("Only unseen"); ?> - (4)<br> 
+           <td>
+               <input type=radio name=unseentype value=1<?php if ($unseen_type < 2 || $unseen_type > 2) echo " checked"; ?>> <?php echo _("Only unseen"); ?> - (4)<br>
                <input type=radio name=unseentype value=2<?php if ($unseen_type == 2) echo " checked"; ?>> <?php echo _("Unseen and Total"); ?> - (4/27)
             </td>
          </tr>
+         <tr>
+            <td valign=top align=right>
+               <?php echo _("Collapseable folders"); ?>:
+            </td>
+            <td>
+               <input type=checkbox name=collapsefolders <?php if ($collapse_folders) echo " checked"; ?>>
+                <?php echo _("Enable Collapseable Folders"); ?>
+            </td>
+         </tr>
          <?php do_hook("options_folders_inside"); ?>
          <tr>
             <td>&nbsp;

diff --git a/src/search.php b/src/search.php
index 0aad14b77db5606fa62e63f8bad077262d93f705..da18910d28bc37c3e9a76d025e13b12c75c418af 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -59,7 +59,7 @@
    for ($i = 0; $i < count($boxes); $i++) {
          if (!in_array('noselect', $boxes[$i]['flags'])) {
          $box = $boxes[$i]['unformatted'];
-         $box2 = replace_spaces($boxes[$i]['unformatted-disp']);
+        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
          if ($mailbox == $box)
             echo "         <OPTION VALUE=\"$box\" SELECTED>$box2\n";
          else