Fix: Regresionn on geoip plugins

diff --git a/wwwroot/cgi-bin/plugins/example/example.pm b/wwwroot/cgi-bin/plugins/example/example.pm
index 441bad3873debf72392473de32d828142ddb7355..6f7f60ec03b59f68f7fcda7a244ac3ab65541ed2 100644 (file)
--- a/wwwroot/cgi-bin/plugins/example/example.pm
+++ b/wwwroot/cgi-bin/plugins/example/example.pm
@@ -278,7 +278,7 @@ sub SectionReadHistory_example {
 #              }
 #              $_=<HISTORY>;
 #              chomp $_; s/\r//;
-#              @field=split(/\s+/,($xmlold?CleanFromTags($_):$_));
+#              @field=split(/\s+/,($xmlold?XMLDecodeFromHisto($_):$_));
 #              $countlines++;
 #      }
 #      until ($field[0] eq 'END_PLUGIN_example' || $field[0] eq "${xmleb}END_PLUGIN_example" || ! $_);

diff --git a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
index 053f690b30433e01f4a6c73e5b2d13a4368c24ad..589d561df0aaf3d50fdf08fb00035525f4d95545 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -4777,7 +4777,7 @@ sub SectionReadHistory_geoip_city_maxmind {
                }
                $_=<HISTORY>;
                chomp $_; s/\r//;
-               @field=split(/\s+/,($xmlold?CleanFromTags($_):$_));
+               @field=split(/\s+/,($xmlold?XMLDecodeFromHisto($_):$_));
                $countlines++;
        }
        until ($field[0] eq 'END_PLUGIN_geoip_city_maxmind' || $field[0] eq "${xmleb}END_PLUGIN_geoip_city_maxmind" || ! $_);

diff --git a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
index cb4950e4b427df21af39509835ef6f6d71c794fc..717e0730bc9c65702248d36cae4a8b19fae69f06 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
@@ -389,7 +389,7 @@ sub SectionReadHistory_geoip_isp_maxmind {
                }
                $_=<HISTORY>;
                chomp $_; s/\r//;
-               @field=split(/\s+/,($xmlold?CleanFromTags($_):$_));
+               @field=split(/\s+/,($xmlold?XMLDecodeFromHisto($_):$_));
                $countlines++;
        }
        until ($field[0] eq 'END_PLUGIN_geoip_isp_maxmind' || $field[0] eq "${xmleb}END_PLUGIN_geoip_isp_maxmind" || ! $_);

diff --git a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
index aecc35b8a282afe526dffa4f87dedb676c2e5f42..1e7a80f70438b0baddc1ebfe90fed75a196fb0ef 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
@@ -389,7 +389,7 @@ sub SectionReadHistory_geoip_org_maxmind {
                }
                $_=<HISTORY>;
                chomp $_; s/\r//;
-               @field=split(/\s+/,($xmlold?CleanFromTags($_):$_));
+               @field=split(/\s+/,($xmlold?XMLDecodeFromHisto($_):$_));
                $countlines++;
        }
        until ($field[0] eq 'END_PLUGIN_geoip_org_maxmind' || $field[0] eq "${xmleb}END_PLUGIN_geoip_org_maxmind" || ! $_);

diff --git a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
index 38528b3610f4eb6fa89236fc512562acf593b99b..486ba32c4f025ae0f11f234a309812ff8770e957 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
@@ -514,7 +514,7 @@ sub SectionReadHistory_geoip_region_maxmind {
                }
                $_=<HISTORY>;
                chomp $_; s/\r//;
-               @field=split(/\s+/,($xmlold?CleanFromTags($_):$_));
+               @field=split(/\s+/,($xmlold?XMLDecodeFromHisto($_):$_));
                $countlines++;
        }
        until ($field[0] eq 'END_PLUGIN_geoip_region_maxmind' || $field[0] eq "${xmleb}END_PLUGIN_geoip_region_maxmind" || ! $_);