mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 10:09:20 +03:00
Weekly fixes
This commit is contained in:
parent
053fd1c60b
commit
f1b3271b4d
16 changed files with 210 additions and 93 deletions
|
|
@ -617,6 +617,9 @@ class ImapClient extends \MailSo\Net\NetClient
|
|||
{
|
||||
$aReturn = array();
|
||||
|
||||
$sDelimiter = '';
|
||||
$bInbox = false;
|
||||
|
||||
$oImapResponse = null;
|
||||
foreach ($aResult as /* @var $oImapResponse \MailSo\Imap\Response */ $oImapResponse)
|
||||
{
|
||||
|
|
@ -628,6 +631,16 @@ class ImapClient extends \MailSo\Net\NetClient
|
|||
$oFolder = Folder::NewInstance($oImapResponse->ResponseList[4],
|
||||
$oImapResponse->ResponseList[3], $oImapResponse->ResponseList[2]);
|
||||
|
||||
if ($oFolder->IsInbox())
|
||||
{
|
||||
$bInbox = true;
|
||||
}
|
||||
|
||||
if (empty($sDelimiter))
|
||||
{
|
||||
$sDelimiter = $oFolder->Delimiter();
|
||||
}
|
||||
|
||||
$aReturn[] = $oFolder;
|
||||
}
|
||||
catch (\MailSo\Base\Exceptions\InvalidArgumentException $oException)
|
||||
|
|
@ -637,6 +650,11 @@ class ImapClient extends \MailSo\Net\NetClient
|
|||
}
|
||||
}
|
||||
|
||||
if (!$bInbox && !empty($sDelimiter))
|
||||
{
|
||||
$aReturn[] = Folder::NewInstance('INBOX', $sDelimiter);
|
||||
}
|
||||
|
||||
if ($bUseListStatus)
|
||||
{
|
||||
foreach ($aResult as /* @var $oImapResponse \MailSo\Imap\Response */ $oImapResponse)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue