reverted changes so that collapsable folders are only in 1.1 branch

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

diff --git a/src/left_main.php b/src/left_main.php
index 73987f6..d80fdd7 100644 (file)
--- 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 .= '<tt>&nbsp;</tt>&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("^( *)([^ ]*)$", $mailbox, $regs))
-           {
-               $line .= str_replace(' ', '&nbsp;', $regs[1]);
-               if (isset($boxes[$i]['parent']))
-                   $line .= FoldLink($boxes[$i]['unformatted'], 
-                       $boxes[$i]['parent']);
-               elseif ($collapse_folders)
-                   $line .= '<tt>&nbsp;</tt>&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>

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 9723c6c..31389df 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -182,8 +182,6 @@
    $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 042fc6f..643f3e7 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -91,14 +91,9 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       } 
-      if (isset($folderprefix))
-         setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      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 d1cc444..750db9b 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="5" border="0">
+      <table width="100%" cellpadding="0" cellspacing="2" border="0">
 
 <?php if ($show_prefix_option == true) {   ?>   
          <tr>
@@ -74,7 +74,7 @@
          }
          if ($use_folder == true) {
             $box = $boxes[$i]['unformatted-dm'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
+            $box2 = replace_spaces($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 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
+            $box2 = replace_spaces($boxes[$i]['formatted']);
             if (($boxes[$i]['unformatted'] == $sent_folder) && ($move_to_sent == true))
                echo "         <OPTION SELECTED VALUE=\"$box\">$box2\n";
             else
@@ -114,30 +114,24 @@
 ?>
          <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>
-               <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"); ?>
+               <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>
          <?php do_hook("options_folders_inside"); ?>