thomascube
2010-11-24 e31afbbc9bcfe08b640123d0748f035405ee83b1
Fix php warnings; Courier doesn't like spaces appended to the EXPUNGE command

3 files modified
10 ■■■■ changed files
program/include/iniset.php 2 ●●●●● patch | view | raw | blame | history
program/include/rcube_imap.php 2 ●●● patch | view | raw | blame | history
program/include/rcube_imap_generic.php 6 ●●●●● patch | view | raw | blame | history
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',
        ),
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;
                        }
                    }
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