From: eldy <>
Date: Sat, 4 Jan 2003 18:44:30 +0000 (+0000)
Subject: Replaced -month=year option by -month=all.
X-Git-Tag: AWSTATS_5_4_BETA~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f306d40847a019bffbe319a569ee63feac06dd16;p=thirdparty%2FAWStats.git

Replaced -month=year option by -month=all.
---

diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl
index f7c32242..bf059a3c 100644
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
@@ -89,7 +89,12 @@ sub warning {
 #-------------------------------------------------------
 # MAIN
 #-------------------------------------------------------
-my $QueryString=""; for (0..@ARGV-1) { $QueryString .= "$ARGV[$_] "; }
+($DIR=$0) =~ s/([^\/\\]*)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
+
+my $QueryString=''; for (0..@ARGV-1) { $QueryString .= "$ARGV[$_] "; }
+
+if ($QueryString =~ /(^|-|&)month=(year)/i) { error("month=year is a deprecated option. Use month=all instead."); }
+
 if ($QueryString =~ /-debug=/i)  { $Debug=$QueryString; $Debug =~ s/.*debug=//; $Debug =~ s/&.*//; $Debug =~ s/ .*//; }
 if ($QueryString =~ /-config=/i) { $Config=$QueryString; $Config =~ s/.*config=//; $Config =~ s/&.*//; $Config =~ s/ .*//; }
 if ($QueryString =~ /-awstatsprog=/i) { $Awstats=$QueryString; $Awstats =~ s/.*awstatsprog=//; $Awstats =~ s/&.*//; $Awstats =~ s/ .*//; }
@@ -97,9 +102,8 @@ if ($QueryString =~ /-dir=/i)    { $OutputDir=$QueryString; $OutputDir =~ s/.*di
 if ($QueryString =~ /-update/i)  { $Update=1; }
 if ($QueryString =~ /-date/i)    { $Date=1; }
 if ($QueryString =~ /-year=(\d\d\d\d)/i) { $YearRequired="$1"; }
-if ($QueryString =~ /-month=(\d\d)/i || $QueryString =~ /month=(year)/i) { $MonthRequired="$1"; }
+if ($QueryString =~ /-month=(\d\d)/i || $QueryString =~ /month=(all)/i) { $MonthRequired="$1"; }
 if ($QueryString =~ /-lang=([^\s&]+)/i)	{ $Lang=$1; }
-($DIR=$0) =~ s/([^\/\\]*)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
 if ($OutputDir) { if ($OutputDir !~ /[\\\/]$/) { $OutputDir.="/"; } }
 
 if (! $Config) {