From: <Mic...@nt...> - 2005-11-29 16:20:15
|
Author: MichaelDaum Date: 2005-11-29 08:17:58 -0800 (Tue, 29 Nov 2005) New Revision: 7676 Modified: twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/data/TWiki/HeadlinesPlugin.txt twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/lib/TWiki/Plugins/HeadlinesPlugin.pm Log: Item1015: fixed CDATA handling Modified: twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/data/TWiki/HeadlinesPlugin.txt =================================================================== --- twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/data/TWiki/HeadlinesPlugin.txt 2005-11-29 13:31:49 UTC (rev 7675) +++ twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/data/TWiki/HeadlinesPlugin.txt 2005-11-29 16:17:58 UTC (rev 7676) @@ -157,8 +157,9 @@ ---++ Plugin Info | Plugin Author: | TWiki:Main.PeterThoeny, TWiki:Main.MichaelDaum | -| Plugin Version: | 22 Nov 2005 (v1.92) | +| Plugin Version: | 29 Nov 2005 (v1.93) | | Change History: | <!-- specify latest version first --> | +| 29 Nov 2005: | fixed CDATA handling | | 21 Nov 2005: | added ATOM support; \ extended RSS support; \ added dublion core support; \ Modified: twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/lib/TWiki/Plugins/HeadlinesPlugin.pm =================================================================== --- twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/lib/TWiki/Plugins/HeadlinesPlugin.pm 2005-11-29 13:31:49 UTC (rev 7675) +++ twiki/branches/DEVELOP/twikiplugins/HeadlinesPlugin/lib/TWiki/Plugins/HeadlinesPlugin.pm 2005-11-29 16:17:58 UTC (rev 7676) @@ -37,7 +37,7 @@ $VERSION = '$Rev$'; -$RELEASE = '1.91'; +$RELEASE = '1.93'; $debug = 0; # toggle me @@ -337,29 +337,23 @@ } # ========================= -sub commonTagsHandler -{ +sub commonTagsHandler { + $_[0] =~ s/([ \t]*)%HEADLINES{(.*?)}%/handleHeadlinesTag($1, $2)/geo; - $_[0] =~ s/<head>(.*?[\r\n]+)/"<head>$1".handleAddHeader()."\n"/eo; -} - -# ========================= -sub handleAddHeader { - return '' if $doneHeader; - $doneHeader = 1; - - return - '<link rel="stylesheet" href="' . - '%PUBURL%/' . - $installWeb . - '/HeadlinesPlugin/style.css' . - '" type="text/css" media="all" />'; + if (!$doneHeader) { + my $link = + '<link rel="stylesheet" '. + 'href="%PUBURL%/%TWIKIWEB%/HeadlinesPlugin/style.css" '. + 'type="text/css" media="all" />'; + if($_[0] =~ s/<head>(.*?[\r\n]+)/<head>$1$link\n/o) { + $doneHeader = 1; + } + } } # ========================= -sub errorMsg -{ +sub errorMsg { return $_[0] . '<span class="twikiAlert">' . @@ -580,8 +574,6 @@ last if $count > $limit; } - $text =~ s/<\!\[CDATA\[(.*?)\]\]>/$1/gos; - # fix relative img urls $text =~ s/(<img .*?src=['"])\//$1$baseRef\//go if $baseRef; @@ -721,9 +713,12 @@ sub recode { my $text = shift; - $text =~ s/</</go; - $text =~ s/>/>/go; - $text =~ s/&/&/go; + unless ($text =~ s/<\!\[CDATA\[(.*?)\]\]>/$1/gos) { + $text =~ s/</</go; + $text =~ s/>/>/go; + $text =~ s/&/&/go; + } + $text =~ s/
/\n/go; # TODO: partial utf8 support |