X-Git-Url: http://git.nikiroo.be/?p=gofetch.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=385df8bf8da919416ccf672a623fa9288c0ab585;hp=50fe2d7fac8848e50c2efe41929567e2fa92c15c;hb=3e62b034c1981ae6329f06b3f8c0ee25c3683789;hpb=a81f396bc4bf0f70e4b5f654045f533941d86dc9 diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java index 50fe2d7..385df8b 100644 --- a/src/be/nikiroo/gofetch/output/Html.java +++ b/src/be/nikiroo/gofetch/output/Html.java @@ -2,7 +2,8 @@ package be.nikiroo.gofetch.output; import be.nikiroo.gofetch.data.Comment; import be.nikiroo.gofetch.data.Story; -import be.nikiroo.gofetch.support.BasicSupport.Type; +import be.nikiroo.gofetch.support.Type; +import be.nikiroo.utils.StringUtils; public class Html extends Output { public Html(Type type, String hostname, String preselector, int port) { @@ -99,7 +100,8 @@ public class Html extends Output { .append("
\n"); builder.append(space).append("

").append(comment.getTitle()) .append("

\n"); - builder.append(space).append("
") + builder.append(space) + .append("
") .append(comment.getAuthor()).append("
\n"); builder.append(space).append("
"); for (String line : comment.getContentLines()) { @@ -123,7 +125,9 @@ public class Html extends Output { builder.append("
"); if (story.getDetails() != null && !story.getDetails().isEmpty()) { - builder.append("(").append(story.getDetails()).append(")"); + builder.append("(") + .append(StringUtils.xmlEscape(story.getDetails())) + .append(")"); } builder.append("
\n"); builder.append("
\n"); @@ -142,12 +146,13 @@ public class Html extends Output { builder.append("
\n"); if (resume) { - builder.append(" " + story.getContent() + "\n"); + builder.append(" " + StringUtils.xmlEscape(story.getContent()) + + "\n"); } else { builder.append(" " - + story.getFullContent().replace("\n", "
") - .replace("[ ", "

").replace(" ]", "

") - + "\n"); + + StringUtils.xmlEscape(story.getFullContent()) + .replace("\n", "
").replace("[ ", "

") + .replace(" ]", "

") + "\n"); } builder.append("
\n");