From 6d070c725c685bcbed5f70cf21244df17133546f Mon Sep 17 00:00:00 2001 From: stekkel Date: Thu, 10 Jul 2003 20:20:05 +0000 Subject: [PATCH] Remove check for INBOX. If inbox isn't in the LSUB response then it's unsubscribed and we just add it to the list. No reason to check specificly for LSUB "" "INBOX" or LIST "" "INBOX" If there is no inbox then a select will produce an error message. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5260 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index d623e148..3289cad0 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -737,17 +737,7 @@ 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]) && (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]; - } - } + $lsub_ary[] = '* LSUB () INBOX'; } /* -- 2.25.1