X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=d4c493e79927c234d9ae0e4f2559c9504f6751e7;hb=d068c0ec5447e8f373ebd536b08ed902c00de0f5;hp=e0c08d0c61fc83bd73c521fb20dd98318fc3df49;hpb=d3cdb279bd61b172926b51d41d09c8a691d6c347;p=squirrelmail.git
diff --git a/src/folders_delete.php b/src/folders_delete.php
index e0c08d0c..d4c493e7 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -1,39 +1,44 @@
\n";
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
- getFolderList($imapConnection, $boxes);
+ echo "";
+ echo "\n";
+ displayPageHeader($color, "None");
+
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+ $boxes = sqimap_mailbox_list ($imapConnection);
+ $dm = sqimap_get_delimiter($imapConnection);
- $dm = findMailboxDelimeter($imapConnection);
/** lets see if we CAN move folders to the trash.. otherwise, just delete them **/
- for ($i = 0; $i < count($boxes[$i]["UNFORMATTED"]); $i++) {
- if ($boxes[$i]["UNFORMATTED"] == $trash_folder)
- $tmp_trash_folder = $boxes[$i]["RAW"];
- }
-
- $tmpflags = getMailboxFlags($tmp_trash_folder);
- $can_move_to_trash = true;
- for ($i = 0; $i < count($tmpflags); $i++) {
- if (strtolower($tmpflags[$i]) == "noinferiors")
- $can_move_to_trash = false;
+ for ($i = 0; $i < count($boxes[$i]["unformatted"]); $i++) {
+ if ($boxes[$i]["unformatted"] == $trash_folder) {
+ $can_move_to_trash = true;
+ for ($i = 0; $i < count($tmpflags); $i++) {
+ if (strtolower($tmpflags[$i]) == "noinferiors")
+ $can_move_to_trash = false;
+ }
+ }
}
/** Lets start removing the folders and messages **/
if (($move_to_trash == true) && ($can_move_to_trash == true)) { /** if they wish to move messages to the trash **/
/** Creates the subfolders under $trash_folder **/
for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- $folderWithoutINBOX = getFolderNameMinusINBOX($boxes[$i]["UNFORMATTED"], $dm);
- $flags = getMailboxFlags($boxes[$i]["RAW"]);
+ if (($boxes[$i]["unformatted"] == $mailbox) ||
+ (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
+ $folderWithoutINBOX = getFolderNameMinusINBOX($boxes[$i]["unformatted"], $dm);
+ $flags = getMailboxFlags($imapConnection, $boxes[$i]["raw"]);
for ($b = 0; $b < count($flags); $b++) {
$type = $flags[$b];
}
@@ -41,40 +46,48 @@
}
}
for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- selectMailbox($imapConnection, $boxes[$i]["UNFORMATTED"], $numMessages);
- $folder = getFolderNameMinusINBOX($boxes[$i]["UNFORMATTED"]);
+ if (($boxes[$i]["unformatted"] == $mailbox) ||
+ (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
+ sqimap_mailbox_create($imapConnection, $boxes[$i]["unformatted"], $numMessages);
+ $folder = $boxes[$i]["unformatted"];
if ($numMessages > 0)
- $success = copyMessages($imapConnection, 1, $numMessages, "$trash_folder" . $dm . "$folder");
+ $success = sqimap_messages_copy($imapConnection, 1, $folder);
else
$success = true;
if ($success == true)
- removeFolder($imapConnection, $boxes[$i]["UNFORMATTED"]);
+ sqimap_mailbox_delete($imapConnection, $boxes[$i]["unformatted"]);
}
}
} else { /** if they do NOT wish to move messages to the trash (or cannot)**/
fputs($imapConnection, "1 LIST \"$mailbox\" *\n");
- $data = imapReadData($imapConnection , "1", false, $response, $message);
+ $data = sqimap_read_data($imapConnection, "1", false, $response, $message);
while (substr($data[0], strpos($data[0], " ")+1, 4) == "LIST") {
for ($i = 0; $i < count($boxes); $i++) {
- if (($boxes[$i]["UNFORMATTED"] == $mailbox) ||
- (substr($boxes[$i]["UNFORMATTED"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
- removeFolder($imapConnection, $boxes[$i]["UNFORMATTED"]);
+ if (($boxes[$i]["unformatted"] == $mailbox) ||
+ (substr($boxes[$i]["unformatted"], 0, strlen($mailbox . $dm)) == $mailbox . $dm)) {
+ sqimap_mailbox_delete($imapConnection, $boxes[$i]["unformatted"], $dm);
}
}
fputs($imapConnection, "1 LIST \"$mailbox\" *\n");
- $data = imapReadData($imapConnection , "1", false, $response, $message);
+ $data = sqimap_read_data($imapConnection , "1", false, $response, $message);
}
}
/** Log out this session **/
fputs($imapConnection, "1 logout");
- echo "
Return";
+ echo "";
+ echo "
";
+ echo _("Folder Deleted!");
+ echo "
";
+ echo _("The folder has been successfully deleted.");
+ echo "
";
+ echo _("Click here");
+ echo " ";
+ echo _("to continue.");
+ echo "";
+
echo "";
?>
-
-