Fix php warnings; Courier doesn't like spaces appended to the EXPUNGE…

… command
roundcube · Nov 24, 2010 · e31afbb · e31afbb
1 parent e0a7366
commit e31afbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/program/include/iniset.php b/program/include/iniset.php
@@ -91,13 +91,15 @@ function rcube_autoload($classname)
             '/MDB2_(.+)/',
             '/Mail_(.+)/',
             '/Net_(.+)/',
+            '/Auth_(.+)/',
             '/^html_.+/',
             '/^utf8$/',
         ),
         array(
             '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
@@ -3236,7 +3236,7 @@ function mod_mailbox($mbox_name, $mode='in')
             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
@@ -1574,8 +1574,10 @@ function expunge($mailbox, $messages=NULL)
         // 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