diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 14 |
2 files changed, 13 insertions, 2 deletions
@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail - Add option to "Return receipt" will be always checked (#1486352) - Fix HTML to plain text conversion doesn't handle citation blocks (#1486921) - Use custom sorting when SORT is disabled by IMAP admin (#1486959) +- Allow setting some washtml options from plugin (#1486578) RELEASE 0.4.1 ------------- diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index d7c65236b..4dd6d8b55 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -695,11 +695,21 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $wash_opts['html_attribs'] = array('rel','type'); } + // overwrite washer options with options from plugins + if (isset($p['html_elements'])) + $wash_opts['html_elements'] = $p['html_elements']; + if (isset($p['html_attribs'])) + $wash_opts['html_attribs'] = $p['html_attribs']; + + // initialize HTML washer $washer = new washtml($wash_opts); - $washer->add_callback('form', 'rcmail_washtml_callback'); + + if (!$p['skip_washer_form_callback']) + $washer->add_callback('form', 'rcmail_washtml_callback'); // allow CSS styles, will be sanitized by rcmail_washtml_callback() - $washer->add_callback('style', 'rcmail_washtml_callback'); + if (!$p['skip_washer_style_callback']) + $washer->add_callback('style', 'rcmail_washtml_callback'); $html = $washer->wash($html); $REMOTE_OBJECTS = $washer->extlinks; |