- Fix automatic unsubscribe of non-existent folders (with small perf fix)

pull/1/head
alecpl 13 years ago
parent 82d69583fd
commit c6a9cd6799

@ -2527,9 +2527,10 @@ class rcube_imap extends rcube_storage
NULL, array('SUBSCRIBED')); NULL, array('SUBSCRIBED'));
// unsubscribe non-existent folders, remove from the list // 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) { 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) && in_array('\\NonExistent', $opts)
) { ) {
$this->conn->unsubscribe($folder); $this->conn->unsubscribe($folder);
@ -2542,11 +2543,12 @@ class rcube_imap extends rcube_storage
else { else {
$a_folders = $this->conn->listSubscribed($root, $name); $a_folders = $this->conn->listSubscribed($root, $name);
// unsubscribe non-existent folders, remove from the list // unsubscribe non-existent folders, remove them 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) { foreach ($a_folders as $idx => $folder) {
if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder]) if (!isset($this->conn->data['LIST'][$folder])
&& in_array('\\Noselect', $opts) || in_array('\\Noselect', $this->conn->data['LIST'][$folder])
) { ) {
// Some servers returns \Noselect for existing folders // Some servers returns \Noselect for existing folders
if (!$this->folder_exists($folder)) { if (!$this->folder_exists($folder)) {

@ -1352,12 +1352,16 @@ class rcube_imap_generic
$folders[$mailbox] = array(); $folders[$mailbox] = array();
} }
// Add to options array // store LSUB options only if not empty, this way
if (empty($this->data['LIST'][$mailbox])) // we can detect a situation when LIST doesn't return specified folder
$this->data['LIST'][$mailbox] = $opts; if (!empty($opts) || $cmd == 'LIST') {
else if (!empty($opts)) // Add to options array
$this->data['LIST'][$mailbox] = array_unique(array_merge( if (empty($this->data['LIST'][$mailbox]))
$this->data['LIST'][$mailbox], $opts)); $this->data['LIST'][$mailbox] = $opts;
else if (!empty($opts))
$this->data['LIST'][$mailbox] = array_unique(array_merge(
$this->data['LIST'][$mailbox], $opts));
}
} }
// * STATUS <mailbox> (<result>) // * STATUS <mailbox> (<result>)
else if ($cmd == 'STATUS') { else if ($cmd == 'STATUS') {

Loading…
Cancel
Save