X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=361e017a651bea07c67b901e0a4d91853c2789ec;hp=50155aa298f5846b2353cca9bb323534efb29946;hb=26a425f5b596dd84259471f4eb6deacc7c88a113;hpb=4aaea201d977a4ee3c1074118348df36d07d0384
diff --git a/src/left_main.php b/src/left_main.php
index 50155aa2..361e017a 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,14 +1,14 @@
0) {
$urlMailbox = urlencode($real_box);
$line .= "\n\n";
- $line .= " ("._("purge").")";
+ $line .= " ("._("empty").")";
$line .= "\n\n";
}
}
@@ -118,6 +139,10 @@
return ($line);
}
+ /**********************************/
+ /* END OF FUNCTION - BACK TO MAIN */
+ /**********************************/
+
if (isset($left_refresh) && ($left_refresh != 'None') && ($left_refresh != '')) {
echo "\n";
echo "\n";
@@ -133,11 +158,49 @@
echo '
';
echo _("Folders") . "
\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(' ',' ',$clk);
+
+ echo '' . str_replace(' ',' ',_("Last Refresh"))
+ . ": $clk";
+ }
+
+ /* Next, display the refresh button. */
echo '(';
echo _("refresh folder list");
echo ')
';
$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)) {
@@ -176,6 +239,7 @@
if (in_array('noselect', $boxes[$i]['flags'])) {
$line .= "";
if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+ $mailbox = str_replace(' ','',$mailbox);
$line .= str_replace(' ', ' ', $mailbox);
}
$line .= '';