- Display IMAP errors for LIST/THREAD/SEARCH commands, fixes #1486905

git-svn-id: https://svn.roundcube.net/trunk@4090 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 16 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/mail/list.inc b/roundcubemail/program/steps/mail/list.inc
index f5fc44bd4..6353be7cc 100644
--- a/roundcubemail/program/steps/mail/list.inc
+++ b/roundcubemail/program/steps/mail/list.inc
@@ -103,10 +103,17 @@ if (isset($a_headers) && count($a_headers))
   if ($search_request)
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
 }
-else if ($search_request)
-  $OUTPUT->show_message('searchnomatch', 'notice');
-else
-  $OUTPUT->show_message('nomessagesfound', 'notice');
+else {
+  // handle IMAP errors (e.g. #1486905)
+  if ($err_code = $IMAP->get_error_code()) {
+    $err_str = $IMAP->get_error_str();
+    $OUTPUT->show_message('servererrormsg', 'error', array('msg' => $err_str));
+  }
+  else if ($search_request)
+    $OUTPUT->show_message('searchnomatch', 'notice');
+  else
+    $OUTPUT->show_message('nomessagesfound', 'notice');
+}
 
 // send response
 $OUTPUT->send();
diff --git a/roundcubemail/program/steps/mail/search.inc b/roundcubemail/program/steps/mail/search.inc
index db46ce428..90d1c374c 100644
--- a/roundcubemail/program/steps/mail/search.inc
+++ b/roundcubemail/program/steps/mail/search.inc
@@ -122,6 +122,11 @@ if (!empty($result_h)) {
   if ($search_str)
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $IMAP->messagecount(NULL, 'ALL')));
 }
+// handle IMAP errors (e.g. #1486905)
+else  if ($err_code = $IMAP->get_error_code()) {
+  $err_str = $IMAP->get_error_str();
+  $OUTPUT->show_message('servererrormsg', 'error', array('msg' => $err_str));
+}
 else {
   $OUTPUT->show_message('searchnomatch', 'notice');
 }