New: Added geoip_org_maxmind plugin and geoip_isp_maxmind plugin

diff --git a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
index 0997116b1195a32427bccaae2af9196901b91cfc..196406ecf6883c6f5cba548e7aa5f364b6451d34 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -289,7 +289,23 @@ sub ShowInfoHost_geoip_city_maxmind {
     my $param="$_[0]";
        # <-----
        if ($param eq '__title__') {
-               print "<th width=\"80\">GeoIP<br>City</th>";
+       my $NewLinkParams=${QueryString};
+       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)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/&$//;
+       if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
+
+               print "<th width=\"80\">";
+        print "<a href=\"".($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks?XMLEncode("$AWScript?${NewLinkParams}output=plugin_geoip_city_maxmind"):"$PROG$StaticLinks.plugin_geoip_city_maxmind.$StaticExt")."\"$NewLinkTarget>GeoIP<br>City</a>";
+        print "</th>";
        }
        elsif ($param) {
         my $ip=0;

diff --git a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
index ef768b8239e0fa582bc0c464fa74d1abcf1c19f0..2745dc624b4bd3e154f24cf2e68a676d86ee6d59 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_isp_maxmind.pm
@@ -104,8 +104,8 @@ sub AddHTMLGraph_geoip_isp_maxmind {
        my $rest_p; my $rest_h; my $rest_k;
 
        if ($Debug) { debug(" Plugin geoip_isp_maxmind: AddHTMLGraph $categ $menu $menulink $menutext"); }
-       my $title='Cities';
-       &tab_head("$title",19,0,'cities');
+       my $title='ISP';
+       &tab_head("$title",19,0,'isp');
        print "<tr bgcolor=\"#$color_TableBGRowTitle\"><th>ISP : ".((scalar keys %_isp_h)-($_isp_h{'unknown'}?1:0))."</th>";
        if ($ShowISP =~ /P/i) { print "<th bgcolor=\"#$color_p\" width=\"80\">$Message[56]</th>"; }
        if ($ShowISP =~ /P/i) { print "<th bgcolor=\"#$color_p\" width=\"80\">$Message[15]</th>"; }
@@ -185,7 +185,23 @@ sub ShowInfoHost_geoip_isp_maxmind {
     my $param="$_[0]";
        # <-----
        if ($param eq '__title__') {
-               print "<th width=\"80\">GeoIP<br>ISP</th>";
+       my $NewLinkParams=${QueryString};
+       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)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/&$//;
+       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 "</th>";
        }
        elsif ($param) {
         my $ip=0;

diff --git a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
index d9c1faabf53af1706e710ac7bd8af32032bb54ad..4eabaf100276bbec55e805f163c26be4b463935b 100644 (file)
--- a/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm
@@ -104,8 +104,8 @@ sub AddHTMLGraph_geoip_org_maxmind {
        my $rest_p; my $rest_h; my $rest_k;
 
        if ($Debug) { debug(" Plugin geoip_org_maxmind: AddHTMLGraph $categ $menu $menulink $menutext"); }
-       my $title='Cities';
-       &tab_head("$title",19,0,'cities');
+       my $title='Organizations';
+       &tab_head("$title",19,0,'org');
        print "<tr bgcolor=\"#$color_TableBGRowTitle\"><th>Organizations : ".((scalar keys %_org_h)-($_org_h{'unknown'}?1:0))."</th>";
        if ($ShowISP =~ /P/i) { print "<th bgcolor=\"#$color_p\" width=\"80\">$Message[56]</th>"; }
        if ($ShowISP =~ /P/i) { print "<th bgcolor=\"#$color_p\" width=\"80\">$Message[15]</th>"; }
@@ -185,7 +185,23 @@ sub ShowInfoHost_geoip_org_maxmind {
     my $param="$_[0]";
        # <-----
        if ($param eq '__title__') {
-               print "<th width=\"80\">GeoIP<br>Org</th>";
+       my $NewLinkParams=${QueryString};
+       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)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/&$//;
+       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 "</th>";
        }
        elsif ($param) {
         my $ip=0;

diff --git a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
index 7c5ab0fbf04ef7d02866098b4afdd438f3d9f85c..6b86e950e673d8c40cef8cf587cb14ef5992d1cc 100755 (executable)
--- a/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
+++ b/wwwroot/cgi-bin/plugins/geoip_region_maxmind.pm
@@ -282,7 +282,23 @@ sub ShowInfoHost_geoip_region_maxmind {
     my $param="$_[0]";
        # <-----
        if ($param eq '__title__') {
-               print "<th width=\"80\">GeoIP<br>Region</th>";
+       my $NewLinkParams=${QueryString};
+       $NewLinkParams =~ s/(^|&)update(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)output(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i;
+       $NewLinkParams =~ s/(^|&)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/&$//;
+       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 "</th>";
        }
        elsif ($param) {
         my $ip=0;