X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_delete.php;h=8bc2ff5aa91340893f7ac99460a3d6971de108e0;hp=57be1754a9b2db1163366b12d82015ee39bc659e;hb=7c1b84d979f4bbbcc8ce5d7423421123c4155107;hpb=b40316f9256e410ace42ec610ff07680800a6916

diff --git a/src/folders_delete.php b/src/folders_delete.php
index 57be1754..8bc2ff5a 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -3,25 +3,33 @@
    include("../functions/strings.php");
    include("../functions/page_header.php");
    include("../functions/imap.php");
+   include("../functions/mailbox.php");
 
-   $imapConnection = fsockopen($imapServerAddress, 143, &$errorNumber, &$errorString);
-   if (!$imapConnection) {
-      echo "Error connecting to IMAP Server.<br>";
-      echo "$errorNumber : $errorString<br>";
-      exit;
-   }
-   $serverInfo = fgets($imapConnection, 256);
+   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+
+   // switch to the mailbox, and get the number of messages in it.
+   selectMailbox($imapConnection, $mailbox, $numMessages);
 
-   fputs($imapConnection, "1 login $username $key\n");
-   $read = fgets($imapConnection, 1024);
-   echo $read;
+   $folder = getFolderNameMinusINBOX($mailbox);
+   $trash = getFolderNameMinusINBOX($trash_folder);
 
-   if ($subfolder == "INBOX")
-      fputs($imapConnection, "1 create \"user.$username.$folder_name\"\n");
-   else
-      fputs($imapConnection, "1 create \"user.$username.$subfolder.$folder_name\"\n");
+   /** check if they would like to move it to the trash folder or not */
+   if ($move_to_trash == true) {
+      createFolder($imapConnection, "user.$username.$trash.$folder");
+      echo "CREATING FOLDER:  user.$username.$trash.$folder<BR>";
+      if ($numMessages > 0)
+         $success = copyMessages($imapConnection, 1, $numMessages, $trash_folder);
+      else
+         $success = true;
+
+      if ($success == true)
+         removeFolder($imapConnection, "user.$username.$folder");
+   } else {
+      removeFolder($imapConnection, "user.$username.$folder");
+   }
 
-   fputs($imapConnection, "1 logout\n");
+   // Log out this session
+   fputs($imapConnection, "1 logout");
 
    echo "<BR><BR><A HREF=\"folders.php\">Return</A>";
 ?>