From 056d0da203c7b9ff86261d6869324a9c6e399e29 Mon Sep 17 00:00:00 2001 From: ullgren Date: Sat, 10 Nov 2001 21:18:59 +0000 Subject: [PATCH] Fixed bug #479867 - Turning Sqclock Off Not Working git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1716 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/left_main.php | 64 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/left_main.php b/src/left_main.php index a15cec3..30bd669 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -158,39 +158,41 @@ echo '
'; echo _("Folders") . "
\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(' ',' ',$clk); + + echo '
' . str_replace(' ',' ',_("Last Refresh")) + . ": $clk
"; } - $clk = str_replace(' ',' ',$clk); - - echo '
' . str_replace(' ',' ',_("Last Refresh")) - . ": $clk
"; /* Next, display the refresh button. */ echo '('; -- 1.9.1