Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid PHP errors when IMAP doesn't provide valid data

Browse source
This commit is contained in:
Thomas Bruederli 2014-05-23 09:18:35 +02:00
parent d9247aa5e5
commit bb0312280c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/libkolab/lib/kolab_storage.php
View file

@ -1023,14 +1023,15 @@ class kolab_storage
// GETMETADATA "%" doesn't list shared or other namespace folders but "*" would // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
if ($ns_root == '') { if ($ns_root == '') {
foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) { foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
if (!in_array($folder, $blacklist)) { if (!in_array($folder, $blacklist) &&
($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
$folderdata[$folder] = $metadata; $folderdata[$folder] = $metadata;
$folderdata += self::$imap->get_metadata($folder.$delimiter.'*', $type_keys); $folderdata += $data;
} }
} }
} }
else { else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
$folderdata += self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys); $folderdata += $data;
} }
} }
} }
@ -1324,7 +1325,7 @@ class kolab_storage
// check if we have any folder in personal namespace // check if we have any folder in personal namespace
// folder(s) may exist but not subscribed // folder(s) may exist but not subscribed
foreach ($folders as $f => $data) { foreach ((array)$folders as $f => $data) {
if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) { if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) {
$folder = $f; $folder = $f;
break; break;