From 189a0ae4dcd965c9ea1ed3d203cfd5dd28922046 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 18 Aug 2011 09:30:28 +0000 Subject: - Unsubscribe from non-existing folders always (on listing), not only in Settings/Folders UI --- program/include/rcube_imap.php | 22 +++++++++++++++++++--- program/steps/settings/folders.inc | 8 -------- 2 files changed, 19 insertions(+), 11 deletions(-) (limited to 'program') diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index e31fb887e..0e28b083a 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -3083,20 +3083,36 @@ class rcube_imap $a_folders = $this->conn->listMailboxes($root, $name, NULL, array('SUBSCRIBED')); - // remove non-existent folders - if (is_array($a_folders)) { + // unsubscribe non-existent folders, remove from the list + if (is_array($a_folders) && $name == '*') { foreach ($a_folders as $idx => $folder) { if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder]) && in_array('\\NonExistent', $opts) ) { + $this->conn->unsubscribe($folder); unset($a_folders[$idx]); - } + } } } } // retrieve list of folders from IMAP server using LSUB else { $a_folders = $this->conn->listSubscribed($root, $name); + + // unsubscribe non-existent folders, remove from the list + if (is_array($a_folders) && $name == '*') { + foreach ($a_folders as $idx => $folder) { + if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder]) + && in_array('\\Noselect', $opts) + ) { + // Some servers returns \Noselect for existing folders + if (!$this->mailbox_exists($folder)) { + $this->conn->unsubscribe($folder); + unset($a_folders[$idx]); + } + } + } + } } } diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index eea58062b..ccf8eebb2 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -278,9 +278,6 @@ function rcube_subscription_form($attrib) $display_folder = str_repeat('    ', $folder['level']) . Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']); - if ($sub_key !== false) - unset($a_subscribed[$sub_key]); - if ($folder['virtual']) { $classes[] = 'virtual'; } @@ -329,11 +326,6 @@ function rcube_subscription_form($attrib) Q($display_folder), $protected || $folder['virtual']); } - // Unsubscribe from non-existing folders - foreach ($a_subscribed as $folder) { - $IMAP->unsubscribe($folder); - } - $RCMAIL->plugins->exec_hook('folders_list', array('table' => $table)); $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']); -- cgit v1.2.3