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

Fix so temp. subscriptions aren't added to mail folders list

Browse source
This commit is contained in:
Aleksander Machniak 2022-12-12 12:47:22 +01:00
parent d07938b662
commit c401074cbb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -850,7 +850,7 @@ class kolab_storage
if (!$filter) { if (!$filter) {
// Get ALL folders list, standard way // Get ALL folders list, standard way
if ($subscribed) { if ($subscribed) {
$folders = self::_imap_list_subscribed($root, $mbox); $folders = self::_imap_list_subscribed($root, $mbox, $filter);
} }
else { else {
$folders = self::_imap_list_folders($root, $mbox); $folders = self::_imap_list_folders($root, $mbox);
@ -882,7 +882,7 @@ class kolab_storage
// Get folders list // Get folders list
if ($subscribed) { if ($subscribed) {
$folders = self::_imap_list_subscribed($root, $mbox); $folders = self::_imap_list_subscribed($root, $mbox, $filter);
} }
else { else {
$folders = self::_imap_list_folders($root, $mbox); $folders = self::_imap_list_folders($root, $mbox);
@ -944,12 +944,12 @@ class kolab_storage
* Wrapper for rcube_imap::list_folders_subscribed() * Wrapper for rcube_imap::list_folders_subscribed()
* with support for temporarily subscribed folders * with support for temporarily subscribed folders
*/ */
protected static function _imap_list_subscribed($root, $mbox) protected static function _imap_list_subscribed($root, $mbox, $filter = null)
{ {
$folders = self::$imap->list_folders_subscribed($root, $mbox); $folders = self::$imap->list_folders_subscribed($root, $mbox);
// add temporarily subscribed folders // add temporarily subscribed folders
if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) { if ($filter != 'mail' && self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
$folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders'])); $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
} }