projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a08f3a0)
put Tyler's collapsable folder listing back in
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 22 Feb 2001 01:45:43 +0000 (01:45 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 22 Feb 2001 01:45:43 +0000 (01:45 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1149 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/left_main.php patch | blob | blame | history
src/load_prefs.php patch | blob | blame | history
src/options.php patch | blob | blame | history
src/options_folder.php patch | blob | blame | history

diff --git a/src/left_main.php b/src/left_main.php
index d80fdd781590391ca48b72dd392d791c4aa2c709..0adbd3a7cfc141adc4420c7f31ae7b018603be10 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -17,10 +17,10 @@
 
    if(!isset($username)) {
       set_up_language($squirrelmail_language, true);
 
    if(!isset($username)) {
       set_up_language($squirrelmail_language, true);
-         include ("../themes/default_theme.php");
-         printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
-                         $color[8], $color[4], $color[7], $color[7], $color[7]);
-         echo "</body></html>";
+          include ("../themes/default_theme.php");
+          printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+                          $color[8], $color[4], $color[7], $color[7], $color[7]);
+          echo "</body></html>";
       exit;
    }
 
       exit;
    }
 
@@ -48,25 +48,20 @@
 
    displayHtmlHeader();
 
 
    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 $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);
       
       $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 = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+      $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)";
             $unseen_found = true;
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
             $unseen_found = true;
@@ -77,29 +72,41 @@
          }
       }
       
          }
       }
       
-      $line = "<NOBR>";
-      if ($unseen > 0)
-         $line .= "<B>";
-
       $special_color = false;
       if ((strtolower($real_box) == "inbox") ||
       $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;
+          (($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 .= '<tt>&nbsp;</tt>&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 ($unseen > 0)
          $line .= "</B>";
-      
+
       if (isset($unseen_found) && $unseen_found) {
          $line .= "&nbsp;<small>$unseen_string</small>";
       }
       if (isset($unseen_found) && $unseen_found) {
          $line .= "&nbsp;<small>$unseen_string</small>";
       }
@@ -107,7 +114,7 @@
       if (($move_to_trash == true) && ($real_box == $trash_folder)) {
          $urlMailbox = urlencode($real_box);
          $line .= "\n<small>\n";
       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>";
          $line .= "\n</small>\n";
       }
       $line .= "</NOBR>";
@@ -134,22 +141,67 @@
    echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
 
    echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
 
+   if (isset($collapse_folders) && $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++) {
    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 (isset($collapse_folders) && $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";
       }
       }
-      echo "$line<BR>\n";
    }
    sqimap_logout($imapConnection);
    do_hook("left_main_after");
    }
    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>
 ?>
 </BODY></HTML>
diff --git a/src/load_prefs.php b/src/load_prefs.php
index ed9c63422b81c78322452eeec292730ea3569a40..bfc2e6b3284adeb7afbf9d6cb85214fa648879b9 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -186,6 +186,8 @@
    $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons');
    if ($location_of_buttons == '')
        $location_of_buttons = 'between';
    $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");
 
 
    do_hook("loading_prefs");
 
diff --git a/src/options.php b/src/options.php
index 71b0e3ea6c34cf5aa573fecf8b95644bc17af4f0..92ad97011ef7862319b307b5220190c9cb6cad48 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -92,9 +92,14 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       } 
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       } 
-      setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      if (isset($folderprefix))
+         setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       setPref($data_dir, $username, 'unseen_notify', $unseennotify);
       setPref($data_dir, $username, 'unseen_type', $unseentype);
       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>';
       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..9e50d84604e2d6d32b62c028c2fb3e8530e2cbef 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">
    </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>
 
 <?php if ($show_prefix_option == true) {   ?>   
          <tr>
@@ -74,7 +74,7 @@
          }
          if ($use_folder == true) {
             $box = $boxes[$i]['unformatted-dm'];
          }
          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
             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'];
          }
          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
             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>
 ?>
          <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>
                <?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>
             </td>
          </tr>
          <tr>
             <td valign=top align=right>
-               <br>
                <?php echo _("Unseen message notification type"); ?>:
             </td>
                <?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>
                <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 (isset($collapse_folders) && $collapse_folders) echo " checked"; ?>>
+                <?php echo _("Enable Collapseable Folders"); ?>
+            </td>
+         </tr>
          <?php do_hook("options_folders_inside"); ?>
          <tr>
             <td>&nbsp;
          <?php do_hook("options_folders_inside"); ?>
          <tr>
             <td>&nbsp;
Unnamed repository; edit this file 'description' to name the repository.