Changeset 4017 in subversion

Timestamp:

Sep 29, 2010 1:53:13 PM (3 years ago)

Author:

alec

Message:

• Allow setting some washtml options from plugin (#1486578)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -9 +9 @@
 - 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

trunk/roundcubemail/program/steps/mail/func.inc

@@ -696 +696 @@
   }
 
+  // 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);