banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add public list_folder_direct() and list_folders_subscribed_direct()

Browse Source
pull/6/head
Aleksander Machniak 12 years ago
parent e88e20c3fb
commit 435d55ecee
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File

104
program/include/rcube_imap.php
Unescape Escape View File

@ -2468,7 +2468,16 @@ class rcube_imap extends rcube_storage
return $a_mboxes; return $a_mboxes;
} }
$a_mboxes = $this->_list_folders_subscribed($root, $name, $filter, $rights); // Give plugins a chance to provide a list of folders
$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));
if (isset($data['folders'])) {
$a_mboxes = $data['folders'];
}
else {
$a_mboxes = $this->list_folders_subscribed_direct($root, $name);
}
if (!is_array($a_mboxes)) { if (!is_array($a_mboxes)) {
return array(); return array();
@ -2497,72 +2506,61 @@ class rcube_imap extends rcube_storage
/** /**
* protected method for folders listing (LSUB) * Method for direct folders listing (LSUB)
* *
* @param string $root Optional root folder * @param string $root Optional root folder
* @param string $name Optional name pattern * @param string $name Optional name pattern
* @param mixed $filter Optional filter
* @param string $rights Optional ACL requirements
* *
* @return array List of subscribed folders * @return array List of subscribed folders
* @see rcube_imap::list_folders_subscribed() * @see rcube_imap::list_folders_subscribed()
*/ */
protected function _list_folders_subscribed($root='', $name='*', $filter=null, $rights=null) public function list_folders_subscribed_direct($root='', $name='*')
{ {
$a_defaults = $a_out = array(); if (!$this->check_connection()) {
return null;
}
// Give plugins a chance to provide a list of folders $config = rcube::get_instance()->config;
$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));
if (isset($data['folders'])) { // Server supports LIST-EXTENDED, we can use selection options
$a_folders = $data['folders']; // #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED
} if (!$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED')) {
else if (!$this->check_connection()) { // This will also set folder options, LSUB doesn't do that
return null; $a_folders = $this->conn->listMailboxes($root, $name,
NULL, array('SUBSCRIBED'));
// unsubscribe non-existent folders, remove 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 (($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 { else {
// Server supports LIST-EXTENDED, we can use selection options $a_folders = $this->conn->listSubscribed($root, $name);
$config = rcube::get_instance()->config;
// #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED // unsubscribe non-existent folders, remove them from the list,
if (!$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED')) { // we can do this only when LIST response is available
// This will also set folder options, LSUB doesn't do that if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) {
$a_folders = $this->conn->listMailboxes($root, $name, foreach ($a_folders as $idx => $folder) {
NULL, array('SUBSCRIBED')); if (!isset($this->conn->data['LIST'][$folder])
|| in_array('\\Noselect', $this->conn->data['LIST'][$folder])
// unsubscribe non-existent folders, remove from the list ) {
// we can do this only when LIST response is available // Some servers returns \Noselect for existing folders
if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) { if (!$this->folder_exists($folder)) {
foreach ($a_folders as $idx => $folder) {
if (($opts = $this->conn->data['LIST'][$folder])
&& in_array('\\NonExistent', $opts)
) {
$this->conn->unsubscribe($folder); $this->conn->unsubscribe($folder);
unset($a_folders[$idx]); 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 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 (!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)) {
$this->conn->unsubscribe($folder);
unset($a_folders[$idx]);
}
}
}
}
}
} }
if (!is_array($a_folders) || !sizeof($a_folders)) { if (!is_array($a_folders) || !sizeof($a_folders)) {
@ -2608,7 +2606,7 @@ class rcube_imap extends rcube_storage
} }
else { else {
// retrieve list of folders from IMAP server // retrieve list of folders from IMAP server
$a_mboxes = $this->_list_folders($root, $name); $a_mboxes = $this->list_folders_direct($root, $name);
} }
if (!is_array($a_mboxes)) { if (!is_array($a_mboxes)) {
@ -2643,7 +2641,7 @@ class rcube_imap extends rcube_storage
/** /**
* protected method for folders listing (LIST) * Method for direct folders listing (LIST)
* *
* @param string $root Optional root folder * @param string $root Optional root folder
* @param string $name Optional name pattern * @param string $name Optional name pattern
@ -2651,7 +2649,7 @@ class rcube_imap extends rcube_storage
* @return array List of folders * @return array List of folders
* @see rcube_imap::list_folders() * @see rcube_imap::list_folders()
*/ */
protected function _list_folders($root='', $name='*') public function list_folders_direct($root='', $name='*')
{ {
if (!$this->check_connection()) { if (!$this->check_connection()) {
return null; return null;
@ -2919,7 +2917,7 @@ class rcube_imap extends rcube_storage
if (strpos($c_mbox, $folder.$delm) === 0) { if (strpos($c_mbox, $folder.$delm) === 0) {
$this->conn->unsubscribe($c_mbox); $this->conn->unsubscribe($c_mbox);
if ($this->conn->deleteFolder($c_mbox)) { if ($this->conn->deleteFolder($c_mbox)) {
$this->clear_message_cache($c_mbox); $this->clear_message_cache($c_mbox);
} }
} }
} }

Write Preview
Loading…
Cancel
Save