update
[squirrelmail.git] / src / folders_delete.php
index 3af351a..8bc2ff5 100644 (file)
@@ -3,50 +3,31 @@
    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);
-
-   fputs($imapConnection, "1 login $username $key\n");
-   $read = fgets($imapConnection, 1024);
-   echo $read;
-
-   if (strpos($read, "NO")) {
-      error_username_password_incorrect();
-      exit;
-   }
+   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
 
    // switch to the mailbox, and get the number of messages in it.
    selectMailbox($imapConnection, $mailbox, $numMessages);
 
-   // Marks the selected messages ad 'Deleted'
-   $j = 0;
-   $i = 0;
-
-   while ($j < count($msg)) {
-      if ($msg[$i]) {
-         /** check if they would like to move it to the trash folder or not */
-         if ($move_to_trash == true) {
-            createFolder($imapConnection, "user.$username.$folder");
-            $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $trash_folder);
-            if ($success == true)
-               setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
-         } else {
-            setMessageFlag($imapConnection, $msg[$i], "Deleted");
-         }
-         $j++;
-      }
-      $i++;
+   $folder = getFolderNameMinusINBOX($mailbox);
+   $trash = getFolderNameMinusINBOX($trash_folder);
+
+   /** 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");
    }
 
-   if ($auto_expunge == true)
-      expungeBox($imapConnection, $mailbox, $numMessages);
-
    // Log out this session
    fputs($imapConnection, "1 logout");