From 8ff83209d91c699b51d5e1ecbebd32cb232ed804 Mon Sep 17 00:00:00 2001 From: jangliss Date: Wed, 18 Jun 2003 21:58:03 +0000 Subject: [PATCH] Forgot that $lsub_ibx[0] would be unset if LSUB didn't return INBOX, so it'd never run the LIST code. This meant in the case where they weren't subbed to their INBOX, it'd never appear. Thanks shaug for helping spot that. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5084 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 80ab398f..73852cd9 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -731,15 +731,14 @@ function sqimap_mailbox_tree($imap_stream) { if ($has_inbox == false) { $lsub_ibx = sqimap_run_command( $imap_stream, "LSUB \"\" \"INBOX\"", true, $response, $message ); - if (isset($lsub_ibx[0])) { - if (preg_match("/^\*\s+LSUB\s+(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0])) { + if (isset($lsub_ibx[0]) && (preg_match("/^\*\s+LSUB\s+(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0]))) { + $lsub_ary[] = $lsub_ibx[0]; + } else { + $lsub_ibx = sqimap_run_command( $imap_stream, "LIST \"\" \"INBOX\"", true, $response, $message ); + if (preg_match("/^\*\s+LIST\s+(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0])) { + sqimap_run_command( $imap_stream, "SUBSCRIBE \"INBOX\"", true, $response, $message ); + $lsub_ibx[0] = str_replace("LIST","LSUB",$lsub_ibx[0]); $lsub_ary[] = $lsub_ibx[0]; - } else { - $lsub_ibx = sqimap_run_command( $imap_stream, "LIST \"\" \"INBOX\"", true, $response, $message ); - if (preg_match("/^\*\s+LIST(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0])) { - $lsub_ibx[0] = str_replace("LIST","LSUB",$lsub_ibx[0]); - $lsub_ary[] = $lsub_ibx[0]; - } } } } -- 2.25.1