Fix: Bad link to geoip reports

diff --git a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
index 77aceb4838b2336d8aba18ff9065d3a490553a11..50e9a7da9c9da2d59b21ebfadc7301573bf8b81b 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -4416,17 +4416,18 @@ sub ShowInfoHost_geoip_city_maxmind {
        # <-----
        if ($param eq '__title__') {
        my $NewLinkParams=${QueryString};
-       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)framename=[^&]*//i;
+       $NewLinkParams =~ s/(^|&|&amp;)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)framename=[^&]*//i;
        my $NewLinkTarget='';
        if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; }
        if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) {
                $NewLinkParams.="&framename=mainright";
                $NewLinkTarget=" target=\"mainright\"";
        }
-       $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//;
+       $NewLinkParams =~ s/(&amp;|&)+/&amp;/i;
+       $NewLinkParams =~ s/^&amp;//; $NewLinkParams =~ s/&amp;$//;
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";

diff --git a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
index ee00b2722316fa796362c7c0b390dfbb133fdcea..c9865a3b54eef20ef59b1b4de8ac104797e13894 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
@@ -188,17 +188,18 @@ sub ShowInfoHost_geoip_isp_maxmind {
        # <-----
        if ($param eq '__title__') {
        my $NewLinkParams=${QueryString};
-       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)framename=[^&]*//i;
+       $NewLinkParams =~ s/(^|&|&amp;)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)framename=[^&]*//i;
        my $NewLinkTarget='';
        if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; }
        if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) {
                $NewLinkParams.="&framename=mainright";
                $NewLinkTarget=" target=\"mainright\"";
        }
-       $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//;
+       $NewLinkParams =~ s/(&amp;|&)+/&amp;/i;
+       $NewLinkParams =~ s/^&amp;//; $NewLinkParams =~ s/&amp;$//;
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";

diff --git a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
index 401842196d3b3ee51390612d8cfad5d9553b89d2..5ba90b04471becd5135e6b8bd2902a4026cb49f2 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
@@ -188,17 +188,18 @@ sub ShowInfoHost_geoip_org_maxmind {
        # <-----
        if ($param eq '__title__') {
        my $NewLinkParams=${QueryString};
-       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)framename=[^&]*//i;
+       $NewLinkParams =~ s/(^|&|&amp;)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)framename=[^&]*//i;
        my $NewLinkTarget='';
        if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; }
        if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) {
                $NewLinkParams.="&framename=mainright";
                $NewLinkTarget=" target=\"mainright\"";
        }
-       $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//;
+       $NewLinkParams =~ s/(&amp;|&)+/&amp;/i;
+       $NewLinkParams =~ s/^&amp;//; $NewLinkParams =~ s/&amp;$//;
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";

diff --git a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
index c5a21440f2b2bac5b417593e2e694a469565ab71..9c9ea804d34255fb8c29b2a87823543f5c132a7f 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
@@ -283,17 +283,18 @@ sub ShowInfoHost_geoip_region_maxmind {
        # <-----
        if ($param eq '__title__') {
        my $NewLinkParams=${QueryString};
-       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
-       $NewLinkParams =~ s/(^|&)framename=[^&]*//i;
+       $NewLinkParams =~ s/(^|&|&amp;)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&|&amp;)framename=[^&]*//i;
        my $NewLinkTarget='';
        if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; }
        if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) {
                $NewLinkParams.="&framename=mainright";
                $NewLinkTarget=" target=\"mainright\"";
        }
-       $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//;
+       $NewLinkParams =~ s/(&amp;|&)+/&amp;/i;
+       $NewLinkParams =~ s/^&amp;//; $NewLinkParams =~ s/&amp;$//;
        if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
 
                print "<th width=\"80\">";