Imported Upstream version 0.7.1

[roundcube.git] / program / include / rcube_imap_generic.php

diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 4c002fc14d5ef0a78ccbd2331cf2aaa62a493189..a630a24675214d8a2c1a70e91e0df2260c8f2583 100644 (file)
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -22,7 +22,7 @@
  | Author: Ryo Chijiiwa <Ryo@IlohaMail.org>                              |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_imap_generic.php 5402 2011-11-09 10:03:54Z alec $
+ $Id: rcube_imap_generic.php 5691 2012-01-03 09:57:14Z alec $
 
 */
 
@@ -3232,29 +3232,31 @@ class rcube_imap_generic
            if (!is_array($a)) {
             return false;
         }
+
+        if (empty($part)) {
+                   return $a;
+           }
+
+        $ctype = is_string($a[0]) && is_string($a[1]) ? $a[0] . '/' . $a[1] : '';
+
+        if (strcasecmp($ctype, 'message/rfc822') == 0) {
+            $a = $a[8];
+        }
+
            if (strpos($part, '.') > 0) {
-                   $original_part = $part;
-                   $pos = strpos($part, '.');
-                   $rest = substr($original_part, $pos+1);
-                   $part = substr($original_part, 0, $pos);
-                   if ((strcasecmp($a[0], 'message') == 0) && (strcasecmp($a[1], 'rfc822') == 0)) {
-                           $a = $a[8];
-                   }
+                   $orig_part = $part;
+                   $pos       = strpos($part, '.');
+                   $rest      = substr($orig_part, $pos+1);
+                   $part      = substr($orig_part, 0, $pos);
+
                    return self::getStructurePartArray($a[$part-1], $rest);
            }
-        else if ($part>0) {
-                   if (!is_array($a[0]) && (strcasecmp($a[0], 'message') == 0)
-                && (strcasecmp($a[1], 'rfc822') == 0)) {
-                           $a = $a[8];
-                   }
+        else if ($part > 0) {
                    if (is_array($a[$part-1]))
                 return $a[$part-1];
                    else
                 return $a;
            }
-        else if (($part == 0) || (empty($part))) {
-                   return $a;
-           }
     }
 
     /**