Changeset 4263 in subversion

Timestamp:

Nov 24, 2010 10:44:05 AM (3 years ago)

Author:

thomasb

Message:

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

Location:

trunk/roundcubemail/program/include

Files:

• iniset.php (modified) (2 diffs)
• rcube_imap.php (modified) (1 diff)
• rcube_imap_generic.php (modified) (1 diff)

trunk/roundcubemail/program/include/iniset.php

@@ -92 +92 @@
             '/Mail_(.+)/',
             '/Net_(.+)/',
+            '/Auth_(.+)/',
             '/^html_.+/',
             '/^utf8$/',
@@ -99 +100 @@
             'Mail/\\1',
             'Net/\\1',
+            'Auth/\\1',
             'html',
             'utf8.class',

trunk/roundcubemail/program/include/rcube_imap.php

@@ -3237 +3237 @@
                 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;
                         }

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -1575 +1575 @@
         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) {