Fix invalid X-Draft-Info on forwarded message draft (#1489587)

Aleksander Machniak

2014-02-11 03de1329efbcff2a4052ba6289bde1befb1ef0df

Fix invalid X-Draft-Info on forwarded message draft (#1489587)

 CHANGELOG

@@ -6,6 +6,7 @@
- Fix issue when default_addressbook option is set to integer value (#1489407)
- Fix Opera > 15 detection (#1489562)
- Fix security issue in DomainFactory driver of Password plugin
- Fix invalid X-Draft-Info on forwarded message draft (#1489587)

RELEASE 1.0-rc
--------------

 program/lib/Roundcube/rcube_storage.php

@@ -632,6 +632,9 @@
        else {
            if (is_array($uids)) {
                $uids = join(',', $uids);
            }
            else if (strpos($uids, ':')) {
                $uids = join(',', rcube_imap_generic::uncompressMessageSet($uids));
            }

            if (preg_match('/[^0-9,]/', $uids)) {

 program/steps/mail/compose.inc

@@ -1250,6 +1250,9 @@
        $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
        $COMPOSE['forward_uid'] = $index->get();
    }
    else if (strpos($COMPOSE['forward_uid'], ':')) {
        $COMPOSE['forward_uid'] = rcube_imap_generic::uncompressMessageSet($COMPOSE['forward_uid']);
    }
    else {
        $COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
    }

 program/steps/mail/sendmail.inc

@@ -209,7 +209,7 @@
    $headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $COMPOSE['reply_uid']);
}
else if (!empty($COMPOSE['forward_uid']) && $savedraft) {
    $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $COMPOSE['forward_uid']);
    $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => rcube_imap_generic::compressMessageSet($COMPOSE['forward_uid']));
}

if (!empty($COMPOSE['reply_msgid'])) {