diff options
| author | alecpl <alec@alec.pl> | 2010-02-04 14:34:19 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-02-04 14:34:19 +0000 |
| commit | a79e5f14c1097e2ea2e84a5c0ef913fd502e40ec (patch) | |
| tree | 7072395980a60059de4a21be4e2cdab42f1950e4 /program/lib/imap.inc | |
| parent | e1ac217397bfc23a5c059aaa12bba8c1fc018cbb (diff) | |
- Fix sorting by date of messages without date header on servers without SORT (#1486286)
Diffstat (limited to 'program/lib/imap.inc')
| -rw-r--r-- | program/lib/imap.inc | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/program/lib/imap.inc b/program/lib/imap.inc index 61d49b4e2..7607a1c71 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -951,7 +951,9 @@ function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='', $key = 'fhi0'; $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)"; else if ($mode == 2) { if ($index_field == 'SIZE') @@ -987,15 +989,23 @@ function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='', } } - if ($mode == 1) { - if (preg_match('/BODY\[HEADER\.FIELDS \("?(DATE|FROM|REPLY-TO|SENDER|TO|SUBJECT)"?\)\] (.*)/', $line, $matches)) { - $value = preg_replace(array('/^"*[a-z]+:/i', '/\s+$/sm'), array('', ''), $matches[2]); + if ($mode == 1 && $index_field == 'DATE') { + if (preg_match('/BODY\[HEADER\.FIELDS \("*DATE"*\)\] (.*)/', $line, $matches)) { + $value = preg_replace(array('/^"*[a-z]+:/i'), '', $matches[1]); $value = trim($value); - if ($index_field == 'DATE') { - $result[$id] = iil_StrToTime($value); - } else { - $result[$id] = $value; - } + $result[$id] = iil_StrToTime($value); + } + // non-existent/empty Date: header, use INTERNALDATE + 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 { $result[$id] = ''; } |