X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=361e017a651bea07c67b901e0a4d91853c2789ec;hb=d2c47f00c6069f0e42dc1d99f2f23b53a0a7a118;hp=f0699bfe4ea8bcdf21f1e9368ad5f06ff4ef462e;hpb=4dea7315db37a788bb396ce27788c394e6cba224;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index f0699bfe..361e017a 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,40 +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);
-		 }
-          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);
-                 }
-          }
-     }
-	  $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']);
@@ -64,7 +73,7 @@
       if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
           $mailbox = $regs[2];
       }
-      
+
       $unseen = 0;
 
       if (($unseen_notify == 2 && $real_box == 'INBOX') ||
@@ -81,11 +90,14 @@
       }
       
       $special_color = false;
-      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;
+      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 = '';
@@ -118,7 +130,7 @@
          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 .= "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("empty")."</A>)";
             $line .= "\n</small>\n";
          }
       }
@@ -127,6 +139,10 @@
       return ($line);
    }
 
+   /**********************************/
+   /* 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"; 
@@ -142,11 +158,49 @@
     echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
+    if ($date_format != 6) { 
+        /* 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>';
     $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)) {
@@ -185,6 +239,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>';