Prevent from having two meta tags in html code

15 years ago · 24585b8ce6
parent 44653321b4
commit 24585b8ce6
1 changed files with 11 additions and 9 deletions
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@ -686,16 +686,18 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
  $html = preg_replace_callback('/(<[\/!]*)([^ >]+)/', 'rcmail_html_tag_callback', $html);

  // charset was converted to UTF-8 in rcube_imap::get_message_part(),
-  // change charset specification in HTML accordingly
-  $charset_pattern = '/(\s+content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i';
-  if (preg_match($charset_pattern, $html)) {
-    $html = preg_replace($charset_pattern, '\\1='.RCMAIL_CHARSET, $html);
+  // -> 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);
  }
-  // add head for malformed messages, washtml cannot work without that
-  if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html))
-    $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);
-
+  else {
+    // add meta content-type to malformed messages, washtml cannot work without that
+    if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html))
+      $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);