From 82eecd04982dcc9371801264b05acb8ab67bd73e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 16 Jul 2002 00:54:12 +0000 Subject: Have echolot version in HTML output --- Echolot/Globals.pm | 7 +++++-- Echolot/Stats.pm | 3 ++- NEWS | 7 +++++-- pingd | 4 ++-- templates/clist.html | 2 +- templates/mlist.html | 2 +- templates/mlist2.html | 2 +- templates/rlist-clear.html | 2 +- templates/rlist-dsa.html | 2 +- templates/rlist-rsa.html | 2 +- templates/rlist.html | 2 +- templates/rlist2-clear.html | 2 +- templates/rlist2-dsa.html | 2 +- templates/rlist2-rsa.html | 2 +- templates/rlist2.html | 2 +- templates/thesaurusindex.html | 2 +- 16 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Echolot/Globals.pm b/Echolot/Globals.pm index bd374da..0a1dabb 100644 --- a/Echolot/Globals.pm +++ b/Echolot/Globals.pm @@ -1,7 +1,7 @@ package Echolot::Globals; # (c) 2002 Peter Palfrader -# $Id: Globals.pm,v 1.2 2002/06/20 04:27:37 weasel Exp $ +# $Id: Globals.pm,v 1.3 2002/07/16 00:53:33 weasel Exp $ # =pod @@ -20,12 +20,15 @@ use Carp; my $GLOBALS; -sub init { +sub init(%) { + my (%args) = @_; + my $hostname = `hostname`; $hostname =~ /^([a-zA-Z0-9_-]*)$/; $hostname = $1 || 'unknown'; $GLOBALS->{'hostname'} = $hostname; $GLOBALS->{'internalcounter'} = 1; + $GLOBALS->{'version'} = $args{'version'}; }; sub initStorage { diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm index 5493436..5dfc17d 100644 --- a/Echolot/Stats.pm +++ b/Echolot/Stats.pm @@ -1,7 +1,7 @@ package Echolot::Stats; # (c) 2002 Peter Palfrader -# $Id: Stats.pm,v 1.19 2002/07/13 20:42:51 weasel Exp $ +# $Id: Stats.pm,v 1.20 2002/07/16 00:53:33 weasel Exp $ # =pod @@ -282,6 +282,7 @@ sub write_file($$;$) { $template->param ( SITE_NAME => Echolot::Config::get()->{'sitename'} ); $template->param ( seperate_rlist => Echolot::Config::get()->{'seperate_rlists'} ); $template->param ( combined_list => Echolot::Config::get()->{'combined_list'} ); + $template->param ( version => Echolot::Globals::get()->{'version'} ); $filename = $filebasename.'.html'; open(F, '>'.$filename) or diff --git a/NEWS b/NEWS index 51a3865..1f87e66 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,12 @@ +Changes in version + * Have echolot version in stats HTML pages + Changes in version 2.0beta14 - 2002-07-16 * Added commands buildstats buildkeys and buildthesaurus * Added legend to templates (Orange) * Thesaurus building failed when an id did not return a - valid remailer. A check was there bug it was wrong. - * Have pingd.conf.5 manpage documenting all options. + valid remailer. A check was there bug it was wrong + * Have pingd.conf.5 manpage documenting all options Changes in version 2.0beta13 - 2002-07-13 * Have correct title tags and some layout changes in the HTML templates diff --git a/pingd b/pingd index d9f9966..fb64c43 100755 --- a/pingd +++ b/pingd @@ -3,7 +3,7 @@ $| = 1; # (c) 2002 Peter Palfrader -# $Id: pingd,v 1.41 2002/07/16 00:16:16 weasel Exp $ +# $Id: pingd,v 1.42 2002/07/16 00:53:33 weasel Exp $ # =pod @@ -513,7 +513,7 @@ die ("command required\n") unless defined $COMMAND; Echolot::Config::init( $params ); chdir( Echolot::Config::get()->{'homedir'} ); -Echolot::Globals::init(); +Echolot::Globals::init( version => $VERSION); if ($COMMAND eq 'add' || $COMMAND eq 'delete') { diff --git a/templates/clist.html b/templates/clist.html index ed3d920..dbae827 100644 --- a/templates/clist.html +++ b/templates/clist.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/mlist.html b/templates/mlist.html index 9daf605..9c88d73 100644 --- a/templates/mlist.html +++ b/templates/mlist.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/mlist2.html b/templates/mlist2.html index b29fbb2..0eec654 100644 --- a/templates/mlist2.html +++ b/templates/mlist2.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist-clear.html b/templates/rlist-clear.html index fd84084..dac6812 100644 --- a/templates/rlist-clear.html +++ b/templates/rlist-clear.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist-dsa.html b/templates/rlist-dsa.html index 9fedd10..a1e2a78 100644 --- a/templates/rlist-dsa.html +++ b/templates/rlist-dsa.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist-rsa.html b/templates/rlist-rsa.html index 0ce32a5..40619c7 100644 --- a/templates/rlist-rsa.html +++ b/templates/rlist-rsa.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist.html b/templates/rlist.html index 93121ac..66cb49b 100644 --- a/templates/rlist.html +++ b/templates/rlist.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist2-clear.html b/templates/rlist2-clear.html index 4b6b261..091f866 100644 --- a/templates/rlist2-clear.html +++ b/templates/rlist2-clear.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist2-dsa.html b/templates/rlist2-dsa.html index 0a37c7c..2a57ce3 100644 --- a/templates/rlist2-dsa.html +++ b/templates/rlist2-dsa.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist2-rsa.html b/templates/rlist2-rsa.html index 8afe5dc..dcbf447 100644 --- a/templates/rlist2-rsa.html +++ b/templates/rlist2-rsa.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/rlist2.html b/templates/rlist2.html index 4a2766f..cc5cad7 100644 --- a/templates/rlist2.html +++ b/templates/rlist2.html @@ -60,7 +60,7 @@ Please see the Legend below for interpretative data.
-Created by Echolot.
+Created by Echolot .
Last update: . diff --git a/templates/thesaurusindex.html b/templates/thesaurusindex.html index 1acc218..c4ba410 100644 --- a/templates/thesaurusindex.html +++ b/templates/thesaurusindex.html @@ -28,7 +28,7 @@
-Created by Echolot.
+Created by Echolot .
Last update: . -- cgit v1.2.3