More work done on the options stuff.

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index 6921de9be661bb12685c53537832d8099c2eea5b..871482426608e4f268e3cd8a23a884b59935f739 100644 (file)
--- 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,42 +21,42 @@
 
     // 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 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 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 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);
-                 }
-          }
+            /* 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');
-   }
+        $auto_create_done = true;
+        session_register('auto_create_done');
+    }
 
    function formatMailboxName($imapConnection, $box_array, $delimeter) {
       global $folder_prefix, $trash_folder, $sent_folder;
@@ -73,7 +73,7 @@
       if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
           $mailbox = $regs[2];
       }
-      
+
       $unseen = 0;
 
       if (($unseen_notify == 2 && $real_box == 'INBOX') ||
@@ -158,39 +158,49 @@
     echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
-    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";
-    }
+    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()); 
+       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>";
     }
 
-    echo "<center><small>$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)) {