X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=3db765bdd8d51565fc55c37d1f9e2733b4404812;hp=a020618417242771123cb37f8743b9c073a74426;hb=c997cbe6f5a46d432d7733acb207dfcdfd00e49e;hpb=f99c446918b4b7452891d487df62e871ea03f19b
diff --git a/src/left_main.php b/src/left_main.php
index a0206184..3db765bd 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -6,7 +6,7 @@
* This is the code for the left bar. The left bar shows the folders
* available, and has cookie information.
*
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2021 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@ -38,16 +38,15 @@ sqgetGlobalVar('unfold', $unfold, SQ_GET);
// open a connection on the imap port (143)
// why hide the output?
-$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, true);
+global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, true, $imap_stream_options);
/**
* Using stristr since very old preferences may contain "None" and "none".
*/
if (!empty($left_refresh) &&
!stristr($left_refresh, 'none')){
- $xtra = "\n\n" .
- "\n".
- "\n";
+ $xtra = "\n\n";
} else {
$xtra = '';
}
@@ -72,7 +71,7 @@ if ($auto_create_special && !isset($auto_create_done)) {
$autocreate = array($sent_folder, $trash_folder, $draft_folder);
$folders_created = false;
foreach( $autocreate as $folder ) {
- if ($folder != '') {
+ if ($folder != '' && $folder != SMPREF_NONE) {
/**
* If $show_only_subscribed_folders is true, don't use
* $mailboxes array for checking if mailbox exists.