From fb6fab4226ac1a0c908e286e66bcd2fafc5c9c18 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 31 Aug 2004 23:42:10 +0000 Subject: [PATCH] [ 1008039 ] When adding javascript to description, the script is doubled --- docs/changelog/6.x.x.txt | 2 ++ lib/WebGUI/HTML.pm | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 6d26390e4..02dbfeba8 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -85,6 +85,8 @@ - bugfix [ 1016258 ] Empty Trash Typo (Tavis Parker). - bugfix [ 1017727 ] Redirect URL (on edit page) not redirecting - RFE [ 718739 ]. USS Submission Start/End Dates (Thanks to Roy Johnson). + - bugfix [ 1008039 ] When adding javascript to description, the script is + doubled 6.1.1 diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm index a4828de33..05edecdf7 100644 --- a/lib/WebGUI/HTML.pm +++ b/lib/WebGUI/HTML.pm @@ -66,17 +66,27 @@ The HTML segment you want cleaned. =cut sub cleanSegment { - my $value = $_[0]; - if ($value =~ s/\r/\n/g) { - $value =~ s/\n\n/\n/g + my $html = shift; + # remove windows carriage returns + if ($html =~ s/\r/\n/g) { + $html =~ s/\n\n/\n/g } - $value =~ m/(\)/ixsg; - my $style = $1; - $value =~ m/(\)/ixsg; - my $script = $1; - $value =~ s/\A.*?\(.*?)/$1/ixsg; - $value =~ s/(.*?)\<\/body\>.*?\z/$1/ixsg; - return $script.$style.$value; + # remove meta tags + $html =~ s/\//ixsg; + # remove link tags + $html =~ s/\//ixsg; + # remove title tags + $html =~ s/\.*?\<\/title\>//ixsg; + # remove head tags + $html =~ s/\//ixsg; + $html =~ s/\<\/head>//ixsg; + # remove body tags + $html =~ s/\//ixsg; + $html =~ s/\<\/body>//ixsg; + # remove html tags + $html =~ s/\//ixsg; + $html =~ s/\<\/html>//ixsg; + return $html; } #-------------------------------------------------------------------