HTML-escape error messages (CVE-2016-4561)

[git.ikiwiki.info.git] / templates / atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index b7ba74f47ba8506473b5f9dd37c8766b7bc93e10..3cdd71d1ad2ab62698b3a6285a65b3dc728bd5d9 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -5,35 +5,35 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>

-<TMPL_IF NAME="AUTHOR">
- <name><TMPL_VAR AUTHOR></name>
+<TMPL_IF AUTHOR>
+<name><TMPL_VAR AUTHOR></name>

 <TMPL_ELSE>
 <TMPL_ELSE>

- <name><TMPL_VAR WIKINAME></name>
+<name><TMPL_VAR WIKINAME></name>

 </TMPL_IF>
 </author>
 </TMPL_IF>
 </author>

-<TMPL_IF NAME="COPYRIGHT">
- <rights type="xhtml" xml:lang="en">
-  <div xmlns="http://www.w3.org/1999/xhtml">
-   <TMPL_IF NAME="LICENSE">
-    <TMPL_VAR LICENSE>
-    <TMPL_VAR COPYRIGHT>
-   <TMPL_ELSE>
-    <TMPL_VAR COPYRIGHT>
-   </TMPL_IF>
-  </div>
- </rights>
+<TMPL_IF COPYRIGHT>
+<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+       <TMPL_VAR LICENSE>
+       <TMPL_VAR COPYRIGHT ESCAPE=HTML>

 <TMPL_ELSE>
 <TMPL_ELSE>

- <TMPL_IF NAME="LICENSE">
-  <rights type="xhtml" xml:lang="en">
-   <div xmlns="http://www.w3.org/1999/xhtml">
-    <TMPL_VAR LICENSE>
-   </div>
-  </rights>
- </TMPL_IF>
+       <TMPL_VAR COPYRIGHT ESCAPE=HTML>

 </TMPL_IF>
 </TMPL_IF>

+</rights>
+<TMPL_ELSE>
+<TMPL_IF LICENSE>
+<rights type="html">
+       <TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF GUID>
+<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>

 <id><TMPL_VAR PAGEURL></id>
 <id><TMPL_VAR PAGEURL></id>

+</TMPL_IF>

 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>

-<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
+<generator uri="http://ikiwiki.info/">ikiwiki</generator>

 <updated><TMPL_VAR FEEDDATE></updated>
 <TMPL_VAR CONTENT>
 </feed>
 <updated><TMPL_VAR FEEDDATE></updated>
 <TMPL_VAR CONTENT>
 </feed>