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

Move kolab_folders::set_folder_type() logic to libkolab plugin and use it where appropriate (#1104)

Browse source
This commit is contained in:
Thomas Bruederli 2012-10-17 11:46:26 +02:00
parent 5be0b06fcb
commit fad8e68fe7
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/kolab_folders/kolab_folders.php
View file

@ -357,15 +357,7 @@ class kolab_folders extends rcube_plugin
*/ */
function set_folder_type($folder, $type='mail') function set_folder_type($folder, $type='mail')
{ {
$storage = $this->rc->get_storage(); return kolab_storage::set_folder_type($folder, $type);
list($ctype, $subtype) = explode('.', $type);
$success = $storage->set_metadata($folder, array(kolab_storage::CTYPE_KEY => $ctype, kolab_storage::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
if (!$success) // fallback: only set private annotation
$success |= $storage->set_metadata($folder, array(kolab_storage::CTYPE_KEY_PRIVATE => $type));
return $uccess;
} }
/** /**

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

@ -191,7 +191,7 @@ class kolab_storage
if ($saved = self::$imap->create_folder($name, $subscribed)) { if ($saved = self::$imap->create_folder($name, $subscribed)) {
// set metadata for folder type // set metadata for folder type
if ($type) { if ($type) {
$saved = self::$imap->set_metadata($name, array(self::CTYPE_KEY => $type)); $saved = self::set_folder_type($name, $type);
// revert if metadata could not be set // revert if metadata could not be set
if (!$saved) { if (!$saved) {
@ -623,4 +623,23 @@ class kolab_storage
return 'mail'; return 'mail';
} }
/**
* Sets folder content-type.
*
* @param string $folder Folder name
* @param string $type Content type
*
* @return boolean True on success
*/
static function set_folder_type($folder, $type='mail')
{
list($ctype, $subtype) = explode('.', $type);
$success = self::$imap->set_metadata($folder, array(self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
if (!$success) // fallback: only set private annotation
$success |= self::$imap->set_metadata($folder, array(self::CTYPE_KEY_PRIVATE => $type));
return $success;
}
} }