From be2380fb47b05a222ec5b22deff36d5156a8c943 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 13:08:41 -0500
Subject: [PATCH] Added labels for LDAP search
---
program/lib/Mail/mimeDecode.php | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/program/lib/Mail/mimeDecode.php b/program/lib/Mail/mimeDecode.php
index 92827b7..8514814 100644
--- a/program/lib/Mail/mimeDecode.php
+++ b/program/lib/Mail/mimeDecode.php
@@ -247,7 +247,7 @@
$return->ctype_primary = $regs[1];
$return->ctype_secondary = $regs[2];
}
-
+
if (isset($content_type['other'])) {
while (list($p_name, $p_value) = each($content_type['other'])) {
$return->ctype_parameters[$p_name] = $p_value;
@@ -294,8 +294,9 @@
$this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
return false;
}
-
+
$default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
+
$parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
for ($i = 0; $i < count($parts); $i++) {
list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
@@ -498,14 +499,8 @@
}
$tmp = explode('--' . $boundary, $input);
- $count = count($tmp);
- // when boundaries are set correctly we should have at least 3 parts;
- // if not, return the last one (tbr)
- if ($count<3)
- return array($tmp[$count-1]);
-
- for ($i = 1; $i < $count - 1; $i++) {
+ for ($i = 1; $i < count($tmp) - 1; $i++) {
$parts[] = $tmp[$i];
}
--
Gitblit v1.9.1