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

Save colors to shared annotations only for personal folders. Write to private annotations otherwise (#830)

Browse source
This commit is contained in:
Thomas Bruederli 2012-10-04 14:22:43 +02:00
parent a22f1764d8
commit 0df591391e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -310,11 +310,14 @@ class kolab_storage
// save color in METADATA // save color in METADATA
// TODO: also save 'showalarams' and other properties here // TODO: also save 'showalarams' and other properties here
// TODO: change private/shared precedence depending on private or shared folder
if ($result && $prop['color']) { if ($result && $prop['color']) {
if (!($meta_saved = self::$imap->set_metadata($folder, array(self::COLOR_KEY_SHARED => $prop['color'])))) // try in shared namespace $meta_saved = false;
$meta_saved = self::$imap->set_metadata($folder, array(self::COLOR_KEY_PRIVATE => $prop['color'])); // try in private namespace $ns = self::$imap->folder_namespace($folder);
if ($ns == 'personal') // save in shared namespace for personal folders
$meta_saved = self::$imap->set_metadata($folder, array(self::COLOR_KEY_SHARED => $prop['color']));
if (!$meta_saved) // try in private namespace
$meta_saved = self::$imap->set_metadata($folder, array(self::COLOR_KEY_PRIVATE => $prop['color']));
if ($meta_saved) if ($meta_saved)
unset($prop['color']); // unsetting will prevent fallback to local user prefs unset($prop['color']); // unsetting will prevent fallback to local user prefs
} }