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

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

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 9dbc97ec2dcb0cdafffec852752d116308075978..d7ec9087534af331eb53ee1c4f9ab6f786a76e6f 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -1,27 +1,48 @@
-<!-- <TMPL_VAR NAME="REV"> -->
-<tr class="changeinfo">
-       <td class="changeinfo"><TMPL_VAR NAME="USER"></td>
-       <td class="changetime"><TMPL_VAR NAME="WHEN"></td>
-       <td class="changeinfo">
-       <TMPL_LOOP NAME="PAGES">
-               <TMPL_IF NAME="DIFFURL">
-                       <a href="<TMPL_VAR NAME="DIFFURL">">
-                       <img alt="diff" src="wikiicons/diff.png" />
-                       </a>
-                       <TMPL_VAR NAME="LINK">
-               <TMPL_ELSE>
-                       <TMPL_VAR NAME="LINK">
-               </TMPL_IF>
-       </TMPL_LOOP>
-       </td>
-       <td class="changeinfo"><TMPL_VAR NAME="COMMITTYPE"></td>
-</tr>
-<tr>
-       <td class="changelog" colspan="4">
-               <TMPL_LOOP NAME="MESSAGE">
-                       <TMPL_IF NAME="LINE">
-                               <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
-                       </TMPL_IF>
-               </TMPL_LOOP>
-       </td>
-</tr>
+[[!meta author="""<TMPL_VAR AUTHOR>"""]]
+<TMPL_IF AUTHORURL>
+[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
+</TMPL_IF>
+[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK>"]]
+</TMPL_IF>
+<div id="change-<TMPL_VAR REV>" class="metadata">
+<span class="desc"><br />Changed pages:</span>
+<span class="pagelinks">
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_ELSE><TMPL_VAR LINK></TMPL_IF>
+</TMPL_LOOP>
+</span>
+<span class="desc"><br />Changed by:</span>
+<span class="committer">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
+<TMPL_ELSE>
+<TMPL_VAR USER>
+</TMPL_IF>
+</span>
+<span class="desc"><br />Commit type:</span>
+<span class="committype"><TMPL_VAR COMMITTYPE></span>
+<span class="desc"><br />Date:</span>
+<span class="changedate"><TMPL_VAR COMMITDATE></span>
+<span class="desc"><br /></span>
+<TMPL_IF REVERTURL><span class="revert">
+<a href="<TMPL_VAR REVERTURL>" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
+</span></TMPL_IF>
+</div>
+<div class="changelog">
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
+</TMPL_IF>
+</TMPL_LOOP>
+</div>
+<TMPL_IF DIFF>
+<div class="diff">
+<pre>
+<TMPL_VAR DIFF>
+</pre>
+</div>
+</TMPL_IF>
+<!-- <TMPL_VAR REV> -->