From: eldy <> Date: Wed, 2 Oct 2002 16:01:37 +0000 (+0000) Subject: Added check version in plugins use. X-Git-Tag: AWSTATS_5_1_BETA~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4bb7f0447dbe8087ab8caa06c50bb401acfc279;p=thirdparty%2FAWStats.git Added check version in plugins use. --- diff --git a/wwwroot/cgi-bin/plugins/graph3d.pm b/wwwroot/cgi-bin/plugins/graph3d.pm index 7d3a8eef..9761e6a2 100644 --- a/wwwroot/cgi-bin/plugins/graph3d.pm +++ b/wwwroot/cgi-bin/plugins/graph3d.pm @@ -8,22 +8,37 @@ # $Revision$ - $Author$ - $Date$ -use GD::Graph3D; -$PluginGraph3D=1; +use GD::Graph3d; #----------------------------------------------------------------------------- # PLUGIN GLOBAL VARIABLES #----------------------------------------------------------------------------- +my $Plugin_need_awstats_version=5001; #... +#----------------------------------------------------------------------------- +# PLUGIN Init_check_Version FUNCTION +#----------------------------------------------------------------------------- +sub Init_graph3d_Check_Version { + if (! $Plugin_need_awstats_version) { return 0; } + $VERSION =~ /^(\d+)\.(\d+)/; + my $versionnum=($1*1000)+$2; + if ($Plugin_need_awstats_version < $versionnum) { + return "Error: AWStats version $Plugin_need_awstats_version or higher is required."; + } + return 0; +} + + #----------------------------------------------------------------------------- # PLUGIN Init_pluginname FUNCTION #----------------------------------------------------------------------------- sub Init_graph3d { - return 1; + my $checkversion=Init_timehires_Check_Version(); + return ($checkversion?$checkversion:1); } diff --git a/wwwroot/cgi-bin/plugins/hashfiles.pm b/wwwroot/cgi-bin/plugins/hashfiles.pm index 7ec4472e..4b4de261 100644 --- a/wwwroot/cgi-bin/plugins/hashfiles.pm +++ b/wwwroot/cgi-bin/plugins/hashfiles.pm @@ -11,22 +11,43 @@ use Storable; use strict;no strict "refs"; -$Plugin_hashfiles=1; #----------------------------------------------------------------------------- -# PLUGIN GLOBAL VARIABLES +# PLUGIN VARIABLES #----------------------------------------------------------------------------- -use vars qw/ $hashfileuptodate /; +my $Plugin_need_awstats_version=5001; +use vars qw/ +$hashfileuptodate +/; +#... + +#----------------------------------------------------------------------------- +# PLUGIN Init_check_Version FUNCTION +#----------------------------------------------------------------------------- +sub Init_hashfiles_Check_Version { + my $AWStats_Version=shift; + if (! $Plugin_need_awstats_version) { return 0; } + $AWStats_Version =~ /^(\d+)\.(\d+)/; + my $versionnum=($1*1000)+$2; + if ($Plugin_need_awstats_version > $versionnum) { + my $maj=int($Plugin_need_awstats_version/1000); + my $min=$Plugin_need_awstats_version % 1000; + return "Error: AWStats version $maj.$min or higher is required."; + } + return 0; +} #----------------------------------------------------------------------------- # PLUGIN Init_pluginname FUNCTION #----------------------------------------------------------------------------- sub Init_hashfiles { + my $AWStats_Version=shift; $hashfileuptodate=1; - return 1; + my $checkversion=Init_hashfiles_Check_Version($AWStats_Version); + return ($checkversion?$checkversion:1); } diff --git a/wwwroot/cgi-bin/plugins/timehires.pm b/wwwroot/cgi-bin/plugins/timehires.pm index 8d3e5f02..d6f8b7ba 100644 --- a/wwwroot/cgi-bin/plugins/timehires.pm +++ b/wwwroot/cgi-bin/plugins/timehires.pm @@ -10,21 +10,41 @@ use Time::HiRes qw( gettimeofday ); use strict;no strict "refs"; -$Plugin_timehires=1; #----------------------------------------------------------------------------- -# PLUGIN GLOBAL VARIABLES +# PLUGIN VARIABLES #----------------------------------------------------------------------------- +my $Plugin_need_awstats_version=5001; #... + +#----------------------------------------------------------------------------- +# PLUGIN Init_check_Version FUNCTION +#----------------------------------------------------------------------------- +sub Init_timehires_Check_Version { + my $AWStats_Version=shift; + if (! $Plugin_need_awstats_version) { return 0; } + $AWStats_Version =~ /^(\d+)\.(\d+)/; + my $versionnum=($1*1000)+$2; + if ($Plugin_need_awstats_version > $versionnum) { + my $maj=int($Plugin_need_awstats_version/1000); + my $min=$Plugin_need_awstats_version % 1000; + return "Error: AWStats version $maj.$min or higher is required."; + } + return 0; +} + + #----------------------------------------------------------------------------- # PLUGIN Init_pluginname FUNCTION #----------------------------------------------------------------------------- sub Init_timehires { - return 1; + my $AWStats_Version=shift; + my $checkversion=Init_timehires_Check_Version($AWStats_Version); + return ($checkversion?$checkversion:1); } diff --git a/wwwroot/cgi-bin/plugins/timezone.pm b/wwwroot/cgi-bin/plugins/timezone.pm index 24f380cb..b2679def 100644 --- a/wwwroot/cgi-bin/plugins/timezone.pm +++ b/wwwroot/cgi-bin/plugins/timezone.pm @@ -13,25 +13,43 @@ # !!!!!!! This plugin reduces AWStats speed by 40% !!!!!!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! use strict;no strict "refs"; -$Plugin_timezone=1; #----------------------------------------------------------------------------- -# PLUGIN GLOBAL VARIABLES +# PLUGIN VARIABLES #----------------------------------------------------------------------------- -$Plugin_timezoneSeconds=0; +my $Plugin_need_awstats_version=5001; #... + +#----------------------------------------------------------------------------- +# PLUGIN Init_check_Version FUNCTION +#----------------------------------------------------------------------------- +sub Init_timezone_Check_Version { + my $AWStats_Version=shift; + if (! $Plugin_need_awstats_version) { return 0; } + $AWStats_Version =~ /^(\d+)\.(\d+)/; + my $versionnum=($1*1000)+$2; + if ($Plugin_need_awstats_version > $versionnum) { + my $maj=int($Plugin_need_awstats_version/1000); + my $min=$Plugin_need_awstats_version % 1000; + return "Error: AWStats version $maj.$min or higher is required."; + } + return 0; +} + + #----------------------------------------------------------------------------- # PLUGIN Init_pluginname FUNCTION #----------------------------------------------------------------------------- sub Init_timezone { + my $AWStats_Version=shift; my $TZ=shift; - if (! $TZ) { $Plugin_timezone=0; } # We do not need this plugin if TZ=0 - $Plugin_timezoneSeconds=($TZ*3600); - return 1; + if (! $TZ) { return "Error: Disable plugin if TimeZone is 0 (Plugin useless)"; } # We do not need this plugin if TZ=0 + my $checkversion=Init_timezone_Check_Version($AWStats_Version); + return ($checkversion?$checkversion:($TZ*3600)); }