From: eldy <>
Date: Fri, 12 Sep 2003 20:01:37 +0000 (+0000)
Subject: Renamed HTTP error codes into HTTP status code.
X-Git-Tag: AWSTATS_WEBMIN_1_0_RELEASE~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddeaceaac3228e391bbfaf0ca8571b4b01c9a26e;p=thirdparty%2FAWStats.git

Renamed HTTP error codes into HTTP status code.
---

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 17081a26..3440244a 100644
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -500,9 +500,12 @@ NotPageList="css js class gif jpg jpeg png bmp ico"
 
 # By default, AWStats considers that records found in web log file are
 # successful hits if HTTP code returned by server is a valid HTTP code (200
-# and 304). Any other code are reported in HTTP error chart.
-# However in some specific environment, with web server HTTP redirection,
-# you can choose to also accept other codes.
+# and 304). Any other code are reported in HTTP status chart.
+# Note that HTTP 'control codes', like redirection (302, 305) are not added by
+# default in this list as they are not pages seen by a visitor but are
+# protocol exchange codes to tell the browser to ask another page. Because
+# this other page will be counted and seen with a 200 or 304 code, if you 
+# add such codes, you will have 2 pages viewed reported for only one in facts.
 # Change : Effective for new updates only
 # Example: "200 304 302 305"
 # Default: "200 304"
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index fbb0008a..a6c98132 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -581,7 +581,8 @@ use vars qw/ @Message /;
 'Size',
 'First',
 'Last',
-'Exclude filter'
+'Exclude filter',
+'* Codes shown here gave hits or traffic "not viewed" by visitors, so are isolated in this chart.'
 );
 
 
@@ -722,7 +723,9 @@ sub tab_head {
 # Return:		None
 #------------------------------------------------------------------------------
 sub tab_end {
+	my $string=shift;
 	print "</TABLE></TD></TR></TABLE>";
+	if ($string) { print "$string<br>\n"; }
 	print "<br>\n\n";
 }
 
@@ -5740,6 +5743,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 				next;	# Next log record
 			}
 		}
+		elsif ($protocol == 2) {						# FTP record
+		}
 
 		# Analyze: Robot
 		#---------------
@@ -5776,6 +5781,7 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 		}
 
 		# Canonize and clean target URL and referrer URL
+		# to define urlwithnoquery, tokenquery and standalonequery and $field[$pos_url]
 		#-----------------------------------------------
 		if ($URLNotCaseSensitive) { $field[$pos_url] =~ tr/A-Z/a-z/; }
 		if ($protocol == 2) { $field[$pos_url] =~ s/\s/%20/g; }
@@ -5812,7 +5818,6 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {	# Updat
 			$standalonequery=$2||'';
 		}
 		if ($URLWithAnchor && $anchor) { $field[$pos_url].="#$anchor"; }	# Restore anchor
-
 		# Here now urlwithnoquery is /mydir/mypage.ext, /mydir, /, /page#XXX
 		# Here now tokenquery is '' or '?' or ';'
 		# Here now standalonequery is '' or 'param1=x'
@@ -9160,7 +9165,7 @@ if (scalar keys %HTMLOutput) {
 			&tab_end;
 		}
 	
-		# BY HTTP ERRORS
+		# BY HTTP STATUS
 		#----------------------------
 		if ($ShowHTTPErrorsStats) {
 			if ($Debug) { debug("ShowHTTPErrorsStats",2); }
@@ -9181,7 +9186,7 @@ if (scalar keys %HTMLOutput) {
 				$total_h+=$_errors_h{$key};
 				$count++;
 			}
-			&tab_end;
+			&tab_end($Message[154]);
 		}
 
 		# BY SMTP ERRORS
diff --git a/wwwroot/cgi-bin/lang/awstats-en.txt b/wwwroot/cgi-bin/lang/awstats-en.txt
index c337a6ab..c846b3b0 100644
--- a/wwwroot/cgi-bin/lang/awstats-en.txt
+++ b/wwwroot/cgi-bin/lang/awstats-en.txt
@@ -153,4 +153,5 @@ message149=Mails
 message150=Size
 message151=First
 message152=Last
-message153=Exclude filter
\ No newline at end of file
+message153=Exclude filter
+message154=* Codes shown here gave hits or traffic "not viewed" by visitors, so are isolated in this chart.
\ No newline at end of file
diff --git a/wwwroot/cgi-bin/lang/awstats-fr.txt b/wwwroot/cgi-bin/lang/awstats-fr.txt
index 2c294731..fc611701 100644
--- a/wwwroot/cgi-bin/lang/awstats-fr.txt
+++ b/wwwroot/cgi-bin/lang/awstats-fr.txt
@@ -153,4 +153,5 @@ message149=Mails
 message150=Taille
 message151=Premier
 message152=Dernier
-message153=Filtre exclusion
\ No newline at end of file
+message153=Filtre exclusion
+message154=* Les codes présentées ici sont à l'origine de hits ou de traffic "non vus" par les visiteurs, aussi sont ils isolés dans ce rapport.
\ No newline at end of file