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

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-29 14:08:17 +02:00
commit 76c451059d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/kolab_core/rcube_kolab.php
View file

@ -237,11 +237,11 @@ class rcube_kolab
* See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
* *
* @param string $folder IMAP folder name (UTF7-IMAP) * @param string $folder IMAP folder name (UTF7-IMAP)
* @param string $namespace Will be set to namespace name of the folder * @param string $folder_ns Will be set to namespace name of the folder
* *
* @return string Name of the folder-object * @return string Name of the folder-object
*/ */
public static function object_name($folder, &$namespace=null) public static function object_name($folder, &$folder_ns=null)
{ {
$rcmail = rcmail::get_instance(); $rcmail = rcmail::get_instance();
$rcmail->imap_init(); $rcmail->imap_init();
@ -256,7 +256,7 @@ class rcube_kolab
$folder = substr($folder, strlen($ns[0])); $folder = substr($folder, strlen($ns[0]));
$delim = $ns[1]; $delim = $ns[1];
$found = true; $found = true;
$namespace = 'shared'; $folder_ns = 'shared';
break; break;
} }
} }
@ -272,7 +272,7 @@ class rcube_kolab
$prefix = '('.substr($folder, 0, $pos).') '; $prefix = '('.substr($folder, 0, $pos).') ';
$folder = substr($folder, $pos+1); $folder = substr($folder, $pos+1);
$found = true; $found = true;
$namespace = 'other'; $folder_ns = 'other';
break; break;
} }
} }
@ -285,7 +285,6 @@ class rcube_kolab
$prefix = ''; $prefix = '';
$delim = $ns[1]; $delim = $ns[1];
$found = true; $found = true;
$namespace = 'personal';
break; break;
} }
} }
@ -300,6 +299,9 @@ class rcube_kolab
if ($prefix) if ($prefix)
$folder = $prefix . ' ' . $folder; $folder = $prefix . ' ' . $folder;
if (!$folder_ns)
$folder_ns = 'personal';
return $folder; return $folder;
} }