From e78bded42b6aafba1470966f4d52a15f6b999361 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 11 Nov 2008 04:57:20 -0700 Subject: [PATCH] Fix some decoding issues. --- framework/Mime/lib/Horde/Mime/Message.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Message.php b/framework/Mime/lib/Horde/Mime/Message.php index a07e1eb93..2f9539681 100644 --- a/framework/Mime/lib/Horde/Mime/Message.php +++ b/framework/Mime/lib/Horde/Mime/Message.php @@ -213,7 +213,11 @@ class Horde_Mime_Message extends Horde_Mime_Part $ob->setDisposition($data['disposition']); if (!empty($data['dparameters'])) { foreach ($data['dparameters'] as $key => $val) { - $ob->setDispositionParameter($key, $val); + /* Disposition parameters are supposed to be encoded via + * RFC 2231, but many mailers do RFC 2045 encoding + * instead. */ + // @todo: RFC 2231 decoding + $ob->setDispositionParameter($key, Horde_Mime::decode($val)); } } } @@ -228,7 +232,10 @@ class Horde_Mime_Message extends Horde_Mime_Part if (!empty($data['parameters'])) { foreach ($data['parameters'] as $key => $val) { - $ob->setContentTypeParameter($key, $val); + /* Content-type parameters are supposed to be encoded via RFC + * 2231, but many mailers do RFC 2045 encoding instead. */ + // @todo: RFC 2231 decoding + $ob->setContentTypeParameter($key, Horde_Mime::decode($val)); } } @@ -241,7 +248,7 @@ class Horde_Mime_Message extends Horde_Mime_Part } if (isset($data['description'])) { - $ob->setDescription($data['description']); + $ob->setDescription(Horde_Mime::decode($data['description'])); } /* Set the name. */ -- 2.11.0