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

diff --git a/src/left_main.php b/src/left_main.php
index c73b998d..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');
@@ -130,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";
          }
       }
@@ -158,40 +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>' . _("Last Refresh") . ":<br>$clk";
-    echo '</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)) {