File name with space inside were not correctly reported when doing FTP log server...

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 1f83b08b4c3697a85074b45a0dc6a8fa3f6d4bef..4d809db7a4725d957f94914cce6849fd6baee911 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -1,5 +1,21 @@
 AWStats Changelog
 -----------------
+$Revision$ - $Author$ - $Date$ 
+
+
+5.4
+
+Fixes:
+- File name with space inside were not correctly reported when doing
+  FTP log server analysis.
+
+New features/improvments:
+- Added urlbuildalias.pl tool.
+- Added URL in possible values for ExtraSection first column.
+
+Other/Documentation:
+- Added list of loaded plugins in AWStats copyright string.
+- Updated documentation.
 
 
 5.3
@@ -15,7 +31,7 @@ Fixes:
 - Fixed: Columns not aligned in allhosts and lasthosts view when not all
   fields are choosed.
 
-New features/improvments
+New features/improvments:
 - Added awstats_exportlib.pl tool.
 - Added 'Full list' view for Domains/Country report.
 - Added 'Full list' and 'Last visits' for email senders/receivers chart.
@@ -23,7 +39,7 @@ New features/improvments
 - New parameter: Added AuthenticatedUsersNotCaseSensitive.
 - Speed increased when ExtraSection is used.
 
-Other/Documentation
+Other/Documentation:
 - Updates to AWStats robots, os, browsers, search_engines databases.
 - Added awstats_logo3.png
 - Added X11 as Unknown Unix OS, and Atari OS.
@@ -122,8 +138,8 @@ Note 1:
     awstats.pl -migrate="/fullpath/awstatsMMYYYY.configval.txt"
 
 Note 2:
-  Old deprecated command line parameter site= has been removed.
-  Use config= instead (replace site= since 3.0).
+  Old deprecated command line parameters -h and site= have been removed.
+  Use config= instead.
 
 
 5.0

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 34137efbef5097b589edef3bc32f436d1c68b3bb..5994147863da6df97e2b90b39bea1dc897c3658c 100644 (file)
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -4155,7 +4155,7 @@ sub AtLeastOneNotNull() {
 #--------------------------------------------------------------------
 # Function:     Insert a form filter
 # Parameters:   name of filter field, default value for filter field
-# Input:        $StaticLinks, $queryString
+# Input:        $StaticLinks, $QueryString
 # Output:       HTML Form
 # Return:       None
 #--------------------------------------------------------------------
@@ -4473,6 +4473,8 @@ if ($ENV{'GATEWAY_INTERFACE'}) {  # Run from a browser
        #my $ExpireDelayInHTTPHeader=0;
        #print "Expires: ".(gmtime($starttime()+$ExpireDelayInHTTPHeader))."\n";
        print "\n";
+
+       # Prepare QueryString
        if ($ENV{'CONTENT_LENGTH'}) {
                binmode STDIN;
                read(STDIN, $QueryString, $ENV{'CONTENT_LENGTH'});
@@ -4503,6 +4505,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) {  # Run from a browser
        }
 }
 else {                                                         # Run from command line
+       # Prepare QueryString
        for (0..@ARGV-1) {
                if ($ARGV[$_] =~ /^(-|)migrate=/) {
                        $MigrateStats=$ARGV[$_];
@@ -4510,8 +4513,8 @@ else {                                                            # Run from command line
                        $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//;        # SiteConfig is not required for migrate
                        next;
                }
-               # TODO Check if ARGV is an AllowedArg
-               if ($_ > 0) { $QueryString .= '&'; }
+               # TODO Check if ARGV is in @AllowedArg
+               if ($QueryString) { $QueryString .= '&'; }
                my $NewLinkParams=$ARGV[$_]; $NewLinkParams =~ s/^-+//;
                $QueryString .= "$NewLinkParams";
        }
@@ -5191,6 +5194,7 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') {  # Updat
                # Canonize and clean target URL and referrer URL
                #-----------------------------------------------
                if ($URLNotCaseSensitive) { $field[$pos_url] =~ tr/A-Z/a-z/; }
+               if ($protocol == 2) { $field[$pos_url] =~ s/\s/%20/g; }
                # Possible URL syntax for $field[$pos_url]: /mydir/mypage.ext?param1=x&param2=y#aaa, /mydir/mypage.ext#aaa, /
                my $urlwithnoquery;
                my $tokenquery;