Fixes: Pb in XML output with geoip plugin enabled

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 7ff31f1de4b8688683d8bfa736f83d127c137cf4..7c4d2a563a3282196ad4b61a1415f3a3433645cf 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -18,6 +18,7 @@ Fixes:
 - Fixed broken maxmind citi, org and isp plugins.
 - Fix: Security fix 2001151.
 - Remove   in name html tag to have HtmlHeadSection first
+- Fix: [ 2038681 ] missing <br _/_> in plugins/geoip_org_maxmind.pm
 
 Other/Documentation:
 - None

diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl
index f1cb1b7c5ee69dc1e8ffb2780f8051fdc262b62a..d00536042e7c94ef50a82cb0fd98477df3e70ab7 100644 (file)
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
@@ -115,7 +115,7 @@ sub debug {
        my $level = $_[1] || 1;
        if ($Debug >= $level) {
                my $debugstring = $_[0];
-               if ($ENV{"GATEWAY_INTERFACE"}) { $debugstring =~ s/^ /&nbsp&nbsp /; $debugstring .= "<br>"; }
+               if ($ENV{"GATEWAY_INTERFACE"}) { $debugstring =~ s/^ /&nbsp&nbsp /; $debugstring .= "<br />"; }
                print localtime(time)." - DEBUG $level - $debugstring\n";
        }
 }

diff --git a/wwwroot/cgi-bin/plugins/example/example.pm b/wwwroot/cgi-bin/plugins/example/example.pm
index 6f7f60ec03b59f68f7fcda7a244ac3ab65541ed2..ae4cfc03e545ce29b454fd3cbd7e980339544c24 100644 (file)
--- a/wwwroot/cgi-bin/plugins/example/example.pm
+++ b/wwwroot/cgi-bin/plugins/example/example.pm
@@ -143,7 +143,7 @@ sub AddHTMLContentHeader_example {
 #-----------------------------------------------------------------------------
 sub BuildFullHTMLOutput_example {
        # <-----
-       print "This is an output for plugin example<br>\n";
+       print "This is an output for plugin example<br />\n";
        return 1;
        # ----->
 }

diff --git a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
index bfa911d466ca80528b7c4910192a5abe6f8bccf2..e69232ef39af1ac1b52579e86dd595ac496ebfa0 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
@@ -223,7 +223,7 @@ sub ShowInfoHost_geoip_isp_maxmind {
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";
-        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_isp_maxmind"):"$PROG$StaticLinks.plugin_geoip_isp_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br>ISP</a>";
+        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_isp_maxmind"):"$PROG$StaticLinks.plugin_geoip_isp_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br />ISP</a>";
         print "</th>";
        }
        elsif ($param) {

diff --git a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
index 6cb9fc9a4f76e5ca44705929867f6253cc6cc5f3..4b96ff62838b59d3de9dd67f50f1e05272d72174 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
@@ -223,7 +223,7 @@ sub ShowInfoHost_geoip_org_maxmind {
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";
-        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_org_maxmind"):"$PROG$StaticLinks.plugin_geoip_org_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br>Org</a>";
+        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_org_maxmind"):"$PROG$StaticLinks.plugin_geoip_org_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br />Org</a>";
         print "</th>";
        }
        elsif ($param) {

diff --git a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
index 3432675db9b71b74a6c07c3ea31bbc4271e6faa3..aa5db96abcdf5cda8444498751f08b1f11885e22 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
@@ -366,7 +366,7 @@ sub ShowInfoHost_geoip_region_maxmind {
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";
-        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_region_maxmind"):"$PROG$StaticLinks.plugin_geoip_region_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br>Region</a>";
+        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_region_maxmind"):"$PROG$StaticLinks.plugin_geoip_region_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br />Region</a>";
         print "</th>";
        }
        elsif ($param) {