New: Minor changes on geoip and hostinfo plugins

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 3a88bf78f820b8c842197a61fcfa26d912f7ca79..377bc765fcea6f74199c0c528bf1c022eacd7c1f 100644 (file)
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -1841,8 +1841,10 @@ sub Read_Plugins {
                }
                if ($pluginname) {
                        if (! $PluginsLoaded{'init'}{"$pluginname"}) {          # Plugin not already loaded
-                               my %pluginisfor=('timehires'=>'u','ipv6'=>'u','hashfiles'=>'u','geoip'=>'u','geoipfree'=>'u',
-                                                'geoip_region_maxmind'=>'mou','timezone'=>'ou',
+                               my %pluginisfor=('timehires'=>'u','ipv6'=>'u','hashfiles'=>'u',
+                                                'geoipfree'=>'u',
+                                                'geoip'=>'ou','geoip_region_maxmind'=>'mou','geoip_city_maxmind'=>'mou','geoip_isp_maxmind'=>'mou','geoip_org_maxmind'=>'mou',
+                                                'timezone'=>'ou',
                                                                 'decodeutfkeys'=>'o','hostinfo'=>'o','rawlog'=>'o','userinfo'=>'o','urlalias'=>'o','tooltips'=>'o');
                                if ($pluginisfor{$pluginname}) {    # If it's a known plugin, may be we don't need to load it
                        # Do not load "menu handler plugins" if output only and mainleft frame

diff --git a/wwwroot/cgi-bin/plugins/hostinfo.pm b/wwwroot/cgi-bin/plugins/hostinfo.pm
index 10473193e43415b2c98ceeec3fadf02867dccf5a..af8418afb25ecbedcacb230b4271ebdbfe4896a5 100644 (file)
--- a/wwwroot/cgi-bin/plugins/hostinfo.pm
+++ b/wwwroot/cgi-bin/plugins/hostinfo.pm
@@ -73,7 +73,7 @@ sub AddHTMLBodyHeader_hostinfo {
 function neww(a,b) {
 var wfeatures="directories=0,menubar=1,status=0,resizable=1,scrollbars=1,toolbar=0,width=$WIDTHINFO,height=$HEIGHTINFO,left=" + eval("(screen.width - $WIDTHINFO)/2") + ",top=" + eval("(screen.height - $HEIGHTINFO)/2");
 EOF
-       print "fen=window.open('".XMLEncode("$AWScript?$urlparam&host")."='+a+'&key='+b,'whois',wfeatures);\n";
+       print "fen=window.open('".XMLEncode("$AWScript?$urlparam&host")."='+a+'".XMLEncode("&key")."='+b,'whois',wfeatures);\n";
 print <<EOF;
 }
 </script>