From 8eea5dd306881cc75bf2223f61eb56b738478073 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Tue, 7 Dec 1999 19:16:35 +0000 Subject: [PATCH] moved "empty trash" to the left bar so it's always visible git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@67 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 2 -- src/left_main.php | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 3023472f..9d40e699 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -215,8 +215,6 @@ echo " "; echo " \n"; - if (($move_to_trash == true) && ($mailbox == $trash_folder)) - echo " Empty Trash"; echo "\n\n\n"; echo ""; diff --git a/src/left_main.php b/src/left_main.php index 49043be1..292f4b55 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -31,7 +31,7 @@ } - + "; + echo ""; echo "$org_name
"; echo "Folders"; echo "
"; @@ -64,11 +64,12 @@ $mailboxURL = urlencode($mailbox); echo ""; - if ($doBold == true) - echo ""; echo readShortMailboxName($mailbox, "."); - if ($doBold == true) - echo ""; + if (($move_to_trash == true) && ($mailbox == $trash_folder)) { + $urlMailbox = urlencode($mailbox); + selectMailbox($imapConnection, $mailbox, $numNessages); + echo " (empty)"; + } echo "
\n"; } echo ""; -- 2.25.1