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

Simplified default folder selection - now when private/shared annotation

Browse source 
is properly handled (.default is removed from shared) by kolab_storage functions
This commit is contained in:
Aleksander Machniak 2012-10-25 15:20:33 +02:00
parent 264504b9a3
commit 8eda2df71e
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
plugins/kolab_folders/kolab_folders.php
View file

@ -369,30 +369,11 @@ class kolab_folders extends rcube_plugin
return null; return null;
} }
$type .= '.default';
$namespace = $storage->get_namespace();
// get all folders of specified type // get all folders of specified type
$folderdata = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata); $folderdata = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
$folderdata = array_intersect($folderdata, array($type)); $folderdata = array_intersect($folderdata, array($type.'.default'));
foreach ($folderdata as $folder => $data) { return key($folderdata);
// check if folder is in personal namespace
foreach (array('shared', 'other') as $nskey) {
if (!empty($namespace[$nskey])) {
foreach ($namespace[$nskey] as $ns) {
if ($ns[0] && substr($folder, 0, strlen($ns[0])) == $ns[0]) {
continue 3;
}
}
}
}
// There can be only one default folder of specified type
return $folder;
}
return null;
} }
/** /**