Happy New Year

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index a460e3be03f66ed46188cd71a22b4f29edc3d26e..1aac21f47c5291fb0e09c9260d16706906aac9c7 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -6,7 +6,7 @@
  * This contains functions that display mailbox information, such as the
  * table row that has sender, date, subject, etc...
  *
  * This contains functions that display mailbox information, such as the
  * table row that has sender, date, subject, etc...
  *

- * @copyright 1999-2014 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team

  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail


@@ -21,13 +21,22 @@
  * @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 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
  *
  * @return array   $aMailbox mailbox array with all relevant information

+ *                           (if $handle_errors is false and there was an
+ *                           error, the array will be empty)

  *
  * @since 1.5.1
  * @author Marc Groot Koerkamp
  */
  *
  * @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
 
     /**
      * NB: retrieve this from the session before accessing this function


@@ -48,7 +57,9 @@ function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aPro
 
     $iSetIndx = $aConfig['setindex'];
 
 
     $iSetIndx = $aConfig['setindex'];
 

-    $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
+    $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox, $handle_errors);
+    if (empty($aMbxResponse))
+       return $aMbxResponse;

 
     if ($mailbox_cache) {
         if (isset($mailbox_cache[$account.'_'.$mailbox])) {
 
     if ($mailbox_cache) {
         if (isset($mailbox_cache[$account.'_'.$mailbox])) {


@@ -593,7 +604,9 @@ function prepareMessageList(&$aMailbox, $aProps) {
                     if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) {
                         $sTmp = sm_truncate_string($value, $aColumnDesc[$k]['truncate']-$iIndent, '...', TRUE);
                         // drop any double spaces since these will be displayed in the title
                     if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) {
                         $sTmp = sm_truncate_string($value, $aColumnDesc[$k]['truncate']-$iIndent, '...', TRUE);
                         // drop any double spaces since these will be displayed in the title

-                        $title = ($sTmp != $value) ? preg_replace('/\s{2,}/', ' ', $value) : '';
+                        // Nah, it's nice to always have a roll-over
+                        //$title = ($sTmp != $value) ? preg_replace('/\s{2,}/', ' ', $value) : '';
+                        $title = preg_replace('/\s{2,}/', ' ', $value);

                         $value = $sTmp;
                     }
                     /* generate the link to the message */
                         $value = $sTmp;
                     }
                     /* generate the link to the message */