From: eldy <> Date: Sat, 28 Jul 2001 14:45:21 +0000 (+0000) Subject: no message X-Git-Tag: AWSTATS_1_0~219 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3527f4e3e0b2c8271babe2f602a08e3592482c40;p=thirdparty%2FAWStats.git no message --- diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index 3f341999..0ac7808c 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -180,7 +180,7 @@ SkipHosts="" # the DNS. You may specify partial addresses (ie 163.85. for everything # behind the usual firewall setup, etc)... # This is only useful if DNSLookup=1. -# Use space between each value and put a backslash before each dot. +# Note: Use space between each value and put a backslash before each dot. # Example: "163\.85\. 201\.101\.51\.2" # Default: "" # @@ -192,9 +192,10 @@ SkipDNSLookupFor="" # For example, to ignore a whole directory tree, just add "directorytoignore", # to ignore "users" homepage in your stats, you can add "/~". # The oposite parameter of "SkipFiles" is "OnlyFiles". +# Note: This parameter is not case sensitive. # Note: Use space between each value and do not remove default values # Note: \. means . and xxx$ means URL ending by xxx. -# Example: "\.css$ \.js$ \.class$ robots\.txt$ dir/badpage\.html /~" +# Example: "\.css$ \.js$ \.class$ robots\.txt$ badpage\.html /~" # Default: "\.css$ \.js$ \.class$ robots\.txt$" # SkipFiles="\.css$ \.js$ \.class$ robots\.txt$" @@ -204,6 +205,7 @@ SkipFiles="\.css$ \.js$ \.class$ robots\.txt$" # match a particular string, like a particular directory, you can add this # directory name in this parameter. # The oposite parameter of "OnlyFiles" is "SkipFiles". +# Note: This parameter is not case sensitive. # Note: Use space between each value and do not remove default values # Note: \. means . and xxx$ means URL ending by xxx. # Example: "marketing_directory" @@ -280,7 +282,7 @@ Logo="awstats_logo1.png" # Example: color_name="RRGGBB" # RRGGBB is Red Green Blue components in Hex # color_Background="FFFFFF" # Background color for main page (Default = "FFFFFF") -color_TableBGTitle="CCCCDD" # Background color for table title (Default = "CCCCCC") +color_TableBGTitle="CCCCDD" # Background color for table title (Default = "CCCCDD") color_TableTitle="000000" # Table title font color (Default = "000000") color_TableBG="CCCCDD" # Background color for table (Default = "CCCCDD") color_TableRowTitle="FFFFFF" # Table row title font color (Default = "FFFFFF") diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index aa2a85d7..af17e8fe 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -13,6 +13,7 @@ #------------------------------------------------------- # ALGORITHM SUMMARY # Read config file +# Init variables # If 'update' # Get last history file name # Read this last history file (LastTime, data arrays, ...) @@ -722,7 +723,6 @@ DIV { font: 12px arial,verdana,helvetica; text-align:justify; } "; print "\n\n"; print "\n"; - &Init_HashArray; # Should be useless (to avoid problem with mod_perl that keep variables in memory). } @@ -1362,6 +1362,7 @@ sub Save_History_File { # Input: Global variables #-------------------------------------------------------------------- sub Init_HashArray { + &debug("Call to Init_HashArray [$_[0],$_[1]]"); # We purge data read for year $_[0] and month $_[1] so it's like we never read it $HistoryFileAlreadyRead{"$_[0]$_[1]"}=0; # Delete/Reinit all arrays with name beginning by _ @@ -1558,7 +1559,6 @@ $NewDNSLookup=$DNSLookup; # monthnum must be in english because it's used to translate log date in apache log files which are always in english %monthnum = ( "Jan","01","jan","01","Feb","02","feb","02","Mar","03","mar","03","Apr","04","apr","04","May","05","may","05","Jun","06","jun","06","Jul","07","jul","07","Aug","08","aug","08","Sep","09","sep","09","Oct","10","oct","10","Nov","11","nov","11","Dec","12","dec","12" ); - # Check year and month parameters if ($QueryString =~ /year=/i) { $YearRequired=$QueryString; $YearRequired =~ s/.*year=//; $YearRequired =~ s/&.*//; $YearRequired =~ s/ .*//; } if ($YearRequired !~ /^[\d][\d][\d][\d]$/) { $YearRequired=$nowyear; } @@ -1583,7 +1583,7 @@ for ($ix=1; $ix<=12; $ix++) { $FirstTime{$YearRequired.$monthix}=0;$LastTime{$YearRequired.$monthix}=0;$LastUpdate{$YearRequired.$monthix}=0; $MonthVisits{$YearRequired.$monthix}=0;$MonthUnique{$YearRequired.$monthix}=0;$MonthPages{$YearRequired.$monthix}=0;$MonthHits{$YearRequired.$monthix}=0;$MonthBytes{$YearRequired.$monthix}=0; } -&Init_HashArray; +&Init_HashArray; # Should be useless in perl (except with mod_perl that keep variables in memory). # Show logo print "\n"; @@ -1604,6 +1604,7 @@ print "

\n"; #if (($YearRequired == $nowyear) && ($MonthRequired eq "year" || $MonthRequired == $nowmonth)) { # No update (no log processing) if UpdateStats != 1 if ($UpdateStats) { + &debug("Start Update process"); #------------------------------------------ # READING THE LAST PROCESSED HISTORY FILE @@ -2159,7 +2160,8 @@ if ($UpdateStats) { # Save current processed month $monthtoprocess if ($UpdateStats && $monthtoprocess) { # If monthtoprocess is still 0, it means there was no history files and we found no valid lines in log file &Save_History_File($yeartoprocess,$monthtoprocess); # We save data for this month,year - if (($MonthRequired ne "year") && ($monthtoprocess != $MonthRequired)) { &Init_HashArray($yeartoprocess,$monthtoprocess); } # Not a desired month, so we clean data + if (($MonthRequired ne "year") && ($monthtoprocess != $MonthRequired)) { &Init_HashArray($yeartoprocess,$monthtoprocess); } # Not a desired month (wrong month), so we clean data arrays + if (($MonthRequired eq "year") && ($yeartoprocess != $YearRequired)) { &Init_HashArray($yeartoprocess,$monthtoprocess); } # Not a desired month (wrong year), so we clean data arrays } # Archive LOG file into ARCHIVELOG