\n"; - } - else { - print "$messagestring\n"; - } + if ($HTMLOutput) { + $messagestring =~ s/\n/\
\n"; + } + else { + print "$messagestring\n"; + } } } -# Parameters : $string $level +# Parameters : $string $level # Input : $Debug = required level $DEBUGFORCED = required level forced sub debug { my $level = $_[1] || 1; - if ($DEBUGFORCED >= $level) { + if ($DEBUGFORCED >= $level) { my $debugstring = $_[0]; if ($DEBUGFORCED >= $level) { if (! $DebugResetDone) { open(DEBUGFORCEDFILE,"debug.log"); close DEBUGFORCEDFILE; chmod 0666,"debug.log"; $DebugResetDone=1; } @@ -387,7 +387,7 @@ sub debug { close DEBUGFORCEDFILE; } } - if ($Debug >= $level) { + if ($Debug >= $level) { my $debugstring = $_[0]; if ($HTMLOutput) { $debugstring =~ s/^ / /; $debugstring .= "
"; } print localtime(time)." - DEBUG $level - $debugstring\n"; @@ -418,7 +418,7 @@ sub SkipDNSLookup { sub DayOfWeek { my ($day, $month, $year) = @_; &debug("DayOfWeek for $day $month $year",4); - if ($month < 3) { $month += 10; $year--; } + if ($month < 3) { $month += 10; $year--; } else { $month -= 2; } my $cent = sprintf("%1i",($year/100)); my $y = ($year % 100); @@ -433,13 +433,13 @@ sub DateIsValid { &debug("DateIsValid for $day $month $year",4); if ($day < 1) { return 0; } if ($month==1 || $month==3 || $month==5 || $month==7 || $month==8 || $month==10 || $month==12) { - if ($day > 31) { return 0; } + if ($day > 31) { return 0; } } if ($month==4 || $month==6 || $month==9 || $month==11) { if ($day > 30) { return 0; } } if ($month==2) { - if ($day > 28) { return 0; } + if ($day > 28) { return 0; } } return 1; } @@ -467,12 +467,12 @@ sub Read_Config_File { chomp $_; s/\r//; if ($_ =~ /^$/) { next; } # Remove comments - if ($_ =~ /^#/) { next; } + if ($_ =~ /^#/) { next; } $_ =~ s/^([^\"]*)#.*/$1/; $_ =~ s/^([^\"]*\"[^\"]*\"[^\"]*)#.*/$1/; # Extract param and value #debug("$_",2); - my @felter=split(/=/,$_,2); + my @felter=split(/=/,$_,2); my $param=$felter[0]||next; # If not a param=value, try with next line my $value=$felter[1]; $param =~ s/^\s+//; $param =~ s/\s+$//; @@ -617,7 +617,7 @@ sub Read_Config_File { } # If ValidHTTPCodes not found, init for backward compatibility if (! $foundValidHTTPCodes) { - push @ValidHTTPCodes,"200"; push @ValidHTTPCodes,"304"; + push @ValidHTTPCodes,"200"; push @ValidHTTPCodes,"304"; } debug(" NotPageList ".@NotPageList); debug(" ValidHTTPCodes ".@ValidHTTPCodes); @@ -629,7 +629,7 @@ sub Read_Config_File { # Parameter: None # Return value: None # Input: $DIR -# Output: Arrays and Hash tables are defined +# Output: Arrays and Hash tables are defined #------------------------------------------------------------------------------ sub Read_Ref_Data { my %FilePath=(); @@ -1008,10 +1008,10 @@ sub Read_History_File { return 0; } - # If session for read (no update), file can be open with share. So POSSIBLE CHANGE HERE + # If session for read (no update), file can be open with share. So POSSIBLE CHANGE HERE open(HISTORY,"$DirData/$PROG$DayRequired$month$year$FileSuffix.txt") || error("Error: Couldn't open for read file \"$DirData/$PROG$DayRequired$month$year$FileSuffix.txt\" : $!"); # Month before Year kept for backward compatibility $MonthUnique{$year.$month}=0; $MonthPages{$year.$month}=0; $MonthHits{$year.$month}=0; $MonthBytes{$year.$month}=0; $MonthHostsKnown{$year.$month}=0; $MonthHostsUnknown{$year.$month}=0; - + my $versionmaj = my $versionmin = 0; my $countlines=0; while (
\n"; - + print "\n"; &tab_end; - } + } # BY DAY OF WEEK #------------------------- @@ -3957,7 +3957,7 @@ EOF $avg_dayofweek_k[$dayofweekcursor]+=($DayBytes{$daycursor}||0); } for (@DOWIndex) { - if ($avg_dayofweek_nb[$_]) { + if ($avg_dayofweek_nb[$_]) { $avg_dayofweek_p[$_]=sprintf("%.2f",$avg_dayofweek_p[$_]/$avg_dayofweek_nb[$_]); $avg_dayofweek_h[$_]=sprintf("%.2f",$avg_dayofweek_h[$_]/$avg_dayofweek_nb[$_]); $avg_dayofweek_k[$_]=sprintf("%.2f",$avg_dayofweek_k[$_]/$avg_dayofweek_nb[$_]); @@ -3970,8 +3970,8 @@ EOF $avg_dayofweek_h[$_]="?"; $avg_dayofweek_k[$_]="?"; } - } - for (@DOWIndex) { + } + for (@DOWIndex) { my $bredde_p=0; my $bredde_h=0; my $bredde_k=0; if ($max_h > 0) { $bredde_p=int($avg_dayofweek_p[$_]/$max_h*$BarHeight/2)+1; } if ($max_h > 0) { $bredde_h=int($avg_dayofweek_h[$_]/$max_h*$BarHeight/2)+1; } @@ -3981,18 +3981,19 @@ EOF print "
| $ix | \n"; + print "$ix | \n"; #if ($_time_p[$ix]>$max_p) { $max_p=$_time_p[$ix]; } if ($_time_h[$ix]>$max_h) { $max_h=$_time_h[$ix]; } if ($_time_k[$ix]>$max_k) { $max_k=$_time_k[$ix]; } } print "||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
![](\"$DirIcons\/clock\/hr$hr.png\"){kind=small} | \n";
}
print "|||||||||||||
| $Message[2] | $rest_p | $rest_h | ".Format_Bytes($rest_k)." | ||||||||||
| $Message[2] | $rest_p | $rest_h | ".Format_Bytes($rest_k)." | ||||||||||
| "; + print " | |||||||||||||
| "; my $nompage=$Aliases{$key}||$key; if (length($nompage)>$MaxLengthOfURL) { $nompage=substr($nompage,0,$MaxLengthOfURL)."..."; } - if ($ShowLinksOnUrl) { + if ($ShowLinksOnUrl) { if ($key =~ /^http(s|):/i) { # URL is url extracted from a proxy log file print "$nompage"; @@ -4257,7 +4258,7 @@ EOF print " | $Message[75] | "; } print "$_filetypes_h{$key} | $p % | "; if ($ShowCompressionStats) { if ($_filetypes_gz_in{$key}) { - my $percent=int(100*(1-$_filetypes_gz_out{$key}/$_filetypes_gz_in{$key})); + my $percent=int(100*(1-$_filetypes_gz_out{$key}/$_filetypes_gz_in{$key})); printf("%s | %s | %s (%s%) | ",Format_Bytes($_filetypes_gz_in{$key}),Format_Bytes($_filetypes_k{$key}),Format_Bytes($_filetypes_gz_in{$key}-$_filetypes_gz_out{$key}),$percent); } else { @@ -4284,13 +4285,13 @@ EOF } &tab_end; } - + # BY FILE SIZE #------------------------- if ($ShowFileSizesStats) { - + } - + # BY BROWSER #---------------------------- if ($ShowBrowsersStats) { @@ -4301,7 +4302,7 @@ EOF my $Total=0; foreach my $key (keys %_browser_h) { $Total+=$_browser_h{$key}; } &tab_head($Message[21],19); print "|||||||
| Browser | $Message[111] | $Message[57] | $Message[15] | ||||||||||
| OS | $Message[57] | $Message[15] | |||||||||||
| $Message[40] \n"; print "
| |||||||||||||