Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1430

Browse source
This commit is contained in:
the-djmaze 2024-02-13 14:53:20 +01:00
parent 9f2b2e50d7
commit b3e1fe1320
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
View file

@ -55,21 +55,24 @@ trait Folders
$HideUnsubscribed = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $HideUnsubscribed); $HideUnsubscribed = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $HideUnsubscribed);
} }
$oNamespaces = $this->ImapClient()->GetNamespaces();
$oFolderCollection = $this->MailClient()->Folders('', '*', $HideUnsubscribed); $oFolderCollection = $this->MailClient()->Folders('', '*', $HideUnsubscribed);
if (isset($oNamespaces->aOtherUsers[0])) {
$oCollection = $this->MailClient()->Folders($oNamespaces->aOtherUsers[0]['prefix'], '*', $HideUnsubscribed); $oNamespaces = $this->ImapClient()->GetNamespaces();
if ($oCollection) { if ($oNamespaces) {
foreach ($oCollection as $oFolder) { if (isset($oNamespaces->aOtherUsers[0])) {
$oFolderCollection[$oFolder->FullName] = $oFolder; $oCollection = $this->MailClient()->Folders($oNamespaces->aOtherUsers[0]['prefix'], '*', $HideUnsubscribed);
if ($oCollection) {
foreach ($oCollection as $oFolder) {
$oFolderCollection[$oFolder->FullName] = $oFolder;
}
} }
} }
} if (isset($oNamespaces->aShared[0])) {
if (isset($oNamespaces->aShared[0])) { $oCollection = $this->MailClient()->Folders($oNamespaces->aShared[0]['prefix'], '*', $HideUnsubscribed);
$oCollection = $this->MailClient()->Folders($oNamespaces->aShared[0]['prefix'], '*', $HideUnsubscribed); if ($oCollection) {
if ($oCollection) { foreach ($oCollection as $oFolder) {
foreach ($oCollection as $oFolder) { $oFolderCollection[$oFolder->FullName] = $oFolder;
$oFolderCollection[$oFolder->FullName] = $oFolder; }
} }
} }
} }
@ -94,7 +97,7 @@ trait Folders
array( array(
'quotaUsage' => $aQuota ? $aQuota[0] * 1024 : null, 'quotaUsage' => $aQuota ? $aQuota[0] * 1024 : null,
'quotaLimit' => $aQuota ? $aQuota[1] * 1024 : null, 'quotaLimit' => $aQuota ? $aQuota[1] * 1024 : null,
'namespace' => $oNamespaces->GetPersonalPrefix(), 'namespace' => $oNamespaces ? $oNamespaces->GetPersonalPrefix() : '',
'namespaces' => $oNamespaces, 'namespaces' => $oNamespaces,
'capabilities' => $aCapabilities 'capabilities' => $aCapabilities
) )