diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-09 09:48:10 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-09 09:48:10 +0000 |
| commit | 30f464ff27bda43fa08734fdfcf767407e2c78d9 (patch) | |
| tree | 39725746dbe13ebcd14d230852459c381fa9a880 | |
| parent | 091f8776c3c78dc883ca026ec32f3aba205faf0f (diff) | |
- fixed iil_C_Sort() to support very long and/or divided responses (#1485283)
git-svn-id: https://svn.roundcube.net/trunk@1964 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index d43c474d2..4a0e8a570 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/10/09 (alec) +---------- +- fixed iil_C_Sort() to support very long and/or divided responses (#1485283) + 2008/10/08 (alec) ---------- - Fix imap searching on ISMail server (#1485466) diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index 98173687b..c78e67ad5 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -67,6 +67,7 @@ - remove 'undisclosed-recipients' string from 'To' header - iil_C_HandlePartBody(): added 6th argument and fixed endless loop - added iil_PutLineC() + - fixed iil_C_Sort() to support very long and/or divided responses ********************************************************/ @@ -912,8 +913,10 @@ function iil_C_Sort(&$conn, $mailbox, $field, $add='', $is_uid=FALSE, do { $line = chop(iil_ReadLine($fp, 1024)); if (iil_StartsWith($line, '* SORT')) { - $data .= ($data?' ':'') . substr($line, 7); - } + $data .= ($data ? ' ' : '') . substr($line, 7); + } else if (preg_match('/^[0-9 ]+$/', $line)) { + $data .= $line; + } } while ($line[0]!='s'); if (empty($data)) { |