From 27544c35aa67bdabb93fa22eb5c944109c5aece3 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 30 Aug 2009 19:56:18 -0600 Subject: [PATCH] Catch NIL responses --- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php index 938e6b3bf..fd8468503 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php @@ -2388,10 +2388,14 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base if (!strlen($tag)) { // BODY[] request - $tmp['fullmsg'] = $data[++$i]; + $tmp['fullmsg'] = ($data[++$i] == 'NIL') + ? null + : $data[$i]; } elseif (is_numeric(substr($tag, -1))) { // BODY[MIMEID] request - $tmp['bodypart'][$tag] = $data[++$i]; + $tmp['bodypart'][$tag] = ($data[++$i] == 'NIL') + ? null + : $data[$i]; } else { // BODY[HEADER|TEXT|MIME] request if (($last_dot = strrpos($tag, '.')) === false) { @@ -2406,7 +2410,9 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base if (!isset($tmp[$label])) { $tmp[$label] = array(); } - $tmp[$label][$mime_id] = $data[++$i]; + $tmp[$label][$mime_id] = ($data[++$i] == 'NIL') + ? null + : $data[$i]; } } } elseif (strpos($tag, 'BINARY[') === 0) { -- 2.11.0