From 832bfcad0171a020cd3e2761bacaab4a4ea4426a Mon Sep 17 00:00:00 2001
From: nehresma <nehresma@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 31 Jan 2000 16:50:01 +0000
Subject: [PATCH] fixed a bug when deleting messages and the flag for moving to
 trash was set, but there was no trash box to move to.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@188 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/functions/imap.php b/functions/imap.php
index 190df98f..267bce91 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -186,6 +186,8 @@
    /** Sends back two arrays, boxesFormatted and boxesUnformatted **/
    function getFolderList($imapConnection, &$boxes) {
       require ("../config/config.php");
+      if (!function_exists("ary_sort"))
+         include("../functions/array.php");
 
       /** First we get the inbox **/
       fputs($imapConnection, "1 LIST \"\" INBOX\n");
@@ -290,7 +292,7 @@
 
    function deleteMessages($imapConnection, $a, $b, $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox) {
       /** check if they would like to move it to the trash folder or not */
-      if ($move_to_trash == true) {
+      if (($move_to_trash == true) && (folderExists($imapConnection, $trash_folder))) {
          $success = copyMessages($imapConnection, $a, $b, $trash_folder);
          if ($success == true)
             setMessageFlag($imapConnection, $a, $b, "Deleted");
@@ -314,4 +316,14 @@
       }
       return $full_line;
    }
+
+   function folderExists($imapConnection, $folderName) {
+      getFolderList($imapConnection, $folders);
+      $found = false;
+      for ($i = 0; ($i < count($folders)) && (!$found); $i++) {
+         if ($folders[$i]["UNFORMATTED"] == $folderName)
+            $found = true;
+      }
+      return $found;
+   }
 ?>
-- 
2.25.1