- Fix PHP warning in mailbox_info(),

- Set namespace/delimiter in constructor (this way some methods could be used before connecting to IMAP server)
release-0.6
alecpl 13 years ago
parent 87a2f686f0
commit 68070e448c

@ -121,6 +121,13 @@ class rcube_imap
function __construct()
{
$this->conn = new rcube_imap_generic();
// Set namespace and delimiter from session,
// so some methods would work before connection
if (isset($_SESSION['imap_namespace']))
$this->namespace = $_SESSION['imap_namespace'];
if (isset($_SESSION['imap_delimiter']))
$this->delimiter = $_SESSION['imap_delimiter'];
}
@ -552,12 +559,6 @@ class rcube_imap
return;
}
if (isset($_SESSION['imap_namespace']) && isset($_SESSION['imap_delimiter'])) {
$this->namespace = $_SESSION['imap_namespace'];
$this->delimiter = $_SESSION['imap_delimiter'];
return;
}
$config = rcmail::get_instance()->config;
$imap_personal = $config->get('imap_ns_personal');
$imap_other = $config->get('imap_ns_other');
@ -3505,10 +3506,12 @@ class rcube_imap
if (!empty($namespace)) {
$mbox = $mailbox . $this->delimiter;
foreach ($namespace as $ns) {
foreach ($ns as $item) {
if ($item[0] === $mbox) {
$options['is_root'] = true;
break;
if (!empty($ns)) {
foreach ($ns as $item) {
if ($item[0] === $mbox) {
$options['is_root'] = true;
break;
}
}
}
}

Loading…
Cancel
Save