From: eldy <>
Date: Wed, 24 Oct 2001 21:02:25 +0000 (+0000)
Subject: no message
X-Git-Tag: AWSTATS_1_0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24f7ce233662e677bb60510737c208513a48fbe2;p=thirdparty%2FAWStats.git

no message
---

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 53b79ae5..761fb8a0 100644
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -58,7 +58,7 @@ LogFile="/var/log/httpd/mylog.log"
 #
 # Examples for Apache combined logs (this two examples are equivalent):
 # LogFormat = 1
-# LogFormat = "%host %logname %other %time1 %methodurl %code %bytesd %refererquot %uaquot"
+# LogFormat = "%host %other %logname %time1 %methodurl %code %bytesd %refererquot %uaquot"
 # Examples for IIS (this two examples are equivalent):
 # LogFormat = 2
 # LogFormat = "%time2 %host %logname %method %url %code %bytesd %other %ua %referer"
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index da232686..393067f6 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -80,7 +80,7 @@ $WarningMessages= 1;
 %MonthBytes = %MonthHits = %MonthHostsKnown = %MonthHostsUnknown = %MonthPages = %MonthUnique = %MonthVisits =
 %monthlib = %monthnum = ();
 
-$VERSION="3.2 (build 18)";
+$VERSION="3.2 (build 19)";
 $Lang="en";
 
 # Default value
@@ -1538,7 +1538,7 @@ if ($UpdateStats) {
 	&debug("Generate PerlParsingFormat from LogFormatString=$LogFormatString");
 	$PerlParsingFormat="";
 	if ($LogFormat == 1) {
-		$PerlParsingFormat="([^\\s]*) ([^\\s]*) [^\\s]* \\[([^\\s]*) [^\\s]*\\] \\\"([^\\s]*) ([^\\s]*) [^\\\"]*\\\" ([\\d|-]*) ([\\d|-]*) \\\"([^\\\"]*)\\\" \\\"([^\\\"]*)\\\"";
+		$PerlParsingFormat="([^\\s]*) [^\\s]* ([^\\s]*) \\[([^\\s]*) [^\\s]*\\] \\\"([^\\s]*) ([^\\s]*) [^\\\"]*\\\" ([\\d|-]*) ([\\d|-]*) \\\"([^\\\"]*)\\\" \\\"([^\\\"]*)\\\"";
 		$pos_rc=1;$pos_logname=2;$pos_date=3;$pos_method=4;$pos_url=5;$pos_code=6;$pos_size=7;$pos_referer=8;$pos_agent=9;
 		$lastrequiredfield=9;
 	}
@@ -1553,7 +1553,7 @@ if ($UpdateStats) {
 		$lastrequiredfield=8;
 	}
 	if ($LogFormat == 4) {
-		$PerlParsingFormat="([^\\s]*) ([^\\s]*) [^\\s]* \\[([^\\s]*) [^\\s]*\\] \\\"([^\\s]*) ([^\\s]*) [^\\\"]*\\\" ([\\d|-]*) ([\\d|-]*)";
+		$PerlParsingFormat="([^\\s]*) [^\\s]* ([^\\s]*) \\[([^\\s]*) [^\\s]*\\] \\\"([^\\s]*) ([^\\s]*) [^\\\"]*\\\" ([\\d|-]*) ([\\d|-]*)";
 		$pos_rc=1;$pos_logname=2;$pos_date=3;$pos_method=4;$pos_url=5;$pos_code=6;$pos_size=7;
 		$lastrequiredfield=7;
 	}
@@ -1568,7 +1568,7 @@ if ($UpdateStats) {
 				$pos_rc = $i; $i++;
 				$PerlParsingFormat .= "([^\\s]*) ";
 			}
-			if ($f =~ /%logname$/ || $f =~ /%l$/ || $f =~ /cs-username$/) {
+			if ($f =~ /%logname$/ || $f =~ /%u$/ || $f =~ /cs-username$/) {
 				$found=1; 
 				$pos_logname = $i; $i++;
 				$PerlParsingFormat .= "([^\\s]*) ";