- Fix handling of % character in IMAP protocol (#1488382)

pull/1/head
alecpl 13 years ago
parent 4da69b953e
commit 8b3c68d42d

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix handling of % character in IMAP protocol (#1488382)
- Fix duplicate names handling in addressbook searches (#1488375) - Fix duplicate names handling in addressbook searches (#1488375)
- Fix displaying HTML messages from Disqus (#1488372) - Fix displaying HTML messages from Disqus (#1488372)
- Exclude E_STRICT from error_reporting for PHP 5.4 - Exclude E_STRICT from error_reporting for PHP 5.4

@ -3616,13 +3616,16 @@ class rcube_imap_generic
if ($string === null) { if ($string === null) {
return 'NIL'; return 'NIL';
} }
if ($string === '') { if ($string === '') {
return '""'; return '""';
} }
// atom-string (only safe characters) // atom-string (only safe characters)
if (!$force_quotes && !preg_match('/[\x00-\x20\x22\x28-\x2A\x5B-\x5D\x7B\x7D\x80-\xFF]/', $string)) { if (!$force_quotes && !preg_match('/[\x00-\x20\x22\x25\x28-\x2A\x5B-\x5D\x7B\x7D\x80-\xFF]/', $string)) {
return $string; return $string;
} }
// quoted-string // quoted-string
if (!preg_match('/[\r\n\x00\x80-\xFF]/', $string)) { if (!preg_match('/[\r\n\x00\x80-\xFF]/', $string)) {
return '"' . addcslashes($string, '\\"') . '"'; return '"' . addcslashes($string, '\\"') . '"';

Loading…
Cancel
Save