From 853b2e734139aa7fcd97fd931803808bdad201bd Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Sat, 23 Dec 2006 06:16:53 -0500 Subject: [PATCH] Fixed little typos and improved CSS altering in HTML messages --- program/steps/mail/func.inc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 57f20e5..257502e 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1274,13 +1274,13 @@ $source = substr($source, 0, $pos+1) . "<<str_replacement[$key]>>" . substr($source, $pos2, strlen($source)-$pos2); $last_pos = $pos+2; } - - $styles = preg_replace('/(^\s*|,\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', "\\1#$container_id \\2", $source); - $styles = preg_replace('/<<str_replacement\[([0-9]+)\]>>/e', "\$a_css_values[\\1]", $styles); - - // replace body definition because we also stripped off the <body> tag - $styles = preg_replace("/$container_id\s+body/i", "$container_id div.rcmBody", $styles); - + + // remove html commends and add #container to each tag selector. + // also replace body definition because we also stripped off the <body> tag + $styles = preg_replace(array('/(^\s*<!--)|(-->\s*$)/', '/(^\s*|,\s*|\}\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im', '/<<str_replacement\[([0-9]+)\]>>/e', "/$container_id\s+body/i"), + array('', "\\1#$container_id \\2", "\$a_css_values[\\1]", "$container_id div.rcmBody"), + $source); + return $styles; } -- Gitblit v1.9.1