alecpl
2009-08-06 f4bf206fd45a8ab6b61a8869eba3165e430bb04e
- fix charset modification in html messages (#1486031)


1 files modified
8 ■■■■ changed files
program/steps/mail/func.inc 8 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc
@@ -689,9 +689,9 @@
  // charset was converted to UTF-8 in rcube_imap::get_message_part(),
  // -> change charset specification in HTML accordingly
  $charset_pattern = '(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)';
  if (preg_match("/<meta\s+[^>]*$charset_pattern/Ui", $html)) {
    $html = preg_replace("/\s+$charset_pattern/i", '\\1='.RCMAIL_CHARSET, $html);
  $charset_pattern = '(<meta\s+[^>]*)(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)';
  if (preg_match("/$charset_pattern/Ui", $html)) {
    $html = preg_replace("/$charset_pattern/i", '\\1\\2='.RCMAIL_CHARSET, $html);
  }
  else {
    // add meta content-type to malformed messages, washtml cannot work without that
@@ -699,7 +699,6 @@
      $html = '<head></head>'. $html;
    $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);
  }
  // turn relative into absolute urls
  $html = rcmail_resolve_base($html);
@@ -720,6 +719,7 @@
    $wash_opts['html_elements'][] = 'link';
    $wash_opts['html_attribs'] = array('rel','type');
  }
console($html);
    
  $washer = new washtml($wash_opts);
  $washer->add_callback('form', 'rcmail_washtml_callback');