INN commit: trunk/scripts (innreport.in)

INN Commit rra at isc.org
Sat May 16 21:06:04 UTC 2020


    Date: Saturday, May 16, 2020 @ 14:06:03
  Author: iulius
Revision: 10371

innreport:  use INN version instead of legacy 3.1.0 version

Modified:
  trunk/scripts/innreport.in

--------------+
 innreport.in |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: innreport.in
===================================================================
--- innreport.in	2020-05-16 21:02:42 UTC (rev 10370)
+++ innreport.in	2020-05-16 21:06:03 UTC (rev 10371)
@@ -8,8 +8,6 @@
 #
 # $Id$
 #
-# Version 3.1.0.
-#
 # Copyright (c) 1996-2001, Fabien Tassin <fta at sofaraway.org>.
 #
 # Checkpoints tracking was improved by Jim Dutton in 2006.
@@ -148,7 +146,6 @@
 ## THERE'S NOTHING TO CHANGE AFTER THIS LINE ##
 ###############################################
 
-my $version = "3.1.0";
 my %output; # content of the configuration file.
 my $DEBUG = 0; # set to 1 to verify the structure/content of the conf file.
 my $start_time = time;
@@ -993,7 +990,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=$encoding"/>
 <title>$title</title>
-<!-- innreport $version -->
+<!-- innreport from $INN::Config::version -->
 $style_sheet
 </head><body$body>
 $HTML_header
@@ -1014,9 +1011,9 @@
 
   return <<EOF;
 <div class="ir-pageFooter">
-  <div class="ir-versionNotice">innreport $version (c) 1996-1999
-  by Fabien Tassin <<a href="mailto:fta\@sofaraway.org"
-  >fta\@sofaraway.org</a>>$footer
+  <div class="ir-versionNotice">innreport from $INN::Config::version
+  based on work (c) 1996-1999 by Fabien Tassin
+  <<a href="mailto:fta\@sofaraway.org">fta\@sofaraway.org</a>>$footer
   </div>
 </div>
 $HTML_footer
@@ -2933,8 +2930,9 @@
 }
 
 sub Version {
-  print "\nThis is innreport version $version\n\n";
+  print "\nThis is innreport from $INN::Config::version\n\n";
   print "Copyright 1996-1999, Fabien Tassin <fta\@sofaraway.org>\n";
+  print "Enhanced by several contributors since then\n";
   exit 0;
 }
 
@@ -2949,7 +2947,8 @@
   }
 
   # Display the summary
-  print "\nSummary of my innreport (version $version) configuration:\n";
+  print "\nSummary of my innreport configuration:\n";
+  print "  Version shipped with $INN::Config::version\n";
   print "  General options:\n";
   print "    command line='@old_argv' (please, check this value)\n";
   print "    html=" . ($HTML?"yes":"no") . ", graph=" .



More information about the inn-committers mailing list