From: eldy <>
Date: Sun, 18 Apr 2004 19:44:00 +0000 (+0000)
Subject: Fixed syntax error in Year view when xhtml output is selected
X-Git-Tag: AWSTATS_6_1_BETA~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572cf16c04decae2b068bebb023d4dcd6fabfb71;p=thirdparty%2FAWStats.git

Fixed syntax error in Year view when xhtml output is selected
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index cc61ff8e..c60157d4 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -29,6 +29,7 @@ New features/improvements:
   AddHTMLContentHeader, AddHTMLContentFooter
 
 Fixes:
+- Fixed syntax error in Year view when xhtml output is selected.
 - Fixed a problem of not working misc feature when using IIS and 
   when URLWithQuery was set to 0.
 - Now all non ISO-8859-1 languages are shown correctly even with 
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index c3173ce3..c3c7f27f 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -7134,7 +7134,7 @@ if (scalar keys %HTMLOutput) {
 				print "<select class=\"aws_formfield\" name=\"month\">\n";
 				foreach (1..12) { my $monthix=sprintf("%02s",$_); print "<option".($MonthRequired eq "$monthix"?" selected=\"true\"":"")." value=\"$monthix\">$MonthNumLib{$monthix}</option>\n"; }
 				if ($AllowFullYearView >= 2) {
-					print "<option".($MonthRequired eq 'all'?" selected=\"true\"":"")." value='all'>- $Message[6] -</option>\n";
+					print "<option".($MonthRequired eq 'all'?" selected=\"true\"":"")." value=\"all\">- $Message[6] -</option>\n";
 				}
 				print "</select>\n";
 				print "<select class=\"aws_formfield\" name=\"year\">\n";
@@ -8472,8 +8472,8 @@ if (scalar keys %HTMLOutput) {
 			# Show first/last
 			print "<tr bgcolor=\"#$color_TableBGRowTitle\">";
 			print "<td class=\"aws\"><b>$Message[133]</b></td><td class=\"aws\" colspan=\"".($colspan-1)."\">\n";
-			print ($MonthRequired eq 'all'?"$Message[6] $YearRequired":"$Message[5] ".$MonthNumLib{$MonthRequired}." $YearRequired</td>");
-			print "</tr>\n";
+			print ($MonthRequired eq 'all'?"$Message[6] $YearRequired":"$Message[5] ".$MonthNumLib{$MonthRequired}." $YearRequired");
+			print "</td></tr>\n";
 			print "<tr bgcolor=\"#$color_TableBGRowTitle\">";
 			print "<td class=\"aws\"><b>$Message[8]</b></td>\n";
 			print "<td class=\"aws\" colspan=\"".($colspan-1)."\">".($FirstTime?Format_Date($FirstTime,0):"NA")."</td>";
@@ -8503,7 +8503,7 @@ if (scalar keys %HTMLOutput) {
 			}
 			else {
 				if ($LogType eq 'W' || $LogType eq 'S') { print "<td class=\"aws\">$Message[160]&nbsp;*</td>"; }
-				if ($ShowMonthStats =~ /U/i) { print "<td>".($MonthRequired eq 'all'?"<b><= $TotalUnique</b><br />$Message[129]":"<b>$TotalUnique</b><br />&nbsp;")."</td>"; } else { print "<td>&nbsp;</td>"; }
+				if ($ShowMonthStats =~ /U/i) { print "<td>".($MonthRequired eq 'all'?"<b>&lt;= $TotalUnique</b><br />$Message[129]":"<b>$TotalUnique</b><br />&nbsp;")."</td>"; } else { print "<td>&nbsp;</td>"; }
 				if ($ShowMonthStats =~ /V/i) { print "<td><b>$TotalVisits</b><br />($RatioVisits&nbsp;$Message[52])</td>"; } else { print "<td>&nbsp;</td>"; }
 				if ($ShowMonthStats =~ /P/i) { print "<td><b>$TotalPages</b><br />($RatioPages&nbsp;".lc($Message[56]."/".$Message[12]).")</td>"; } else { print "<td>&nbsp;</td>"; }
 				if ($ShowMonthStats =~ /H/i) { print "<td><b>$TotalHits</b>".($LogType eq 'M'?"":"<br />($RatioHits&nbsp;".lc($Message[57]."/".$Message[12]).")</td>"); } else { print "<td>&nbsp;</td>"; }