Fixed syntax error in Year view when xhtml output is selected

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index cc61ff8efc298d6cc99fcb7a9606885db996d184..c60157d422d2cb711103273d04bc5973eeb8b4c6 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -29,6 +29,7 @@ New features/improvements:
   AddHTMLContentHeader, AddHTMLContentFooter\r
 \r
 Fixes:\r
+- Fixed syntax error in Year view when xhtml output is selected.\r
 - Fixed a problem of not working misc feature when using IIS and \r
   when URLWithQuery was set to 0.\r
 - Now all non ISO-8859-1 languages are shown correctly even with \r

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index c3173ce383932b715b7b1e749a5675657ed2dcb7..c3c7f27f19f6d23e70028252395252d8f9668a72 100644 (file)
--- 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>"; }