Better error handling for mailbox lists

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index 1e8fc49..4dbeb3c 100644 (file)
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -129,10 +129,15 @@ class IMP_Contents
                 $ret = $GLOBALS['imp_imap']->ob->fetch($this->_mailbox, array(
                     Horde_Imap_Client::FETCH_STRUCTURE => array('parse' => true)
                 ), array('ids' => array($this->_index)));
-                $this->_message = $ret[$this->_index]['structure'];
             } catch (Horde_Imap_Client_Exception $e) {
                 throw new Horde_Exception('Error displaying message.');
             }
+
+            if (!isset($ret[$this->_index]['structure'])) {
+                throw new Horde_Exception('Error displaying message.');
+            }
+
+            $this->_message = $ret[$this->_index]['structure'];
         }
     }
 

diff --git a/imp/message.php b/imp/message.php
index 0733b30..6c1c8e8 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -202,6 +202,7 @@ $mailbox_name = $index_array['mailbox'];
 try {
     $imp_contents = &IMP_Contents::singleton($index . IMP::IDX_SEP . $mailbox_name);
 } catch (Horde_Exception $e) {
+    $imp_mailbox->removeMsgs(true);
     _returnToMailbox(null, 'message_missing');
     require IMP_BASE . '/mailbox.php';
     exit;