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

Improvements in default folders creation procedure

Browse source
This commit is contained in:
Aleksander Machniak 2012-10-26 13:44:57 +02:00
parent 12e2d2ea4a
commit 04793bfaf3
1 changed files with 22 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
plugins/kolab_folders/kolab_folders.php
View file

@ -348,7 +348,7 @@ class kolab_folders extends rcube_plugin
* *
* @return boolean True on success * @return boolean True on success
*/ */
function set_folder_type($folder, $type='mail') function set_folder_type($folder, $type = 'mail')
{ {
return kolab_storage::set_folder_type($folder, $type); return kolab_storage::set_folder_type($folder, $type);
} }
@ -404,25 +404,12 @@ class kolab_folders extends rcube_plugin
$namespace = $storage->get_namespace(); $namespace = $storage->get_namespace();
$defaults = array(); $defaults = array();
$need_update = false; $need_update = false;
$prefix = '';
if (!is_array($folderdata)) {
$folderdata = $storage->get_metadata('*', kolab_storage::CTYPE_KEY);
if (!is_array($folderdata)) {
return;
}
// "Flattenize" metadata array to become a name->type hash
$folderdata = array_map('implode', $folderdata);
}
// Find personal namespace prefix // Find personal namespace prefix
if (is_array($namespace['personal']) && count($namespace['personal']) == 1) { if (is_array($namespace['personal']) && count($namespace['personal']) == 1) {
$prefix = $namespace['personal'][0][0]; $prefix = $namespace['personal'][0][0];
} }
else {
$prefix = '';
}
$this->load_config(); $this->load_config();
@ -443,45 +430,35 @@ class kolab_folders extends rcube_plugin
} }
} }
if (empty($defaults)) {
return;
}
if (!is_array($folderdata)) {
$folderdata = $storage->get_metadata('*', array(kolab_storage::CTYPE_KEY_PRIVATE, kolab_storage::CTYPE_KEY));
if (!is_array($folderdata)) {
return;
}
$folderdata = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
}
// find default folders // find default folders
foreach ($defaults as $type => $foldername) { foreach ($defaults as $type => $foldername) {
// folder exists, do nothing
if (!empty($folderdata[$foldername])) {
continue;
}
// special case, need to set type only
if ($foldername == 'INBOX' || $type == 'mail.inbox') {
$this->set_folder_type($foldername, 'mail.inbox');
continue;
}
// get all folders of specified type // get all folders of specified type
$folders = array_intersect($folderdata, array($type)); $_folders = array_intersect($folderdata, array($type));
unset($folders[0]);
// find folders in personal namespace // default folder found
foreach ($folders as $folder) { if (!empty($_folders)) {
if ($folder) { continue;
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;
}
}
}
}
}
// got folder in personal namespace
continue 2;
} }
list($type1, $type2) = explode('.', $type); list($type1, $type2) = explode('.', $type);
$exists = !empty($folderdata[$foldername]) || $foldername == 'INBOX';
// create folder // create folder
if ($type1 != 'mail' || !$storage->folder_exists($foldername)) { if (!$exists && !$storage->folder_exists($foldername)) {
$storage->create_folder($foldername, $type1 == 'mail'); $storage->create_folder($foldername, $type1 == 'mail');
} }