alecpl
2008-06-09 32b7092759f4c871c6ad2ee9a82dec96046d01f1
#1485110


1 files modified
6 ■■■■ changed files
program/steps/mail/func.inc 6 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc
@@ -535,7 +535,11 @@
  // text/html
  else if ($part->ctype_secondary == 'html') {
    // charset was converted to UTF-8 in rcube_imap::get_message_part() -> change charset specification in HTML accordingly
    $html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s+charset)=([a-z0-9-]+)/i', '\\1='.RCMAIL_CHARSET, $part->body);
    $html = $part->body;
    if(preg_match('/(\s+content=[\'"]\w+\/\w+;\s+charset)=([a-z0-9-]+)/i', $html))
      $html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s+charset)=([a-z0-9-]+)/i', '\\1='.RCMAIL_CHARSET, $html);
    else
      $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '</head>')), 0);
    
    // clean HTML with washhtml by Frederic Motte
    $body = washtml::wash($html, array(