From 9dbb62083978305f30b1be175e1c10a392e3fdb8 Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 21 Nov 2005 17:12:21 +0000
Subject: [PATCH] - Properly clean up temporary attachment files when saving as
 Draft   (#1358407)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10385 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog       | 2 ++
 src/compose.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 27dd2dee..5f06406d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -486,6 +486,8 @@ Version 1.5.1 -- CVS
     information.
   - Support for LIST-SUBSCRIBED extension. This speeds up the retrieval of
     the subscribed mailbox-list.
+  - Properly clean up temporary attachment files when saving as Draft
+    (#1358407)
 
 Version 1.5.0 - 2 February 2004
 -------------------------------
diff --git a/src/compose.php b/src/compose.php
index 768a8eed..66ddf4c3 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1459,6 +1459,10 @@ function saveAttachedFiles($session) {
     sqsession_register($compose_messages , 'compose_messages');
 }
 
+/**
+ * Given a composeMessage, recursively delete all temporary files in the
+ * attachment dir for each body part of that message.
+ */
 function ClearAttachments($composeMessage) {
     if ($composeMessage->att_local_name) {
         $attached_file = $composeMessage->att_local_name;
@@ -1642,6 +1646,7 @@ function deliverMessage($composeMessage, $draft=false) {
             sqimap_append_done ($imap_stream, $draft_folder);
             sqimap_logout($imap_stream);
             unset ($imap_deliver);
+            ClearAttachments($composeMessage);
             return $length;
         } else {
             $msg  = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder);
-- 
2.25.1