[mms] Fix setting MIME IDs when a message/rfc822 part is the base of …

…the part object.
horde · Jan 16, 2015 · ad1b4f2 · ad1b4f2
1 parent 7b9feee
commit ad1b4f2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
@@ -1604,8 +1604,7 @@ public function buildMimeIds($id = null, $rfc822 = false)
                 $this->setMimeId($id . '1');
             } else {
                 if (empty($id) && ($this->getType() == 'message/rfc822')) {
-                    $this->setMimeId('1');
-                    $id = '1.';
+                    $this->setMimeId('1.0');
                 } else {
                     $this->setMimeId($id . '0');
                 }
@@ -1664,12 +1663,28 @@ public function contentTypeMap($sort = true)
         }
 
         if ($sort) {
-            uksort($map, 'strnatcmp');
+            uksort($map, array($this, '_contentTypeMapSort'));
         }
 
         return $map;
     }
 
+    /**
+      */
+    protected function _contentTypeMapSort($a, $b)
+    {
+        if (substr($a, -2) === '.0') {
+            if (substr($a, 0, -2) == $b) {
+                return -1;
+            }
+        } elseif ((substr($b, 0, -2) === '.0') &&
+                  (substr($b, 0, -2) == $a)) {
+            return 1;
+        }
+
+        return strnatcmp($a, $b);
+    }
+
     /**
      * Is this the base MIME part?
      *

diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml
@@ -28,7 +28,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix setting MIME IDs when a message/rfc822 part is the base of the part object.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1602,7 +1602,7 @@
    <date>2014-12-29</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix setting MIME IDs when a message/rfc822 part is the base of the part object.
    </notes>
   </release>
  </changelog>

diff --git a/framework/Mime/test/Horde/Mime/PartTest.php b/framework/Mime/test/Horde/Mime/PartTest.php
@@ -696,6 +696,31 @@ public function setCharsetProvider()
         );
     }
 
+    public function testIdSortingInMessageRfc822Part()
+    {
+        $part = new Horde_Mime_Part();
+        $part->setType('message/rfc822');
+
+        $part1 = new Horde_Mime_Part();
+        $part1->setType('multipart/alternative');
+        $part->addPart($part1);
+
+        $part2 = new Horde_Mime_Part();
+        $part2->setType('text/plain');
+        $part1->addPart($part2);
+
+        $part3 = new Horde_Mime_Part();
+        $part3->setType('text/html');
+        $part1->addPart($part3);
+
+        $part->buildMimeIds();
+
+        $this->assertEquals(
+            array('1.0', '1', '1.1', '1.2'),
+            array_keys($part->contentTypeMap(true))
+        );
+    }
+
     protected function _getTestPart()
     {
         $part = new Horde_Mime_Part();