projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added fix for emptying trash where you don't actually delete the Trash folder,
[squirrelmail.git]
/
src
/
empty_trash.php
diff --git
a/src/empty_trash.php
b/src/empty_trash.php
index ba62c0854fb5314ce2530eaa7ac776ceb200c3e4..85450fb21659b460808fd288d774d2fc59c811c1 100644
(file)
--- a/
src/empty_trash.php
+++ b/
src/empty_trash.php
@@
-11,7
+11,7
@@
include("../src/load_prefs.php");
include("../src/load_prefs.php");
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, 0);
+ $imap_stream = sqimap_login($username, $key, $imapServerAddress,
$imapPort,
0);
sqimap_mailbox_list($imap_stream, $boxes);
sqimap_mailbox_list($imap_stream, $boxes);
@@
-42,9
+42,7
@@
}
// now lets go through the tree and delete the folders
}
// now lets go through the tree and delete the folders
- walkTreeInPreOrderDeleteFolders(0, $imap_stream, $foldersTree);
- // now lets create a new, fresh trash folder
- sqimap_mailbox_create($imap_stream, "$trash_folder", "");
+ walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree);
sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages);
echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages);
echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";