diff options
| author | alecpl <alec@alec.pl> | 2012-03-02 13:43:45 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2012-03-02 13:43:45 +0000 |
| commit | c6a9cd679970c61e097bfc6d73ca861cdc985fe3 (patch) | |
| tree | 783f444a7674dc0411af4e9f8ba44be0188a2355 /program/include/rcube_imap.php | |
| parent | 82d69583fdef54e70189d3f8eae2d2175ff5b5e2 (diff) | |
- Fix automatic unsubscribe of non-existent folders (with small perf fix)
Diffstat (limited to 'program/include/rcube_imap.php')
| -rw-r--r-- | program/include/rcube_imap.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index ec9db571c..81ad1859a 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2527,9 +2527,10 @@ class rcube_imap extends rcube_storage NULL, array('SUBSCRIBED')); // unsubscribe non-existent folders, remove from the list - if (is_array($a_folders) && $name == '*') { + // we can do this only when LIST response is available + if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) { foreach ($a_folders as $idx => $folder) { - if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder]) + if (($opts = $this->conn->data['LIST'][$folder]) && in_array('\\NonExistent', $opts) ) { $this->conn->unsubscribe($folder); @@ -2542,11 +2543,12 @@ class rcube_imap extends rcube_storage else { $a_folders = $this->conn->listSubscribed($root, $name); - // unsubscribe non-existent folders, remove from the list - if (is_array($a_folders) && $name == '*') { + // unsubscribe non-existent folders, remove them from the list, + // we can do this only when LIST response is available + if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) { foreach ($a_folders as $idx => $folder) { - if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder]) - && in_array('\\Noselect', $opts) + if (!isset($this->conn->data['LIST'][$folder]) + || in_array('\\Noselect', $this->conn->data['LIST'][$folder]) ) { // Some servers returns \Noselect for existing folders if (!$this->folder_exists($folder)) { |