Fix invalid path to blocked.gif when using assets_path setting (#6752)

CHANGELOG

@@ -28,6 +28,7 @@ CHANGELOG Roundcube Webmail
 - Enigma: Fix bug where revoked users/keys were not greyed out in key info
 - Enigma: Fix error message when trying to encrypt with a revoked key (#6607)
 - Enigma: Fix "decryption oracle" bug [CVE-2019-10740] (#6638)
+- Fix invalid path to blocked.gif when using assets_path setting (#6752)
 - Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
 - Fix so an error is logged when more than one attachment plugin has been enabled, initialize the first one (#6735)
 - Fix bug where flag change could have been passed to a preview frame when not expected

program/steps/mail/compose.inc

@@ -589,7 +589,7 @@ function rcmail_prepare_message_body()
     unset($plugin);
 
     // add blocked.gif attachment (#1486516)
-    $regexp = '# src="program/resources/blocked\.gif"#';
+    $regexp = '/ src="' . preg_quote($RCMAIL->output->asset_url('program/resources/blocked.gif'), '/') . '"/';
     if ($isHtml && preg_match($regexp, $body)) {
         $content = $RCMAIL->get_resource_content('blocked.gif');
 

program/steps/mail/func.inc

@@ -830,7 +830,7 @@ function rcmail_check_safe($message)
  */
 function rcmail_wash_html($html, $p, $cid_replaces = array())
 {
-    global $REMOTE_OBJECTS;
+    global $REMOTE_OBJECTS, $RCMAIL;
 
     $p += array('safe' => false, 'inline_html' => true);
 
@@ -860,7 +860,7 @@ function rcmail_wash_html($html, $p, $cid_replaces = array())
     $wash_opts = array(
         'show_washed'   => false,
         'allow_remote'  => $p['safe'],
-        'blocked_src'   => 'program/resources/blocked.gif',
+        'blocked_src'   => $RCMAIL->output->asset_url('program/resources/blocked.gif'),
         'charset'       => RCUBE_CHARSET,
         'cid_map'       => $cid_replaces,
         'html_elements' => array('body'),

program/steps/mail/get.inc

@@ -667,7 +667,6 @@ class rcmail_attachment_handler
             'allow_remote'  => false,
             'charset'       => RCUBE_CHARSET,
             'html_elements' => array('title'),
-//            'blocked_src'   => 'program/resources/blocked.gif',
         );
 
         // initialize HTML washer