holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix regarding odd behavior Mailbox Access/Manage Folders with ZIMBRA Mailserver. (blank screens while trying to access preferences/manage folders if ZIMBRA Account is configured and active)

Browse Source
This commit is contained in:
Klaus Leithoff 2009-01-29 19:19:47 +00:00
parent 1c51e71119
commit 3401b0aeb4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
felamimail/inc/class.bofelamimail.inc.php
View File

@ -1207,10 +1207,14 @@
continue;
}
$foldersNameSpace[$type]['subscribed'] = $subscribedMailboxes;
sort($foldersNameSpace[$type]['subscribed']);
if (is_array($foldersNameSpace[$type]['subscribed'])) sort($foldersNameSpace[$type]['subscribed']);
// fetch and sort all folders
$foldersNameSpace[$type]['all'] = $this->icServer->getMailboxes($foldersNameSpace[$type]['prefix']);
sort($foldersNameSpace[$type]['all']);
$allMailboxes = $this->icServer->getMailboxes($foldersNameSpace[$type]['prefix']);
if( PEAR::isError($allMailboxes) ) {
continue;
}
$foldersNameSpace[$type]['all'] = $allMailboxes;
if (is_array($foldersNameSpace[$type]['all'])) sort($foldersNameSpace[$type]['all']);
}
}
}
@ -1273,9 +1277,9 @@
foreach( array('personal', 'others', 'shared') as $type) {
if(isset($foldersNameSpace[$type])) {
if($_subscribedOnly) {
$listOfFolders = $foldersNameSpace[$type]['subscribed'];
if( !PEAR::isError($foldersNameSpace[$type]['subscribed']) ) $listOfFolders = $foldersNameSpace[$type]['subscribed'];
} else {
$listOfFolders = $foldersNameSpace[$type]['all'];
if( !PEAR::isError($foldersNameSpace[$type]['all'])) $listOfFolders = $foldersNameSpace[$type]['all'];
}
foreach((array)$listOfFolders as $folderName) {
if($_subscribedOnly && !in_array($folderName, $foldersNameSpace[$type]['all'])) {