X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=a15cec3a95fc3e496fb1a511603f44599ff1a093;hb=889df97071b1c3faec90d59feb00e03fbe29ae50;hp=d6925c100089ea793e80800da8a2b0cc95c5b36d;hpb=a6d2e0ded21942633358a46282260c14746dd8c0;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index d6925c10..a15cec3a 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,14 +1,14 @@
 <?php
    /**
-    **  left_main.php
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  This is the code for the left bar.  The left bar shows the folders
-    **  available, and has cookie information.
-    **
-    **  $Id$
-    **/
+    * left_main.php
+    * Copyright (c) 1999-2001 The Squirrelmail Development Team
+    * Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    * This is the code for the left bar.  The left bar shows the folders
+    * available, and has cookie information.
+    *
+    * $Id$
+    */
 
     require_once('../src/validate.php');
     require_once('../functions/array.php');
@@ -21,32 +21,49 @@
 
     // open a connection on the imap port (143)
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
-   
+
     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, "");
-		 } else if (! sqimap_mailbox_is_subscribed($imapConnection, $sent_folder)) {
-		    sqimap_subscribe($imapConnection, $sent_folder);
-		 }
-	  }
-   	  if (isset ($trash_folder) && $trash_folder != "none") {
-	  	 if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)) {
-		 	sqimap_mailbox_create ($imapConnection, $trash_folder, "");
-		 } else if (! sqimap_mailbox_is_subscribed($imapConnection, $trash_folder)) {
-		    sqimap_subscribe($imapConnection, $trash_folder);
-		 }
-   }
-	  $auto_create_done = true;
-	  session_register('auto_create_done');
-   }
+    /* If requested and not yet complete, attempt to autocreate folders. */
+    if ($auto_create_special && ! isset($auto_create_done)) {
+        /* Autocreate the sent folder, if needed. */
+        if (isset ($sent_folder) && $sent_folder != 'none') {
+            if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+                sqimap_mailbox_create ($imapConnection, $sent_folder, '');
+            } else if (! sqimap_mailbox_is_subscribed($imapConnection, $sent_folder)) {
+                sqimap_subscribe($imapConnection, $sent_folder);
+            }
+        }
+
+            /* Autocreate the trash folder, if needed. */
+        if (isset ($trash_folder) && $trash_folder != 'none') {
+            if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)) {
+                sqimap_mailbox_create ($imapConnection, $trash_folder, '');
+            } else if (! sqimap_mailbox_is_subscribed($imapConnection, $trash_folder)) {
+                sqimap_subscribe($imapConnection, $trash_folder);
+            }
+        }
+
+        /* Autocreate the drafts folder, if needed. */
+        if (isset ($draft_folder) && $draft_folder != 'none') {
+            if (!sqimap_mailbox_exists ($imapConnection, $draft_folder)) {
+                sqimap_mailbox_create ($imapConnection, $draft_folder, '');
+            } else if (! sqimap_mailbox_is_subscribed($imapConnection, $draft_folder)) {
+                sqimap_subscribe($imapConnection, $draft_folder);
+            }
+        }
+
+          /* Let the world know that autocreation is complete! Hurrah! */
+        $auto_create_done = true;
+        session_register('auto_create_done');
+    }
 
    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;
+      global $draft_folder, $save_as_draft;
+      global $use_special_folder_color;
 
       $real_box = $box_array['unformatted'];
       $mailbox = str_replace('&nbsp;','',$box_array['formatted']);
@@ -56,10 +73,10 @@
       if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
           $mailbox = $regs[2];
       }
-      
+
       $unseen = 0;
 
-      if (($unseen_notify == 2 && $real_box == "INBOX") ||
+      if (($unseen_notify == 2 && $real_box == 'INBOX') ||
           $unseen_notify == 3) {
          $unseen = sqimap_unseen_messages($imapConnection, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
@@ -73,10 +90,14 @@
       }
       
       $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 ($use_special_folder_color) {
+          if ((strtolower($real_box) == 'inbox')
+                || (($real_box == $trash_folder) && ($move_to_trash))
+                || (($real_box == $sent_folder) && ($move_to_sent))
+                || (($real_box == $draft_folder) && ($save_as_draft))) {
+              $special_color = true;
+          }
+      }
          
       /* Start off with a blank line. */
       $line = '';
@@ -85,7 +106,7 @@
       if ($unseen > 0) { $line .= '<B>'; }
 
       /* Crate the link for this folder. */
-      $line .= "<A HREF=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" TARGET=RIGHT STYLE=\"text-decoration:none\">";
+      $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);
@@ -118,7 +139,11 @@
       return ($line);
    }
 
-    if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
+   /**********************************/
+   /* END OF FUNCTION - BACK TO MAIN */
+   /**********************************/
+
+    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";
@@ -130,14 +155,50 @@
 
     $boxes = sqimap_mailbox_list($imapConnection);
 
-    echo "<CENTER><FONT SIZE=4><B>";
+    echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
-    echo "<SMALL>(<A HREF=\"../src/left_main.php\" TARGET=\"left\">";
+    /* First, display the clock. */
+    if ($hour_format == 1) {
+      if ($date_format == 4) {
+         $hr = "G:i:s";
+      } else {
+         $hr = "G:i";
+      }
+    } else {  
+      if ($date_format == 4) {
+         $hr = "g:i:s a";
+      } else {
+         $hr = "g:i a";
+      }
+    }
+    
+    switch( $date_format ) {
+    case 1:
+      $clk = date("m/d/y ".$hr, time()); 
+      break;
+    case 2:
+      $clk = date("d/m/y ".$hr, time()); 
+      break;
+    case 4:
+    case 5:
+      $clk = date($hr, time()); 
+      break;
+    default:   
+      $clk = date("D, ".$hr, time());
+    }
+    $clk = str_replace(' ','&nbsp;',$clk);
+
+    echo '<CENTER><SMALL>' . str_replace(' ','&nbsp;',_("Last Refresh"))
+         .  ": $clk</SMALL></CENTER>";
+
+    /* Next, display the refresh button. */
+    echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">';
     echo _("refresh folder list");
-    echo "</A>)</SMALL></CENTER><BR>";
+    echo '</A>)</SMALL></CENTER><BR>';
     $delimeter = sqimap_get_delimiter($imapConnection);
 
+    /* Lastly, display the folder list. */
     if (isset($collapse_folders) && $collapse_folders) {
         /* If directed, collapse or uncollapse a folder. */
         if (isset($fold)) {
@@ -176,6 +237,7 @@
             if (in_array('noselect', $boxes[$i]['flags'])) {
                 $line .= "<FONT COLOR=\"$color[10]\">";
                 if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+                    $mailbox = str_replace('&nbsp;','',$mailbox);
                     $line .= str_replace(' ', '&nbsp;', $mailbox);
                 }
                 $line .= '</FONT>';
@@ -238,7 +300,7 @@
      * status and parent (or not parent) status for all children boxes.
      */
     function compute_folder_children(&$parbox, $boxcount) {
-        global $boxes;
+        global $boxes, $data_dir, $username;
         $nextbox = $parbox + 1;
 
         /* Retreive the name for the parent box. */
@@ -254,7 +316,10 @@
         $boxes[$parbox]['collapse'] = $collapse;
 
         /* Otherwise, get the name of the next box. */
-        $nextbox_name = $boxes[$nextbox]['unformatted'];
+	if (isset($boxes[$nextbox]['unformatted']))
+           $nextbox_name = $boxes[$nextbox]['unformatted'];
+	else
+	   $nextbox_name = '';
 
         /* Compute any children boxes for this box. */
         while (($nextbox < $boxcount) &&
@@ -278,5 +343,5 @@
         /* Set the parent box to the current next box. */
         $parbox = $nextbox;
     }
+    echo "</BODY></HTML>\n";
 ?>
-</BODY></HTML>