From: eldy <>
Date: Thu, 30 Oct 2003 18:09:54 +0000 (+0000)
Subject: Replaced Kb/visits to Kb/mails for mail log analysis.
X-Git-Tag: AWSTATS_6_0_BETA~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34487323bbefa0b9bc4fd30348676cf0f6ff0da9;p=thirdparty%2FAWStats.git

Replaced Kb/visits to Kb/mails for mail log analysis.
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 6e40cd84..bcf04053 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -8,6 +8,7 @@ Fixes:
 - Fixed bug 816267.
 - Fixed minor typo errors.
 - Fixed value for ValueSMTPCodes if not defined in config file.
+- Replaced Kb/visits to Kb/mails for mail log analysis.
 
 New features/improvements:
 - logresolvemerge.pl: can use several threads for reverse DNS lookup
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index e55798bb..9196c989 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -7993,7 +7993,7 @@ if (scalar keys %HTMLOutput) {
 			if ($TotalUnique > 0) { $RatioVisits=int($TotalVisits/$TotalUnique*100)/100; }
 			if ($TotalVisits > 0) { $RatioPages=int($TotalPages/$TotalVisits*100)/100; }
 			if ($TotalVisits > 0) { $RatioHits=int($TotalHits/$TotalVisits*100)/100; }
-			if ($TotalVisits > 0) { $RatioBytes=int(($TotalBytes/1024)*100/$TotalVisits)/100; }
+			if ($TotalVisits > 0) { $RatioBytes=int(($TotalBytes/1024)*100/($LogType eq 'M'?$TotalHits:$TotalVisits))/100; }
 	
 			print "<tr bgcolor=\"#$color_TableBGRowTitle\"><td><b>$Message[8]</b></td>\n";
 			print "<td colspan=\"3\">$Message[128]</td>";
@@ -8017,8 +8017,8 @@ if (scalar keys %HTMLOutput) {
 			if ($ShowMonthStats =~ /U/i) { print "<td>".($MonthRequired eq 'all'?"<b><= $TotalUnique</b><br />$Message[129]":"<b>$TotalUnique</b><br />&nbsp;")."</td>"; } else { print "<td>&nbsp;</td>"; }
 			if ($ShowMonthStats =~ /V/i) { print "<td><b>$TotalVisits</b><br />($RatioVisits&nbsp;$Message[52])</td>"; } else { print "<td>&nbsp;</td>"; }
 			if ($ShowMonthStats =~ /P/i) { print "<td><b>$TotalPages</b><br />($RatioPages&nbsp;".lc($Message[56]."/".$Message[12]).")</td>"; } else { print "<td>&nbsp;</td>"; }
-			if ($ShowMonthStats =~ /H/i) { print "<td><b>$TotalHits</b><br />($RatioHits&nbsp;".lc($Message[57]."/".$Message[12]).")</td>"; } else { print "<td>&nbsp;</td>"; }
-			if ($ShowMonthStats =~ /B/i) { print "<td><b>".Format_Bytes(int($TotalBytes))."</b><br />($RatioBytes&nbsp;$Message[108]/".lc($Message[12]).")</td>"; } else { print "<td>&nbsp;</td>"; }
+			if ($ShowMonthStats =~ /H/i) { print "<td><b>$TotalHits</b>".($LogType eq 'M'?"":"<br />($RatioHits&nbsp;".lc($Message[57]."/".$Message[12]).")</td>"); } else { print "<td>&nbsp;</td>"; }
+			if ($ShowMonthStats =~ /B/i) { print "<td><b>".Format_Bytes(int($TotalBytes))."</b><br />($RatioBytes&nbsp;$Message[108]/".lc($Message[($LogType eq 'M'?149:12)]).")</td>"; } else { print "<td>&nbsp;</td>"; }
 			print "</tr>\n";
 	
 			my $colspan=5;