From: alex-brainstorm Date: Fri, 11 Jul 2003 13:01:09 +0000 (+0000) Subject: oldway=false : Fix forged LSUB response triggered by new regexp, and internationalize... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d94c8d613638abbf2d8eefd95cf6f4e94145d99e;p=squirrelmail.git oldway=false : Fix forged LSUB response triggered by new regexp, and internationalized INBOX display git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5263 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index b934d89d..eb341c77 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -745,7 +745,7 @@ function sqimap_mailbox_tree($imap_stream) { } if ($has_inbox == false) { - $lsub_ary[] = '* LSUB () INBOX'; + $lsub_ary[] = '* LSUB () "' . $folder_prefix . '" INBOX'; } /* @@ -875,11 +875,14 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) { } function sqimap_utf7_decode_mbx_tree(&$mbx_tree) { - $mbx_tree->mailboxname_sub=imap_utf7_decode_local($mbx_tree->mailboxname_sub); + if (strtoupper($mbx_tree->mailboxname_sub) == 'INBOX') + $mbx_tree->mailboxname_sub = _("INBOX"); + else + $mbx_tree->mailboxname_sub = imap_utf7_decode_local($mbx_tree->mailboxname_sub); if ($mbx_tree->mbxs) { $iCnt = count($mbx_tree->mbxs); for ($i=0;$i<$iCnt;++$i) { - $mbxs_tree->mbxs[$i] = sqimap_utf7_decode_mbx_tree($mbx_tree->mbxs[$i]); + $mbxs_tree->mbxs[$i] = sqimap_utf7_decode_mbx_tree($mbx_tree->mbxs[$i]); } } }