From 8e5ed7be9e754dfca0278653002ec75f9199d8a9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 18 Jun 2010 07:50:19 -0400
Subject: [PATCH] Strip comments in css string + don't set font color to tags

---
 skins/default/common.css |    1 -
 program/include/main.inc |    5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/program/include/main.inc b/program/include/main.inc
index cd53854..7c506d9 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -830,6 +830,9 @@
   if (preg_match('/expression|behavior|url\(|import/', $stripped))
     return '/* evil! */';
 
+  // remove css comments (sometimes used for some ugly hacks)
+  $source = preg_replace('!/\*(.+)\*/!Ums', '', $source);
+
   // cut out all contents between { and }
   while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
   {
@@ -837,7 +840,7 @@
     $source = substr($source, 0, $pos+1) . $replacements->get_replacement($key) . substr($source, $pos2, strlen($source)-$pos2);
     $last_pos = $pos+2;
   }
-  
+
   // remove html comments and add #container to each tag selector.
   // also replace body definition because we also stripped off the <body> tag
   $styles = preg_replace(
diff --git a/skins/default/common.css b/skins/default/common.css
index 583f8a1..baa46b4 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -22,7 +22,6 @@
 {
   font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
   font-size: 12px;
-  color: #000000;
 }
 
 th

--
Gitblit v1.9.1