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

Cleanup

Browse source
This commit is contained in:
Aleksander Machniak 2019-06-20 12:53:36 +00:00
parent 098d25dd18
commit 8f8c6ab5ae
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/kolab_folders/kolab_folders.php
View file

@ -814,7 +814,7 @@ class kolab_folders extends rcube_plugin
if ($is_fl) { if ($is_fl) {
foreach ((array) $args['list'] as $folder_name => $folder) { foreach ((array) $args['list'] as $folder_name => $folder) {
if (strpos($folder_name, $root[0]) === 0 && !substr_count($folder_name, $root[1], $length+1)) { if (strpos($folder_name, $root[0]) === 0 && !substr_count($folder_name, $root[1], $length+1)) {
if ($name = $this->folder_id2username(substr($folder_name, $length+1))) { if ($name = kolab_storage::folder_id2user(substr($folder_name, $length+1), true)) {
$old = $args['list'][$folder_name]['display']; $old = $args['list'][$folder_name]['display'];
$content = $args['list'][$folder_name]['content']; $content = $args['list'][$folder_name]['content'];
@ -833,7 +833,7 @@ class kolab_folders extends rcube_plugin
else if (!empty($args['list'][$prefix]) && !empty($args['list'][$prefix]['folders'])) { else if (!empty($args['list'][$prefix]) && !empty($args['list'][$prefix]['folders'])) {
$map = array(); $map = array();
foreach ($args['list'][$prefix]['folders'] as $folder_name => $folder) { foreach ($args['list'][$prefix]['folders'] as $folder_name => $folder) {
if ($name = $this->folder_id2username($folder_name)) { if ($name = kolab_storage::folder_id2user($folder_name, true)) {
$args['list'][$prefix]['folders'][$folder_name]['name'] = $name; $args['list'][$prefix]['folders'][$folder_name]['name'] = $name;
} }
@ -848,13 +848,4 @@ class kolab_folders extends rcube_plugin
return $args; return $args;
} }
/**
* Map other user (imap) folder identifier to user name
* @see kolab_storage::folder_id2user()
*/
private static function folder_id2username($uid)
{
return kolab_storage::folder_id2user($uid, true);
}
} }