From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 18 Nov 2017 22:33:48 +0000 (+0000)
Subject: Allow callers of sqm_api_mailbox_select() to determine if errors should be handled... 
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=134ee6a85886fe56aec3ef4953790ac398d3f010;hp=041d360b6d4e68428aa55fdc08940938535886f9

Allow callers of sqm_api_mailbox_select() to determine if errors should be handled internally or just returned

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14733 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 58976355..42ae26cb 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -21,13 +21,20 @@
  * @param string   $mailbox mailbox to select and retrieve message headers from
  * @param array    $aConfig array with system config settings and incoming vars
  * @param array    $aProps mailbox specific properties
+ * @param boolean  $handle_errors When TRUE, IMAP errors
+ *                                are handled herein, causing
+ *                                an error to be displayed on
+ *                                screen and execution to stop
+ *                                and when FALSE, error status
+ *                                is returned to the caller
+ *                                (OPTIONAL; default is TRUE)
  *
  * @return array   $aMailbox mailbox array with all relevant information
  *
  * @since 1.5.1
  * @author Marc Groot Koerkamp
  */
-function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps) {
+function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps,$handle_errors=true) {
 
     /**
      * NB: retrieve this from the session before accessing this function
@@ -48,7 +55,7 @@ function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aPro
 
     $iSetIndx = $aConfig['setindex'];
 
-    $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
+    $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox, $handle_errors);
 
     if ($mailbox_cache) {
         if (isset($mailbox_cache[$account.'_'.$mailbox])) {