no message

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 53b79ae51a4a8d5c3325f14a64aaacf1ff9de0bb..761fb8a092b3e50cf6fbca9bfc9b54ff21c60f2b 100644 (file)
--- 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 da232686bb0c598c7a65ca43370eaf9b77e47438..393067f658fbad10d986c40641756a76d019c6fa 100644 (file)
--- 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]*) ";