From 16c63f048b2817801a63909a1a9275ca5f8f41c7 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 8 Jun 2009 16:16:17 -0600 Subject: [PATCH] A bit better error handling for empty MIME IDs --- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php index 8f9b8aeaf..d00bbe55b 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php @@ -2122,14 +2122,11 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base case Horde_Imap_Client::FETCH_BODYPART: case Horde_Imap_Client::FETCH_HEADERS: foreach ($c_val as $val) { + $cmd = empty($val['id']) + ? '' + : $val['id'] . '.'; $main_cmd = 'BODY'; - if (empty($val['id'])) { - $cmd = ''; - } else { - $cmd = $val['id'] . '.'; - } - switch ($type) { case Horde_Imap_Client::FETCH_HEADERTEXT: $cmd .= 'HEADER'; @@ -2141,14 +2138,14 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base case Horde_Imap_Client::FETCH_MIMEHEADER: if (empty($val['id'])) { - throw new Horde_Imap_Client_Exception('Need a MIME ID when retrieving a MIME header.'); + throw new Horde_Imap_Client_Exception('Need a non-zero MIME ID when retrieving a MIME header.'); } $cmd .= 'MIME'; break; case Horde_Imap_Client::FETCH_BODYPART: if (empty($val['id'])) { - throw new Horde_Imap_Client_Exception('Need a MIME ID when retrieving a MIME body part.'); + throw new Horde_Imap_Client_Exception('Need a non-zero MIME ID when retrieving a MIME body part.'); } // Remove the last dot from the string. $cmd = substr($cmd, 0, -1); @@ -2196,7 +2193,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base case Horde_Imap_Client::FETCH_BODYPARTSIZE: foreach ($c_val as $val) { if (empty($val['id'])) { - throw new Horde_Imap_Client_Exception('Need a MIME ID when retrieving unencoded MIME body part size.'); + throw new Horde_Imap_Client_Exception('Need a non-zero MIME ID when retrieving unencoded MIME body part size.'); } $fetch[] = 'BINARY.SIZE[' . $val['id'] . ']'; } -- 2.11.0