From 2f7e7b8c4d59ae6c0389bab08eb13a5a9f95557e Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 4 Sep 2006 12:26:30 +0000
Subject: Little improvements for message parsing and encoding

git-svn-id: https://svn.roundcube.net/trunk@336 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc       | 2 +-
 roundcubemail/program/include/rcube_imap.inc | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 921494829..ae7d50b9f 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -842,7 +842,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
   $from = strtoupper($from);
   $to = $to==NULL ? strtoupper($GLOBALS['CHARSET']) : strtoupper($to);
 
-  if ($from==$to || $str=='')
+  if ($from==$to || $str=='' || empty($from))
     return $str;
 
   // convert charset using mbstring module  
diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index bcbea816e..c4dfd2023 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -1010,10 +1010,11 @@ class rcube_imap
 	// get part size
 	if (!empty($part[6]) && $part[6]!='NIL')
 	  $struct->size = intval($part[6]);
-	  
+
 	// read part disposition
     $di = count($part) - 2;
-    if (is_array($part[$di]))
+    if ((is_array($part[$di]) && count($part[$di]) == 2 && is_array($part[$di][1])) ||
+        (is_array($part[--$di]) && count($part[$di]) == 2))
       {
       $struct->disposition = strtolower($part[$di][0]);
 
-- 
cgit v1.2.3