In some 'compose' situations (for example when inside options) the system doesn...

This should fix the MAILBOX bug in SF.

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e8523344f152819de184121693000864e83d07c2..8ba5944c9592d9c3012388da3b018e18257fd97d 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -27,7 +27,7 @@
           }
           $GLOBALS["row_count"]++;
           if ($GLOBALS["row_count"] % 2) {
-          if (!isset($color[12])) $color[12] = "#EAEAEA";
+          if (!isset($color[12])) $color[12] = '#EAEAEA';
             $color_string = $color[12];
           }
       }
@@ -35,6 +35,13 @@
       $msg = $msgs[$key];
 
       $senderName = sqimap_find_displayable_name($msg['FROM']);
+      if( $mailbox == _("None") ) {
+         // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+         $boxes = sqimap_mailbox_list($imapConnection);
+         // sqimap_logout($imapConnection);
+         $mailbox = $boxes[0]['unformatted'];
+         unset( $boxes );
+      }      
       $urlMailbox = urlencode($mailbox);
       $subject = processSubject($msg['SUBJECT']);