Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-06 08:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Added list_mailboxes hook in rcube_imap::list_unsubscribed() (#1486668)

Browse Source
This commit is contained in:
alecpl
2010-05-22 18:47:27 +00:00
parent 87a8685fbf
commit 6f4e7dbcb1
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
program/include/rcube_imap.php
View File

@@ -2512,7 +2512,7 @@ class rcube_imap
* --------------------------------*/
/**
* Public method for mailbox listing.
* Public method for listing subscribed folders
*
* Converts mailbox name with root dir first
*
@@ -2552,16 +2552,16 @@ class rcube_imap
*/
private function _list_mailboxes($root='', $filter='*')
{
$a_defaults = $a_out = array();
// get cached folder list
$a_mboxes = $this->get_cache('mailboxes');
if (is_array($a_mboxes))
return $a_mboxes;
$a_defaults = $a_out = array();
// Give plugins a chance to provide a list of mailboxes
$data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',
array('root'=>$root,'filter'=>$filter));
array('root' => $root, 'filter' => $filter, 'mode' => 'LSUB'));
if (isset($data['folders'])) {
$a_folders = $data['folders'];
@@ -2585,17 +2585,26 @@ class rcube_imap
* Get a list of all folders available on the IMAP server
*
* @param string IMAP root dir
* @param string Optional filter for mailbox listing
* @return array Indexed array with folder names
*/
function list_unsubscribed($root='')
function list_unsubscribed($root='', $filter='*')
{
static $a_folders;
// Give plugins a chance to provide a list of mailboxes
$data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',
array('root' => $root, 'filter' => $filter, 'mode' => 'LIST'));
if (is_array($a_folders))
return $a_folders;
// retrieve list of folders from IMAP server
$a_mboxes = $this->conn->listMailboxes($this->mod_mailbox($root), '*');
if (isset($data['folders'])) {
$a_mboxes = $data['folders'];
}
else {
// retrieve list of folders from IMAP server
$a_mboxes = $this->conn->listMailboxes($this->mod_mailbox($root), $filter);
}
$a_folders = array();
if (!is_array($a_mboxes))
$a_mboxes = array();
// modify names with root dir
foreach ($a_mboxes as $idx => $mbox_name) {