From ad6787f093ea69dccc3b49c762dc9cfa8f31b387 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Mon, 29 Nov 1999 19:32:39 +0000 Subject: [PATCH] A lot of code optimization with regard to deleting and creating folders. Also, emptying trash refreshes the folder list. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@41 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/config.php | 11 +++++------ functions/display_messages.php | 2 +- src/empty_trash.php | 7 +++---- src/folders.php | 4 +--- src/webmail.php | 23 +++++++++++++++++++++-- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/config/config.php b/config/config.php index 4cbbb46b..36bd5d8c 100644 --- a/config/config.php +++ b/config/config.php @@ -37,11 +37,10 @@ $auto_expunge = true; folders can. A couple of examples would be "INBOX.Trash", "INBOX.Drafts". We have them set to Netscape's default mailboxes, but this obviously can be changed. To add one, just add a new number to the array. - - NOTE: INBOX is handled separately. Do not put it in this list */ -$special_folders[0] = $trash_folder; -$special_folders[1] = "INBOX.Sent"; -$special_folders[2] = "INBOX.Drafts"; -$special_folders[3] = "INBOX.Templates"; +$special_folders[0] = "INBOX"; +$special_folders[1] = $trash_folder; +$special_folders[2] = "INBOX.Sent"; +$special_folders[3] = "INBOX.Drafts"; +$special_folders[4] = "INBOX.Templates"; ?> diff --git a/functions/display_messages.php b/functions/display_messages.php index 6fb18005..bebc98bf 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -57,7 +57,7 @@ echo " Messages Deleted"; echo " "; echo "
The selected messages were deleted successfully.
\n"; - echo " "; + echo " "; echo " Click here to return to $mailbox"; echo " ."; echo " "; diff --git a/src/empty_trash.php b/src/empty_trash.php index bc554d63..ea38697e 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -45,11 +45,10 @@ removeFolder($imapConnection, $thisfolder); } } - // Log out this session - fputs($imapConnection, "1 logout"); + selectMailbox($imapConnection, $trash_folder, $numMessages); echo ""; displayPageHeader($mailbox); - - messages_deleted_message("INBOX", $sort, $startMessage); + messages_deleted_message($trash_folder, $sort, $startMessage); + fputs($imapConnection, "1 logout"); ?> diff --git a/src/folders.php b/src/folders.php index d4536302..128399b2 100644 --- a/src/folders.php +++ b/src/folders.php @@ -23,12 +23,10 @@ for ($i = 0; $i < count($boxesUnformatted); $i++) { $use_folder = true; for ($p = 0; $p < count($special_folders); $p++) { - if (substr($boxesUnformatted[$i], 0, strlen($special_folders[$p])) == $special_folders[$p]) { + if ($boxesUnformatted[$i] == $special_folders[$p]) { $use_folder = false; } } - if ($boxesUnformatted[$i] == "INBOX") - $use_folder = false; if ($use_folder == true) echo "