From 126e6386aa8a75f7e401e46b42e8e0af223b84ce Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Mon, 18 Aug 2008 12:01:13 +0000
Subject: [PATCH] -fixing a problem regarding the showing of leftovers from
 HTML-Comments -fixing a problem regarding the failing of the deletion of
 attachments, while forwarding mails. (this may be of little consequence, as
 mails are forwarded as attachment in 1.4, and deleting the attachment will
 question the whole forward process, but ...)

---
 felamimail/inc/class.uicompose.inc.php | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index 5632eb8a29..cd5606370a 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -274,7 +274,7 @@
 						'1' => $attachment['name'],
 						'2' => $attachment['type'], '.2' => "style='text-align:center;'",
 						'3' => $attachment['size'],
-						'4' => "<img src='$imgClearLeft' onclick=\"fm_compose_deleteAttachmentRow(this,'$_composeID','$id')\">"
+						'4' => "<img src='$imgClearLeft' onclick=\"fm_compose_deleteAttachmentRow(this,'".$this->composeID."','$id')\">"
 					);
 					$tableRows[] = $tempArray;
 				}
@@ -460,22 +460,13 @@
 					"dir"	=> array("minlen" =>   1, 'maxlen' =>  10)
 				)
 			);
-			// strip comments out of the message completely
-			if ($_body) {
-				$begin_comment=stripos($_body,'<!--');
-				while ($begin_comment!==FALSE) {
-					//since there is a begin tag there should be an end tag, starting somewhere at least 4 chars further down
-					$end_comment=stripos($_body,'-->',$begin_comment+4);
-					if ($end_comment !== FALSE) {
-						$_body=substr($_body,0,$begin_comment-1).substr($_body,$end_comment+3);
-					} else {
-						//somehow there is a begin tag of a comment but no end tag. throw it away
-						$_body=str_replace('<!--','',$_body);
-					}
-					$begin_comment=stripos($_body,'<!--');
-					if (strlen($_body)<$begin_comment) break;
-				}
-			}
+			
+            // no scripts allowed
+            // clean out comments
+			$search = array('@<script[^>]*?>.*?</script>@si',  // Strip out javascript
+				'@<![\s\S]*?--[ \t\n\r]*>@'         // Strip multi-line comments including CDATA
+			);
+			$_body = preg_replace($search,"",$_body);
 			$body	= $kses->Parse($_body);
 
 			$body	= preg_replace($nonDisplayAbleCharacters, '', $body);