From 43a8b6602c171fe2c947adda43874e3634df0d9d Mon Sep 17 00:00:00 2001 From: ArthurClemens Date: Tue, 31 May 2011 20:12:37 +0000 Subject: [PATCH] Item10814: protect quotes in summary git-svn-id: http://svn.foswiki.org/trunk/BlogAddOn@11806 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- data/System/BlogAddOn.txt | 1 + data/_BlogAddOn/BlogPost.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/System/BlogAddOn.txt b/data/System/BlogAddOn.txt index b5c1e7d..1ad0277 100644 --- a/data/System/BlogAddOn.txt +++ b/data/System/BlogAddOn.txt @@ -256,6 +256,7 @@ To update the instructions on this page to point to your blog web, enter the nam | Version: | %$VERSION% | | Release: | %$RELEASE% | | Change History: |   | +| 31 May 2011 | 1.9.1 Encodes quotes in displayed summary text. | | 26 Feb 2011 | 1.9.0 Added setting =outline= to control the summary text. Added form field !SummmaryImage to choose the attachment name to be displayed in the summary. Improved display of comments in list view. Added options to define image sizes. | | 24 Feb 2011 | 1.8.0 Added settings =BLOGADDON_HIDE_COMMENTS= and =BLOGADDON_DENY_COMMENTING=. Foswikitask:Item10407 - now saves comments to the correct web if =BLOGADDON_COMMENTS_WEB= is set. Fixes tag links in blog post. | | 24 Feb 2011 | 1.7.0 Fixed sorting on dates. Added =INCLUDE= param =display= instead of =section=. Added setting =BLOGADDON_COMMENTS_WEB=. Documentation update. Foswikitask:Item10378 - make sure the existing value of Category field is not lost. | diff --git a/data/_BlogAddOn/BlogPost.txt b/data/_BlogAddOn/BlogPost.txt index eba4895..3a2d31f 100644 --- a/data/_BlogAddOn/BlogPost.txt +++ b/data/_BlogAddOn/BlogPost.txt @@ -191,7 +191,7 @@ label="%MAKETEXT{"Last modified"}%" %IF{"(defined pcategory) OR (defined pauthor) OR (defined tag)" then="$percntINCLUDE{$quot%TOPIC%$quot section=$quotfilters$quot}$percnt"}%%STARTSECTION{"list"}%%SEARCH{ type="query" - "BlogPostForm%IF{"defined pcategory and $pcategory!=''" then=" AND fields[name='Category'].value='%pcategory%'"}%%IF{"defined ptag and $ptag!=''" then="%FORMAT{ + "form.name='BlogPostForm'%IF{"defined pcategory and $pcategory!=''" then=" AND fields[name='Category'].value='%pcategory%'"}%%IF{"defined ptag and $ptag!=''" then="%FORMAT{ type="string" "%ptag%" format=" AND fields[name='Tags'].value=~'\b$item\b' " @@ -369,7 +369,7 @@ then="$percntINCLUDE{$quot%WEB%.BlogPost$quot section=$quotblogPostAuthorPicture
$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotblogPostInfo$quot web=$quot$web$quot topic=$quot$topic$quot author=$quot$formfield(Author)$quot}$percnt
-
$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotsummaryPicture$quot imgWeb=$quot$web$quot imgTopic=$quot$topic$quot imgName=$quot$formfield(SummaryImage)$quot}$percnt$quot}$percnt
$percntIF{$quot'$%poutline%'!=''$quot then=$quot$%poutline%$quot else=$quot$%pdefaultoutline%$quot}$percnt
$percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot
    +
    $percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotsummaryPicture$quot imgWeb=$quot$web$quot imgTopic=$quot$topic$quot imgName=$quot$formfield(SummaryImage)$quot}$percnt$quot}$percnt
    $percntIF{$quot'%poutline%'!=''$quot then=$quot$percntENCODE{$quot$%poutline%$quot type=$quotquote$quot}$percnt$quot else=$quot$percntENCODE{$quot$%pdefaultoutline%$quot type=$quotquote$quot}$percnt$quot}$percnt
    $percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot
    • Comments: $dollarcount(.*?(#CommentDate).*)
    • $dollarpercntIF{$dollarquot(defined BLOGADDON_AUTHOR_PICTURE_FIELD and $BLOGADDON_AUTHOR_PICTURE_FIELD!='') AND (istopic '$dollarwikiusername')$dollarquot then=$dollarquot$percntINCLUDE{$quot%TOPIC%$quot section=$quotblogPostAuthorPicture$quot imgTopic=$quot$dollarwikiusername$quot imgWeb=$quot%USERSWEB%$quot imgWidth=$quot%ppicsizecommenter%$quot}$percnt$dollarquot}$dollarpercnt
      Latest comment by $percntSPACEOUT{$quot$dollarwikiname$quot}$percnt - $dollardate
    $quot}$percnt
%ENDSECTION{"blogPostAddOnItem"}%