From cc75440de24b90028e2843598b2f62c664bfe4f5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 03 Jan 2012 04:55:38 -0500
Subject: [PATCH] - Prevent from PHP warnings
---
program/include/rcube_imap_generic.php | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 9768b4a..4d4698f 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -3249,28 +3249,30 @@
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;
}
}
--
Gitblit v1.9.1