[mms] IMP no longer uses MDN status stored in the maillog backend by …

…default.
horde · Nov 18, 2014 · b68f9fd · b68f9fd
1 parent edeb1ce
commit b68f9fd
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/imp/config/conf.xml b/imp/config/conf.xml
@@ -95,7 +95,14 @@
    forwarding/replying/redirecting a message. (These entries could potentially
    be stored forever, so sufficient storage space is required.)">history
     <case name="none" desc="None" />
-    <case name="history" desc="Horde History" />
+    <case name="history" desc="Horde History">
+     <configboolean name="mdn_history" required="false" desc="In old versions
+     of IMP (&lt; 6.0), message disposition notification (MDN) status was
+     stored in the maillog. Newer versions, and the preferred method, stores
+     that information on the IMAP server. For performance reasons, MDN status
+     on IMAP servers will not use the maillog data unless this option is
+     enabled.">false</configboolean>
+    </case>
    </configswitch>
   </configsection>
  </configtab>

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v7.0.0-git
 ----------
 
+[mms] IMP no longer uses MDN status stored in the maillog backend by default.
 [mms] Add ability to download individual files from within a .tgz attachment.
 [mms] Improved display of contents of ZIP attachments.
 [mms] Contacts popup now does address search dynamically, without the need to

diff --git a/imp/lib/Maillog/Storage/History.php b/imp/lib/Maillog/Storage/History.php
@@ -54,6 +54,8 @@ public function saveLog(
         IMP_Maillog_Message $msg, IMP_Maillog_Log_Base $log
     )
     {
+        global $conf;
+
         $data = array(
             'action' => $log->action,
             'ts' => $log->timestamp
@@ -64,6 +66,13 @@ public function saveLog(
         case 'redirect':
             $data['recipients'] = $log->recipients;
             break;
+
+        case 'mdn':
+            /* Unless configured, this driver doesn't support MDN. */
+            if (empty($conf['maillog']['mdn_history'])) {
+                return false;
+            }
+            break;
         }
 
         try {
@@ -92,8 +101,18 @@ public function saveLog(
      */
     public function getLog(IMP_Maillog_Message $msg, array $types = array())
     {
+        global $conf;
+
         $out = array();
 
+        /* Unless configured, this driver doesn't support MDN. */
+        if (!empty($types) && empty($conf['maillog']['mdn_history'])) {
+            $types = array_diff($types, array('IMP_Maillog_Log_Mdn'));
+            if (empty($types)) {
+                return $out;
+            }
+        }
+
         try {
             $history = $this->_history->getHistory(
                 $this->_getUniqueHistoryId($msg)

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [mms] IMP no longer uses MDN status stored in the maillog backend by default.
 * [mms] Add ability to download individual files from within a .tgz attachment.
 * [mms] Improved display of contents of ZIP attachments.
 * [mms] Contacts popup now does address search dynamically, without the need to reload the page.