Fix decoding of mailto: links with + character in HTML messages (#6020)

pull/6072/head
Aleksander Machniak 7 years ago
parent 2c7f3751ab
commit a9170f652c

@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix decoding of mailto: links with + character in HTML messages (#6020)
RELEASE 1.3.2 RELEASE 1.3.2
------------- -------------
- Improve detection for Egde browser and add pointer event support (#5922) - Improve detection for Egde browser and add pointer event support (#5922)

@ -1586,8 +1586,9 @@ function rcmail_washtml_link_callback($tag, $attribs, $content, $washtml)
else if (preg_match('/^mailto:(.+)/i', $attrib['href'], $mailto)) { else if (preg_match('/^mailto:(.+)/i', $attrib['href'], $mailto)) {
list($mailto, $url) = explode('?', html_entity_decode($mailto[1], ENT_QUOTES, 'UTF-8'), 2); list($mailto, $url) = explode('?', html_entity_decode($mailto[1], ENT_QUOTES, 'UTF-8'), 2);
$url = urldecode($url); // #6020: use raw encoding for correct "+" character handling as specified in RFC6068
$mailto = urldecode($mailto); $url = rawurldecode($url);
$mailto = rawurldecode($mailto);
$addresses = rcube_mime::decode_address_list($mailto, null, true); $addresses = rcube_mime::decode_address_list($mailto, null, true);
$mailto = array(); $mailto = array();

Loading…
Cancel
Save