- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 Sep 2008 12:55:35 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv20312/share/templates/en_US
Modified Files:
earl_xml.tmpl error_loop.tmpl error_loop_grouped.tmpl
soap_output.tmpl ucn_output.tmpl xml_output.tmpl
Log Message:
Tag stripping and escaping of error messages and context. I was initially hoping to keep
formatting in the error messages from the parsers, when available, but the discrepancies
and differences in escaping (or lack thereof) calls for a more drastic approach. Thus:
* better escaping of opensp messages (including instances of rogue amps)
* tag stripping of formatting in html5 parser messages
* no named entities in source snippet
* template output is escaped
Index: earl_xml.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/earl_xml.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- earl_xml.tmpl 15 Aug 2008 13:18:42 -0000 1.6
+++ earl_xml.tmpl 9 Sep 2008 12:55:33 -0000 1.7
@@ -46,7 +46,7 @@
</subject>
<result rdf:resource="http://www.w3.org/2003/03/earl/1.00#fails" />
<testCase rdf:resource="http://www.w3.org/Markup/" />
- <note><TMPL_VAR NAME="msg"></note>
+ <note><TMPL_VAR NAME="msg" ESCAPE="HTML"></note>
</Assertion>
</asserts>
</TMPL_LOOP>
Index: error_loop_grouped.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/error_loop_grouped.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- error_loop_grouped.tmpl 15 Aug 2008 13:18:42 -0000 1.5
+++ error_loop_grouped.tmpl 9 Sep 2008 12:55:33 -0000 1.6
@@ -12,7 +12,7 @@
<em>Line <a href="#line-<TMPL_VAR NAME="line"
ESCAPE="HTML">"><TMPL_VAR NAME="line" ESCAPE="HTML"></a>,
column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
- <span><TMPL_VAR NAME="msg"></span>
+ <span><TMPL_VAR NAME="msg" ESCAPE="HTML"></span>
<pre><code class="input"><TMPL_VAR NAME="src"></code></pre>
</li>
Index: error_loop.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/error_loop.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- error_loop.tmpl 15 Aug 2008 13:18:42 -0000 1.6
+++ error_loop.tmpl 9 Sep 2008 12:55:33 -0000 1.7
@@ -16,7 +16,7 @@
<li<TMPL_IF NAME="class"> class="<TMPL_VAR NAME="class">"</TMPL_IF>>
<span class="err_type"><TMPL_IF NAME="err_type_info"><img src="images/info_icons/info.png" alt="Info" title="Info" /></TMPL_IF><TMPL_IF NAME="err_type_warn"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></TMPL_IF><TMPL_IF NAME="err_type_err"><img src="images/info_icons/error.png" alt="Error" title="Error" /></TMPL_IF></span>
<em>Line <TMPL_VAR NAME="line" ESCAPE="HTML">, Column <TMPL_VAR NAME="char" ESCAPE="HTML"></em>:
- <span class="msg"><TMPL_VAR NAME="msg"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li>
+ <span class="msg"><TMPL_VAR NAME="msg" ESCAPE="HTML"></span><TMPL_IF NAME="uri">(<a href="<TMPL_VAR NAME="uri" ESCAPE="HTML">">explain...</a>)</TMPL_IF>.<pre><code class="input"><TMPL_VAR NAME="src"></code></pre><TMPL_IF NAME="expl"><TMPL_VAR NAME="expl"></TMPL_IF> </li>
</TMPL_LOOP>
</TMPL_IF>
<TMPL_IF NAME="has_errors"></ol></TMPL_IF>
Index: xml_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/xml_output.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xml_output.tmpl 15 Aug 2008 13:18:42 -0000 1.8
+++ xml_output.tmpl 9 Sep 2008 12:55:33 -0000 1.9
@@ -63,7 +63,7 @@
<TMPL_LOOP NAME="file_errors">
<msg line="<TMPL_VAR NAME="line" ESCAPE="HTML">"
col="<TMPL_VAR NAME="char" ESCAPE="HTML">"
- ><TMPL_VAR NAME="msg"></msg>
+ ><TMPL_VAR NAME="msg" ESCAPE="HTML"></msg>
</TMPL_LOOP>
</messages>
Index: ucn_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/ucn_output.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ucn_output.tmpl 15 Aug 2008 13:18:42 -0000 1.13
+++ ucn_output.tmpl 9 Sep 2008 12:55:33 -0000 1.14
@@ -21,7 +21,7 @@
<error>
<line><TMPL_VAR NAME="line"></line>
<column><TMPL_VAR NAME="char" ESCAPE="HTML"></column>
- <message><TMPL_VAR NAME="msg"></message>
+ <message><TMPL_VAR NAME="msg" ESCAPE="HTML"></message>
<context><TMPL_VAR NAME="src"></context>
<longmessage>
<p><a href="http://validator.w3.org/docs/errors.html#ve-<TMPL_VAR NAME="num">">Details...</a></p>
Index: soap_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/soap_output.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- soap_output.tmpl 15 Aug 2008 13:19:03 -0000 1.16
+++ soap_output.tmpl 9 Sep 2008 12:55:33 -0000 1.17
@@ -24,7 +24,7 @@
<m:error>
<m:line><TMPL_VAR NAME="line"></m:line>
<m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
- <m:message><TMPL_VAR NAME="msg"></m:message>
+ <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
<m:messageid><TMPL_VAR NAME="num" ESCAPE="HTML"></m:messageid>
<m:explanation> <![CDATA[
<TMPL_VAR NAME="expl">
Received on Tuesday, 9 September 2008 12:56:15 UTC