X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=3d38e173f87a7952661bdc5e8b25c0af08035b76;hb=541506f3bbe3cfc966221c55c35e50e9bda6f181;hp=39382ea096619b015c5099d110c3991845a2884d;hpb=04632dbcbdd2793b533c66df10ba321441d03c2f;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index 39382ea0..3d38e173 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -7,59 +7,48 @@
     **  This is the code for the left bar.  The left bar shows the folders
     **  available, and has cookie information.
     **
+    **  $Id$
     **/
 
-   session_start();
-
-   if(!isset($username)) {
-      echo "You need a valid user and password to access this page!";
-      exit;
-   }
-
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
+   include('../src/validate.php');
+   include("../functions/array.php");
+   include("../functions/imap.php");
+   include("../functions/plugin.php");
 
    // open a connection on the imap port (143)
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
-
-   /** If it was a successful login, lets load their preferences **/
-   include("../src/load_prefs.php");
-
+   
    displayHtmlHeader();
 
+   if ($auto_create_special && ! isset($auto_create_done)) {
+   	  if (isset ($sent_folder) && $sent_folder != "none") {
+	  	 if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+		 	sqimap_mailbox_create ($imapConnection, $sent_folder, "");
+		 }
+	  }
+   	  if (isset ($trash_folder) && $trash_folder != "none") {
+	  	 if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)) {
+		 	sqimap_mailbox_create ($imapConnection, $trash_folder, "");
+		 }
+	  }
+	  $auto_create_done = true;
+	  session_register('auto_create_done');
+   }
 
-   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;
+   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, $collapse_folders;
 
+      $real_box = $box_array['unformatted'];
+      $mailbox = $box_array['formatted'];
       $mailboxURL = urlencode($real_box);
+      
+      $unseen = 0;
 
-      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_notify == 2 && $real_box == "INBOX") ||
+          $unseen_notify == 3) {
+         $unseen = sqimap_unseen_messages($imapConnection, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
             $unseen_found = true;
@@ -69,39 +58,57 @@
             $unseen_found = true;
          }
       }
-
-      $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;
-
-      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 ((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;';
       }
+          
+      $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_found) {
+      if (isset($unseen_found) && $unseen_found) {
          $line .= "&nbsp;<small>$unseen_string</small>";
       }
 
       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 .= "\n</small>\n";
+         if (! isset($numMessages))
+            $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+
+         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 .= "\n</small>\n";
+         }
       }
       $line .= "</NOBR>";
       return $line;
@@ -127,29 +134,65 @@
    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++) {
-      $line = "";
-      $mailbox = $boxes[$i]["formatted"];
-
-      if ($boxes[$i]["flags"]) {
-         $noselect = false;
-         for ($h = 0; $h < count($boxes[$i]["flags"]); $h++) {
-            if (strtolower($boxes[$i]["flags"][$h]) == "noselect")
-               $noselect = true;
+      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 ($noselect == true) {
+
+         if (in_array('noselect', $boxes[$i]['flags'])) {
             $line .= "<FONT COLOR=\"$color[10]\">";
-            $line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
-            $line .= "</FONT>";
+            if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+                $line .= str_replace(' ', '&nbsp;', $mailbox);
+                if (isset($boxes[$i]['parent']))
+                    $line .= FoldLink($boxes[$i]['unformatted'], $boxes[$i]['parent']);
+                elseif ($collapse_folders)
+                    $line .= '<tt>&nbsp;</tt>&nbsp;';
+            }
+            $line .= '</FONT>';
          } else {
-            $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
+            $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
          }
-      } else {
-         $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
+         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>