cvs: pear /Mail_Mime mimeDecode.php
| From: | Richard Heyes | Date: | Wed, 03 Apr 2002 20:36:36 +0000 |
| Subject: | cvs: pear /Mail_Mime mimeDecode.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-3010@lists.php.net to get a copy of this message | ||
richard Wed Apr 3 15:36:36 2002 EDT
Modified files:
/pear/Mail_Mime mimeDecode.php
Log:
* ws
Index: pear/Mail_Mime/mimeDecode.php
diff -u pear/Mail_Mime/mimeDecode.php:1.25 pear/Mail_Mime/mimeDecode.php:1.26
--- pear/Mail_Mime/mimeDecode.php:1.25 Wed Apr 3 14:53:45 2002
+++ pear/Mail_Mime/mimeDecode.php Wed Apr 3 15:36:35 2002
@@ -48,7 +48,7 @@
* perhaps even message/partial.
*
* @author Richard Heyes <richard@phpguru.org>
-* @version $Revision: 1.25 $
+* @version $Revision: 1.26 $
* @package Mail
*/
@@ -253,7 +253,7 @@
$this->_include_bodies ? $return->body = ($this->_decode_bodies ?
$this->_decodeBody($body, $encoding) : $body) : null;
break;
- case 'multipart/parallel':
+ case 'multipart/parallel':
case 'multipart/report': // RFC1892
case 'multipart/signed': // PGP
case 'multipart/digest':
@@ -313,18 +313,18 @@
$return = array();
if (!empty($structure->parts)) {
if ($mime_number != '') {
- $structure->mime_id = $prepend . $mime_number;
+ $structure->mime_id = $prepend . $mime_number;
$return[$prepend . $mime_number] = &$structure;
}
for ($i = 0; $i < count($structure->parts); $i++) {
-
- if (!empty($structure->headers['content-type']) AND
substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/')
{
- $prepend = $prepend . $mime_number . '.';
- $_mime_number = '';
- } else {
- $_mime_number = ($mime_number == '' ? $i + 1 :
sprintf('%s.%s', $mime_number, $i + 1));
- }
+
+ if (!empty($structure->headers['content-type']) AND
substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/')
{
+ $prepend = $prepend . $mime_number . '.';
+ $_mime_number = '';
+ } else {
+ $_mime_number = ($mime_number == '' ? $i + 1 :
sprintf('%s.%s', $mime_number, $i + 1));
+ }
$arr = &Mail_mimeDecode::getMimeNumbers($structure->parts[$i], $no_refs,
$_mime_number, $prepend);
foreach ($arr as $key => $val) {
@@ -335,7 +335,7 @@
if ($mime_number == '') {
$mime_number = '1';
}
- $structure->mime_id = $prepend . $mime_number;
+ $structure->mime_id = $prepend . $mime_number;
$no_refs ? $return[$prepend . $mime_number] = '' : $return[$prepend .
$mime_number] = &$structure;
}
@@ -676,7 +676,7 @@
$htab = "\t";
$crlf = "\r\n";
$output = '';
- $headers = @(array)$input->headers;
+ $headers = @(array)$input->headers;
foreach ($headers as $hdr_name => $hdr_value) {