From 765fdeb5b5269f7647972046bac3d0054a6b7946 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 3 Oct 2011 13:13:44 +0000
Subject: - Improved performance of draft saving by usage of APPENDUID response
 if available (skipped SEARCH call)

---
 program/steps/mail/sendmail.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 9ea53ab29..deddb45e8 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -624,7 +624,7 @@ if (!$savedraft)
   // save message sent time
   if (!empty($CONFIG['sendmail_delay']))
     $RCMAIL->user->save_prefs(array('last_message_time' => time()));
-  
+
   // set replied/forwarded flag
   if ($_SESSION['compose']['reply_uid'])
     $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED', $_SESSION['compose']['mailbox']);
@@ -700,6 +700,7 @@ if ($store_target) {
 
   if ($olddraftmessageid) {
     // delete previous saved draft
+    // @TODO: use message UID (remember to check UIDVALIDITY) to skip this SEARCH
     $a_deleteid = $IMAP->search_once($CONFIG['drafts_mbox'],
         'HEADER Message-ID '.$olddraftmessageid, true);
 
@@ -723,9 +724,12 @@ else if ($mailbody_file) {
 if ($savedraft) {
   $msgid = strtr($message_id, array('>' => '', '<' => ''));
 
-  // remember new draft-uid
-  $draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
-  $_SESSION['compose']['param']['draft_uid'] = $draftuids[0];
+  // remember new draft-uid ($saved could be an UID or TRUE here)
+  if (is_bool($saved)) {
+    $draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
+    $saved     = $draftuids[0];
+  }
+  $_SESSION['compose']['param']['draft_uid'] = $saved;
 
   // display success
   $OUTPUT->show_message('messagesaved', 'confirmation');
-- 
cgit v1.2.3