integrated attachment_common into the core

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index a15cec3a95fc3e496fb1a511603f44599ff1a093..3e2ab9ff3954e5899f1a0716729adbb52530a776 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.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";
          }
       }
@@ -143,7 +143,7 @@
    /* END OF FUNCTION - BACK TO MAIN */
    /**********************************/
 
-    if (isset($left_refresh) && ($left_refresh != 'None') && ($left_refresh != '')) {
+    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";
@@ -158,39 +158,41 @@
     echo '<CENTER><FONT SIZE=4><B>';
     echo _("Folders") . "</B><BR></FONT>\n\n";
 
-    /* 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";
-      }
-    }
+    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>";
     }
-    $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">';