- Fix issue where wrong message sequence range could be generated when it w...

alecpl

2011-10-24 b407e797c20f8d06a85fc90a831f9a8ec6237298

 program/include/rcube_imap_generic.php

@@ -6,6 +6,7 @@
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
 | Copyright (C) 2011, Kolab Systems AG                                  |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -54,15 +55,8 @@
    public $references;
    public $priority;
    public $mdn_to;

    public $flags;
    public $mdnsent = false;
    public $seen = false;
    public $deleted = false;
    public $answered = false;
    public $forwarded = false;
    public $flagged = false;
    public $others = array();
    public $flags = array();
}

// For backward compatibility with cached messages (#1486602)
@@ -316,6 +310,10 @@
                }
                else {
                    $this->resultcode = null;
                    // parse response for [APPENDUID 1204196876 3456]
                    if (preg_match("/^\[APPENDUID [0-9]+ ([0-9,:*]+)\]/i", $str, $m)) {
                        $this->data['APPENDUID'] = $m[1];
                    }
                }
                $this->result = $str;

@@ -678,8 +676,8 @@
            $this->prefs = $options;
        }
        // set auth method
        if (!empty($this->prefs['auth_method'])) {
            $auth_method = strtoupper($this->prefs['auth_method']);
        if (!empty($this->prefs['auth_type'])) {
            $auth_method = strtoupper($this->prefs['auth_type']);
        } else {
            $auth_method = 'CHECK';
        }
@@ -689,7 +687,7 @@
        // initialize connection
        $this->error    = '';
        $this->errornum = self::ERROR_OK;
        $this->selected = '';
        $this->selected = null;
        $this->user     = $user;
        $this->host     = $host;
        $this->logged   = false;
@@ -886,7 +884,7 @@
            return false;
        }

        if ($this->selected == $mailbox) {
        if ($this->selected === $mailbox) {
            return true;
        }
/*
@@ -1049,7 +1047,7 @@
            $result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);

        if ($result == self::ERROR_OK) {
            $this->selected = ''; // state has changed, need to reselect
            $this->selected = null; // state has changed, need to reselect
            return true;
        }

@@ -1067,7 +1065,7 @@
        $result = $this->execute('CLOSE', NULL, self::COMMAND_NORESPONSE);

        if ($result == self::ERROR_OK) {
            $this->selected = '';
            $this->selected = null;
            return true;
        }

@@ -1134,7 +1132,7 @@
        }

        if ($res) {
            if ($this->selected == $mailbox)
            if ($this->selected === $mailbox)
                $res = $this->close();
            else
                $res = $this->expunge($mailbox);
@@ -1153,10 +1151,10 @@
    function countMessages($mailbox, $refresh = false)
    {
        if ($refresh) {
            $this->selected = '';
            $this->selected = null;
        }

        if ($this->selected == $mailbox) {
        if ($this->selected === $mailbox) {
            return $this->data['EXISTS'];
        }

@@ -1190,7 +1188,7 @@

        $this->select($mailbox);

        if ($this->selected == $mailbox) {
        if ($this->selected === $mailbox) {
            return $this->data['RECENT'];
        }

@@ -1676,31 +1674,10 @@
                    else if ($name == 'FLAGS') {
                        if (!empty($value)) {
                            foreach ((array)$value as $flag) {
                                $flag = str_replace('\\', '', $flag);
                                $flag = str_replace(array('$', '\\'), '', $flag);
                                $flag = strtoupper($flag);

                                switch (strtoupper($flag)) {
                                case 'SEEN':
                                    $result[$id]->seen = true;
                                    break;
                                case 'DELETED':
                                    $result[$id]->deleted = true;
                                    break;
                                case 'ANSWERED':
                                    $result[$id]->answered = true;
                                    break;
                                case '$FORWARDED':
                                    $result[$id]->forwarded = true;
                                    break;
                                case '$MDNSENT':
                                    $result[$id]->mdnsent = true;
                                    break;
                                case 'FLAGGED':
                                    $result[$id]->flagged = true;
                                    break;
                                default:
                                    $result[$id]->flags[] = $flag;
                                    break;
                                }
                                $result[$id]->flags[$flag] = true;
                            }
                        }
                    }
@@ -1812,7 +1789,7 @@
            // VANISHED response (QRESYNC RFC5162)
            // Sample: * VANISHED (EARLIER) 300:310,405,411

            else if (preg_match('/^\* VANISHED [EARLIER]*/i', $line, $match)) {
            else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
                $line   = substr($line, strlen($match[0]));
                $v_data = $this->tokenizeResponse($line, 1);

@@ -2323,12 +2300,11 @@
        $result = false;
        $parts  = (array) $parts;
        $key    = $this->nextTag();
        $peeks  = '';
        $idx    = 0;
        $peeks  = array();
        $type   = $mime ? 'MIME' : 'HEADER';

        // format request
        foreach($parts as $part) {
        foreach ($parts as $part) {
            $peeks[] = "BODY.PEEK[$part.$type]";
        }

@@ -2342,13 +2318,25 @@

        do {
            $line = $this->readLine(1024);
            $line = $this->multLine($line);

            if (preg_match('/BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
                $idx = $matches[1];
                $result[$idx] = preg_replace('/^(\* [0-9]+ FETCH \()?\s*BODY\['.$idx.'\.'.$type.'\]\s+/', '', $line);
                $result[$idx] = trim($result[$idx], '"');
                $result[$idx] = rtrim($result[$idx], "\t\r\n\0\x0B");
            if (preg_match('/^\* [0-9]+ FETCH [0-9UID( ]+BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
                $idx     = $matches[1];
                $headers = '';

                // get complete entry
                if (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
                    $bytes = $m[1];
                    $out   = '';

                    while (strlen($out) < $bytes) {
                        $out = $this->readBytes($bytes);
                        if ($out === null)
                            break;
                        $headers .= $out;
                    }
                }

                $result[$idx] = trim($headers);
            }
        } while (!$this->startsWith($line, $key, true));

@@ -2470,8 +2458,6 @@
                } else if ($mode == 2) {
                    $line = rtrim($line, "\t\r\0\x0B");
                    $line = quoted_printable_decode($line);
                    // Remove NULL characters (#1486189)
                    $line = str_replace("\x00", '', $line);
                // UUENCODE
                } else if ($mode == 3) {
                    $line = rtrim($line, "\t\r\n\0\x0B");
@@ -2527,8 +2513,18 @@
        return ($result == self::ERROR_OK);
    }

    /**
     * Handler for IMAP APPEND command
     *
     * @param string $mailbox Mailbox name
     * @param string $message Message content
     *
     * @return string|bool On success APPENDUID response (if available) or True, False on failure
     */
    function append($mailbox, &$message)
    {
        unset($this->data['APPENDUID']);

        if (!$mailbox) {
            return false;
        }
@@ -2567,7 +2563,12 @@
            // Clear internal status cache
            unset($this->data['STATUS:'.$mailbox]);

            return ($this->parseResult($line, 'APPEND: ') == self::ERROR_OK);
            if ($this->parseResult($line, 'APPEND: ') != self::ERROR_OK)
                return false;
            else if (!empty($this->data['APPENDUID']))
                return $this->data['APPENDUID'];
            else
                return true;
        }
        else {
            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
@@ -2576,8 +2577,19 @@
        return false;
    }

    /**
     * Handler for IMAP APPEND command.
     *
     * @param string $mailbox Mailbox name
     * @param string $path    Path to the file with message body
     * @param string $headers Message headers
     *
     * @return string|bool On success APPENDUID response (if available) or True, False on failure
     */
    function appendFromFile($mailbox, $path, $headers=null)
    {
        unset($this->data['APPENDUID']);

        if (!$mailbox) {
            return false;
        }
@@ -2644,7 +2656,12 @@
            // Clear internal status cache
            unset($this->data['STATUS:'.$mailbox]);

            return ($this->parseResult($line, 'APPEND: ') == self::ERROR_OK);
            if ($this->parseResult($line, 'APPEND: ') != self::ERROR_OK)
                return false;
            else if (!empty($this->data['APPENDUID']))
                return $this->data['APPENDUID'];
            else
                return true;
        }
        else {
            $this->setError(self::ERROR_COMMAND, "Unable to send command: $request");