From: eldy <>
Date: Sat, 27 Mar 2004 20:16:12 +0000 (+0000)
Subject: If ValidHTTPCodes or ValidSMTPCode is empty, we define it.
X-Git-Tag: AWSTATS_6_1_BETA~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb72a91cbb7f74b38be10ad06602c2cb9bf40e9b;p=thirdparty%2FAWStats.git

If ValidHTTPCodes or ValidSMTPCode is empty, we define it.
---

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 036a825e..d83a0bcf 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -96,9 +96,9 @@ $StartSeconds $StartMicroseconds
 $StartSeconds=$StartMicroseconds=0;
 # ----- Variables for config file reading -----
 use vars qw/
-$FoundNotPageList $FoundValidHTTPCodes $FoundValidSMTPCodes
+$FoundNotPageList
 /;
-$FoundNotPageList=$FoundValidHTTPCodes=$FoundValidSMTPCodes=0;
+$FoundNotPageList=0;
 # ----- Config file variables -----
 use vars qw/
 $StaticExt
@@ -1082,14 +1082,10 @@ sub Read_Config {
 	if (! $FoundNotPageList) {
 		$NotPageList{'gif'}=$NotPageList{'jpg'}=$NotPageList{'jpeg'}=$NotPageList{'png'}=$NotPageList{'bmp'}=1;
 	}
-	# If parameter ValidHTTPCodes not found, init for backward compatibility
-	if (! $FoundValidHTTPCodes) {
-		$ValidHTTPCodes{"200"}=$ValidHTTPCodes{"304"}=1;
-	}
-	# If parameter ValidSMTPCodes not found, init for backward compatibility
-	if (! $FoundValidSMTPCodes) {
-		$ValidSMTPCodes{"1"}=$ValidSMTPCodes{"250"}=1;
-	}
+	# If parameter ValidHTTPCodes empty, init for backward compatibility
+	if (! scalar keys %ValidHTTPCodes) { $ValidHTTPCodes{"200"}=$ValidHTTPCodes{"304"}=1; }
+	# If parameter ValidSMTPCodes empty, init for backward compatibility
+	if (! scalar keys %ValidSMTPCodes) { $ValidSMTPCodes{"1"}=$ValidSMTPCodes{"250"}=1; }
 }
 
 #------------------------------------------------------------------------------
@@ -1270,12 +1266,10 @@ sub Parse_Config {
 			}
 		if ($param =~ /^ValidHTTPCodes/) {
 			foreach (split(/\s+/,$value))	{ $ValidHTTPCodes{$_}=1; }
-			$FoundValidHTTPCodes=1;
 			next;
 			}
 		if ($param =~ /^ValidSMTPCodes/) {
 			foreach (split(/\s+/,$value))	{ $ValidSMTPCodes{$_}=1; }
-			$FoundValidSMTPCodes=1;
 			next;
 			}
 		if ($param =~ /^URLWithQueryWithOnlyFollowingParameters$/)	{