From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 21 Sep 2006 04:15:52 +0000 (+0100)
Subject: some more sanitize_rss fixes
X-Git-Tag: 1.2.4~106
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=60452879145a3e208085960566113b49a22c1c33;p=tt-rss.git

some more sanitize_rss fixes
---

diff --git a/functions.php b/functions.php
index e5f06da3..bc46b7c6 100644
--- a/functions.php
+++ b/functions.php
@@ -2441,20 +2441,18 @@
 	}
 
 	function sanitize_rss($str) {
-		$res = "";
+		$res = $str;
 
 		$res = preg_replace('/<script.*?>/i', 
-					"<p class=\"scriptWarn\">", $str);
+			"<p class=\"scriptWarn\">Disabled script: ", $res);
 
-		$res = preg_replace('/<\/script>/i', 
-			"</p>", $res);
+		$res = preg_replace('/<\/script.*?>/i', "</p>", $res);
+
+		$res = preg_replace('/<embed.*?>/i', "", $res);
 
 		$res = preg_replace('/<object.*?>.*?<\/object>/i', 
 			"<p class=\"objectWarn\">(Disabled html object 
-			- flash or other embedded content)</p>", $str);
-
-		$res = preg_replace('/<\/object>/i', 
-			"</p>", $res);
+			- flash or other embedded content)</p>", $res); 
 
 		return $res;
 	}
diff --git a/tt-rss.css b/tt-rss.css
index a8136cb1..337797e7 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1160,9 +1160,9 @@ span.debugTS {
 	display : none;
 }
 
-.scriptWarn:before {
+/*.scriptWarn:before {
 	content : "Disabled script:";
-}
+}*/
 
 .scriptWarn {
 	color : white;