projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed temp file write to from due to leftover file possiblity, At least they...
[squirrelmail.git]
/
src
/
empty_trash.php
diff --git
a/src/empty_trash.php
b/src/empty_trash.php
index 2460d8f8489165b7420947d97daa7a8e5efeccd9..ecc1ef18a2e08cb7ea116a3054312b02e098fc2e 100644
(file)
--- a/
src/empty_trash.php
+++ b/
src/empty_trash.php
@@
-1,4
+1,6
@@
-<?
+<?php
+ session_start();
+
include("../config/config.php");
include("../functions/strings.php");
include("../functions/page_header.php");
include("../config/config.php");
include("../functions/strings.php");
include("../functions/page_header.php");
@@
-11,7
+13,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);
@@
-37,17
+39,14
@@
$j = 0;
for ($i = 0;$i < count($boxes);$i++) {
if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == ($mailbox . $dm)) {
$j = 0;
for ($i = 0;$i < count($boxes);$i++) {
if (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == ($mailbox . $dm)) {
- addChildNodeToTree($boxes[$i]["unformatted"], $foldersTree);
+ addChildNodeToTree($boxes[$i]["unformatted"], $
boxes[$i]["unformatted-dm"], $
foldersTree);
}
}
// 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);
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";
displayPageHeader($color, $mailbox);
messages_deleted_message($trash_folder, $sort, $startMessage, $color);
sqimap_logout($imap_stream);
displayPageHeader($color, $mailbox);
messages_deleted_message($trash_folder, $sort, $startMessage, $color);
sqimap_logout($imap_stream);