INN commit: trunk (samples/innreport.conf.in scripts/innreport.in)

INN Commit rra at isc.org
Sat May 16 20:38:08 UTC 2020


    Date: Saturday, May 16, 2020 @ 13:38:07
  Author: iulius
Revision: 10368

innreport:  modernize HTML

No insecure external content.  Remove icons for W3C XHTML and CSS validation.
The reason is to avoid errors when serving innreport output via HTTPS).
Thanks to Richard Kettlewell for the patch.

Modified:
  trunk/samples/innreport.conf.in
  trunk/scripts/innreport.in

---------------------------+
 samples/innreport.conf.in |    2 --
 scripts/innreport.in      |   21 ---------------------
 2 files changed, 23 deletions(-)

Modified: samples/innreport.conf.in
===================================================================
--- samples/innreport.conf.in	2020-05-12 20:32:32 UTC (rev 10367)
+++ samples/innreport.conf.in	2020-05-16 20:38:07 UTC (rev 10368)
@@ -41,8 +41,6 @@
 
       # html_header_file "header.html";  # ${html_dir}/${html_header_file}
       # html_footer_file "footer.html";  # ${html_dir}/${html_footer_file}
-      # html_xhtml11_icon "http://www.w3.org/Icons/valid-xhtml11";
-      # html_vcss_icon	"http://jigsaw.w3.org/css-validator/images/vcss";
 
       # Character set used in XML and Content-Type declaration.
       # html_encoding	"ISO-8859-1";

Modified: scripts/innreport.in
===================================================================
--- scripts/innreport.in	2020-05-12 20:32:32 UTC (rev 10367)
+++ scripts/innreport.in	2020-05-16 20:38:07 UTC (rev 10368)
@@ -1010,31 +1010,10 @@
     $footer = '<br/>' . $v;
   }
 
-  my $xhtml11_icon = 'http://www.w3.org/Icons/valid-xhtml11';
-  $v = $output{'default'}{'html_xhtml11_icon'};
-  if (defined($v)) {
-    $xhtml11_icon = &GetValue($v);
-  }
-
-  my $vcss_icon = 'http://jigsaw.w3.org/css-validator/images/vcss';
-  $v = $output{'default'}{'html_vcss_icon'};
-  if (defined($v)) {
-    $vcss_icon = &GetValue($v);
-  }
-
   my $time = second2time(time - $start_time);
 
   return <<EOF;
 <div class="ir-pageFooter">
-  <a href="http://validator.w3.org/check?uri=referer"><img
-    src="$xhtml11_icon"
-    alt="Valid XHTML 1.1 Strict" height="31" width="88"
-  /></a>
-  <a href="http://jigsaw.w3.org/css-validator/check/referer"><img
-    style="border:0;width:88px;height:31px"
-    src="$vcss_icon"
-    alt="CSS is valid!"
-  /></a>
   <div class="ir-versionNotice">innreport $version (c) 1996-1999
   by Fabien Tassin <<a href="mailto:fta\@sofaraway.org"
   >fta\@sofaraway.org</a>>$footer



More information about the inn-committers mailing list