- Fix sorting by date of messages without date header on servers without SORT (#1486286)

release-0.6
alecpl 15 years ago
parent e1ac217397
commit a79e5f14c1

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix sorting by date of messages without date header on servers without SORT (#1486286)
- Fix inconsistency when not using default table names (#1486467) - Fix inconsistency when not using default table names (#1486467)
- Fix folder rename/delete buttons do not appear on creation of first folder (#1486468) - Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)
- Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375) - Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375)

@ -951,7 +951,9 @@ function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='',
$key = 'fhi0'; $key = 'fhi0';
$deleted = $skip_deleted ? ' FLAGS' : ''; $deleted = $skip_deleted ? ' FLAGS' : '';
if ($mode == 1) if ($mode == 1 && $index_field == 'DATE')
$request = " FETCH $message_set (INTERNALDATE BODY.PEEK[HEADER.FIELDS (DATE)]$deleted)";
else if ($mode == 1)
$request = " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ($index_field)]$deleted)"; $request = " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ($index_field)]$deleted)";
else if ($mode == 2) { else if ($mode == 2) {
if ($index_field == 'SIZE') if ($index_field == 'SIZE')
@ -987,15 +989,23 @@ function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='',
} }
} }
if ($mode == 1) { if ($mode == 1 && $index_field == 'DATE') {
if (preg_match('/BODY\[HEADER\.FIELDS \("?(DATE|FROM|REPLY-TO|SENDER|TO|SUBJECT)"?\)\] (.*)/', $line, $matches)) { if (preg_match('/BODY\[HEADER\.FIELDS \("*DATE"*\)\] (.*)/', $line, $matches)) {
$value = preg_replace(array('/^"*[a-z]+:/i', '/\s+$/sm'), array('', ''), $matches[2]); $value = preg_replace(array('/^"*[a-z]+:/i'), '', $matches[1]);
$value = trim($value); $value = trim($value);
if ($index_field == 'DATE') { $result[$id] = iil_StrToTime($value);
$result[$id] = iil_StrToTime($value); }
} else { // non-existent/empty Date: header, use INTERNALDATE
$result[$id] = $value; if (empty($result[$id])) {
} if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches))
$result[$id] = iil_StrToTime($matches[1]);
else
$result[$id] = 0;
}
} else if ($mode == 1) {
if (preg_match('/BODY\[HEADER\.FIELDS \("?(FROM|REPLY-TO|SENDER|TO|SUBJECT)"?\)\] (.*)/', $line, $matches)) {
$value = preg_replace(array('/^"*[a-z]+:/i', '/\s+$/sm'), array('', ''), $matches[2]);
$result[$id] = trim($value);
} else { } else {
$result[$id] = ''; $result[$id] = '';
} }

Loading…
Cancel
Save