diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-05-29 09:12:10 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-05-29 09:12:10 +0000 |
| commit | 6b97864fbfde6ffe7b82f14c058c2141a288aa04 (patch) | |
| tree | 5b8c13da92d354a7d07a7c82ce0901da9302a165 | |
| parent | 12589b072ae9406fee989fdc38f57aa897d27a6a (diff) | |
- Fixed problem with double quote at the end of folder name (#1485884)
git-svn-id: https://svn.roundcube.net/trunk@2563 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 7 | ||||
| -rw-r--r-- | roundcubemail/skins/default/templates/messagepreview.html | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index d9d14a2e0..1f9ae9206 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fixed problem with double quote at the end of folder name (#1485884) - Speedup UI by using CSS sprites and etags/expires/deflate in Apache config (#1484858,#1485800) - Support UID EXPUNGE: remove only moved/deleted messages - Add drag cancelling with ESC key (#1484344) diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index b5412e39d..1b1a4dc0d 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -83,6 +83,7 @@ - removed caching functions - handling connection startup response - added UID EXPUNGE support + - fixed problem with double quote at the end of folder name in LIST and LSUB ********************************************************/ @@ -2156,7 +2157,7 @@ function iil_C_ListMailboxes(&$conn, $ref, $mailbox) { // split one line $a = iil_ExplodeQuotedString(' ', $line); // last string is folder name - $folder = trim($a[count($a)-1], '"'); + $folder = preg_replace(array('/^"/', '/"$/'), '', $a[count($a)-1]); if (empty($ignore) || (!empty($ignore) && !preg_match('/'.preg_quote(ignore, '/').'/i', $folder))) { @@ -2223,8 +2224,8 @@ function iil_C_ListSubscribed(&$conn, $ref, $mailbox) { $a = iil_ExplodeQuotedString(' ', $line); // last string is folder name - $folder = trim($a[count($a)-1], '"'); - + $folder = preg_replace(array('/^"/', '/"$/'), '', $a[count($a)-1]); + if ((!in_array($folder, $folders)) && (empty($ignore) || (!empty($ignore) && !preg_match('/'.preg_quote(ignore, '/').'/i', $folder)))) { $folders[$i] = $folder; diff --git a/roundcubemail/skins/default/templates/messagepreview.html b/roundcubemail/skins/default/templates/messagepreview.html index 69ed4cf57..148bbe5ee 100644 --- a/roundcubemail/skins/default/templates/messagepreview.html +++ b/roundcubemail/skins/default/templates/messagepreview.html @@ -7,7 +7,7 @@ <body class="iframe"> <div class="messageheaderbox"> -<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" /> +<roundcube:button command="open" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" /> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" /> <roundcube:object name="messageAttachments" id="attachment-list" /> </div> |