From: eldy <> Date: Wed, 23 Oct 2002 13:01:29 +0000 (+0000) Subject: Remove DecodeEncodedString on parameters from command line. X-Git-Tag: AWSTATS_5_1_RELEASE~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e44e775657947900aba955f3be853ebcd6ae084d;p=thirdparty%2FAWStats.git Remove DecodeEncodedString on parameters from command line. --- diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 95c01814..2462d5b4 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -4103,11 +4103,11 @@ else { # Run from command line } # TODO Check if ARGV is an AllowedArg if ($_ > 0) { $QueryString .= "&"; } - my $NewLinkParams=$ARGV[$_]; $NewLinkParams =~ s/^-+//; $NewLinkParams =~ s/\s/%20/g; + my $NewLinkParams=$ARGV[$_]; $NewLinkParams =~ s/^-+//; $QueryString .= "$NewLinkParams"; } $QueryString = CleanFromCSSA($QueryString); - if ($QueryString =~ /config=([^\s&]+)/i) { $SiteConfig=$1; } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=$1; } $UpdateStats=1; $HTMLOutput=""; # Update with no report by default when run from command line if ($QueryString =~ /showsteps/i) { $ShowSteps=1; } $QueryString=~s/showsteps[^&]*//i; @@ -4117,9 +4117,9 @@ else { # Run from command line $QueryString=~s/showdropped[^&]*//i; if ($QueryString =~ /showunknownorigin/i) { $ShowUnknownOrigin=1; } $QueryString=~s/showunknownorigin[^&]*//i; - if ($QueryString =~ /logfile=([^\s&]+)/i ) { $LogFile="$1"; } - if ($QueryString =~ /output=urldetail:([^\s&]+)/i) { $URLFilter="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed - if ($QueryString =~ /urlfilter=([^\s&]+)/i) { $URLFilter="$1"; } # Filter on URL list can also be defined with urlfilter=filter + if ($QueryString =~ /logfile=([^&]+)/i ) { $LogFile="$1"; } + if ($QueryString =~ /output=urldetail:([^&]+)/i) { $URLFilter="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed + if ($QueryString =~ /urlfilter=([^&]+)/i) { $URLFilter="$1"; } # Filter on URL list can also be defined with urlfilter=filter } if ($QueryString =~ /staticlinks/i) { $StaticLinks=".$SiteConfig"; }