From e31afbbc9bcfe08b640123d0748f035405ee83b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 24 Nov 2010 10:44:05 -0500
Subject: [PATCH] Fix php warnings; Courier doesn't like spaces appended to the EXPUNGE command
---
program/include/rcube_imap.php | 2 +-
program/include/iniset.php | 2 ++
program/include/rcube_imap_generic.php | 6 ++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index c1eca54..5ef067f 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -91,6 +91,7 @@
'/MDB2_(.+)/',
'/Mail_(.+)/',
'/Net_(.+)/',
+ '/Auth_(.+)/',
'/^html_.+/',
'/^utf8$/',
),
@@ -98,6 +99,7 @@
'MDB2/\\1',
'Mail/\\1',
'Net/\\1',
+ 'Auth/\\1',
'html',
'utf8.class',
),
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 4c02180..3fa2493 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3236,7 +3236,7 @@
if (is_array($this->namespace['shared'])) {
foreach ($this->namespace['shared'] as $ns) {
foreach ((array)$ns as $root) {
- if (strpos($mbox_name, $root[0]) === 0) {
+ if ($root[0] && strpos($mbox_name, $root[0]) === 0) {
return $mbox_name;
}
}
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 2cffd00..16c9d4a 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1574,8 +1574,10 @@
// Clear internal status cache
unset($this->data['STATUS:'.$mailbox]);
- $result = $this->execute($messages ? 'UID EXPUNGE' : 'EXPUNGE',
- array($messages), self::COMMAND_NORESPONSE);
+ if ($messages)
+ $result = $this->execute('UID EXPUNGE', array($messages), self::COMMAND_NORESPONSE);
+ else
+ $result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
if ($result == self::ERROR_OK) {
$this->selected = ''; // state has changed, need to reselect
--
Gitblit v1.9.1