\n";
$max_h=$max_k=1;
@@ -7346,8 +7361,9 @@ EOF
if ($ShowDomainsStats) {
if ($Debug) { debug("ShowDomainsStats",2); }
print "$Center
\n";
- &tab_head("$Message[25]",19);
- print "| $Message[17] | $Message[105] | ";
+ my $title="$Message[25] ($Message[77] $MaxNbOfDomain)";
+ &tab_head("$title",19);
+ print "
|---|
| | $Message[17] | ";
if ($ShowDomainsStats =~ /P/i) { print "$Message[56] | "; }
if ($ShowDomainsStats =~ /H/i) { print "$Message[57] | "; }
if ($ShowDomainsStats =~ /B/i) { print "$Message[75] | "; }
@@ -7366,11 +7382,12 @@ EOF
if ($_domener_h{$key} && $bredde_h==1) { $bredde_h=2; }
if ($max_k > 0) { $bredde_k=int($BarWidth*($_domener_k{$key}||0)/$max_k)+1; }
if ($_domener_k{$key} && $bredde_k==1) { $bredde_k=2; }
- if ($key eq 'ip' || ! $DomainsHashIDLib{$key}) {
- print "
|---|
![\"$Message[0]\"](\"$DirIcons\/flags\/ip.png\") | $Message[0] | $key | ";
+ my $newkey=lc($key);
+ if ($newkey eq 'ip' || ! $DomainsHashIDLib{$newkey}) {
+ print " | $Message[0] | $newkey | ";
}
else {
- print " ![\"$key\"](\"$DirIcons\/flags\/$key.png\") | $DomainsHashIDLib{$key} | $key | ";
+ print " ![\"$newkey\"](\"$DirIcons\/flags\/$newkey.png\") | $DomainsHashIDLib{$newkey} | $newkey | ";
}
if ($ShowDomainsStats =~ /P/i) { print "$_domener_p{$key} | "; }
if ($ShowDomainsStats =~ /H/i) { print "$_domener_h{$key} | "; }
@@ -7379,7 +7396,8 @@ EOF
if ($ShowDomainsStats =~ /P/i) { print "![\"$Message[56]:](\"$DirIcons\/other\/$BarImageHorizontal_p\" "\\"$Message[56]:")
\n"; }
if ($ShowDomainsStats =~ /H/i) { print "![\"$Message[57]:](\"$DirIcons\/other\/$BarImageHorizontal_h\" "\\"$Message[57]:")
\n"; }
if ($ShowDomainsStats =~ /B/i) { print "![\"$Message[75]:](\"$DirIcons\/other\/$BarImageHorizontal_k\" "\\"$Message[75]:") "; }
- print " \n";
+ print "";
+ print "\n";
$total_p += $_domener_p{$key};
$total_h += $_domener_h{$key};
$total_k += $_domener_k{$key}||0;
@@ -7389,7 +7407,7 @@ EOF
$rest_h=$TotalHits-$total_h;
$rest_k=$TotalBytes-$total_k;
if ($rest_p > 0 || $rest_h > 0 || $rest_k > 0) { # All other domains (known or not)
- print "| $Message[2] | ";
+ print " | | $Message[2] | ";
if ($ShowDomainsStats =~ /P/i) { print "$rest_p | "; }
if ($ShowDomainsStats =~ /H/i) { print "$rest_h | "; }
if ($ShowDomainsStats =~ /B/i) { print "".Format_Bytes($rest_k)." | "; }
@@ -7404,9 +7422,13 @@ EOF
if ($ShowHostsStats) {
if ($Debug) { debug("ShowHostsStats",2); }
print "$Center
\n";
- &tab_head("$Message[81] ($Message[77] $MaxNbOfHostsShown) - $Message[80] - $Message[9] - $Message[45]",19);
- if ($MonthRequired ne 'year') { print " | $Message[81] : $TotalHostsKnown $Message[82], $TotalHostsUnknown $Message[1] - $TotalUnique $Message[11] | "; }
- else { print "
|---|
| $Message[81] : ".(scalar keys %_host_h)." | "; }
+ my $title="$Message[81] ($Message[77] $MaxNbOfHostsShown) - $Message[80] - $Message[9] - $Message[45]";
+ &tab_head("$title",19);
+ print "
|---|
";
+# print "";
+ print "| ";
+ if ($MonthRequired ne 'year') { print "$Message[81] : $TotalHostsKnown $Message[82], $TotalHostsUnknown $Message[1] - $TotalUnique $Message[11] | "; }
+ else { print "$Message[81] : ".(scalar keys %_host_h).""; }
if ($ShowLinksToWhoIs && $LinksToWhoIs) { print "$Message[114] | "; }
if ($ShowHostsStats =~ /P/i) { print "$Message[56] | "; }
if ($ShowHostsStats =~ /H/i) { print "$Message[57] | "; }
@@ -7417,14 +7439,25 @@ EOF
my $count=0;
&BuildKeyList($MaxNbOfHostsShown,$MinHitHost,\%_host_h,\%_host_p);
foreach my $key (@keylist) {
- print "";
- print "| $key | ";
+ print " ";
+ # Add flag for IP if geoip plugin enabled
+# if ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) {
+# my $countrycode=$key; # We store hostname or ip to resolve it into country
+# GetCountryCodeByAddr_geoip($countrycode);
+# if ($DomainsHashIDLib{$countrycode}) {
+# print "![\"".$DomainsHashIDLib{$countrycode}."\"](\"$DirIcons\/flags\/$countrycode.png\") | ";
+# }
+# else {
+# print " | ";
+# }
+# }
+ print "$key | ";
if ($ShowLinksToWhoIs && $LinksToWhoIs) { ShowWhoIsCell($key); }
if ($ShowHostsStats =~ /P/i) { print "".($_host_p{$key}||" ")." | "; }
if ($ShowHostsStats =~ /H/i) { print "$_host_h{$key} | "; }
if ($ShowHostsStats =~ /B/i) { print "".Format_Bytes($_host_k{$key})." | "; }
if ($ShowHostsStats =~ /L/i) { print "".($_host_l{$key}?Format_Date($_host_l{$key},1):"-")." | "; }
- print " \n";
+ print " \n";
$total_p += $_host_p{$key};
$total_h += $_host_h{$key};
$total_k += $_host_k{$key}||0;
@@ -7434,7 +7467,8 @@ EOF
$rest_h=$TotalHits-$total_h;
$rest_k=$TotalBytes-$total_k;
if ($rest_p > 0 || $rest_h > 0 || $rest_k > 0) { # All other visitors (known or not)
- print "| $Message[2] | ";
+ print " ";
+ print "| $Message[2] | ";
if ($ShowLinksToWhoIs && $LinksToWhoIs) { print " | "; }
if ($ShowHostsStats =~ /P/i) { print "$rest_p | "; }
if ($ShowHostsStats =~ /H/i) { print "$rest_h | "; }
@@ -7581,7 +7615,7 @@ EOF
if ($ShowPagesStats =~ /E/i) { print "$Message[104] | "; }
if ($ShowPagesStats =~ /X/i) { print "$Message[116] | "; }
# Call to plugin function ShowPagesAddField
- foreach my $pluginname (keys %{$PluginsLoaded{"ShowPagesAddField"}}) {
+ foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
my $function="ShowPagesAddField_$pluginname('title')";
eval("$function");
}
@@ -7612,7 +7646,7 @@ EOF
if ($ShowPagesStats =~ /E/i) { print "".($_url_e{$key}?$_url_e{$key}:" ")." | "; }
if ($ShowPagesStats =~ /X/i) { print "".($_url_x{$key}?$_url_x{$key}:" ")." | "; }
# Call to plugin function ShowPagesAddField
- foreach my $pluginname (keys %{$PluginsLoaded{"ShowPagesAddField"}}) {
+ foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
my $function="ShowPagesAddField_$pluginname('$key')";
eval("$function");
}
@@ -7639,7 +7673,7 @@ EOF
if ($ShowPagesStats =~ /E/i) { print "".($rest_e?$rest_e:" ")." | "; }
if ($ShowPagesStats =~ /X/i) { print "".($rest_x?$rest_x:" ")." | "; }
# Call to plugin function ShowPagesAddField
- foreach my $pluginname (keys %{$PluginsLoaded{"ShowPagesAddField"}}) {
+ foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
my $function="ShowPagesAddField_$pluginname('')";
eval("$function");
}
@@ -7709,13 +7743,13 @@ EOF
foreach my $key (@keylist) {
my $p=int($_os_h{$key}/$Total*1000)/10;
if ($key eq "Unknown") {
- print " ![\"$Message[0]\"](\"$DirIcons\/os\/unknown.png\") | $Message[0] | $_os_h{$key} | ";
+ print " | $Message[0] | $_os_h{$key} | ";
print "$p % | \n";
}
else {
my $newos=$OSHashLib{$key}||$key;
my $nameicon=lc($key); $nameicon =~ s/[^\w]+//g;
- print "![\"\"](\"$DirIcons\/os\/$nameicon.png\") | $newos | $_os_h{$key} | ";
+ print " | $newos | $_os_h{$key} | ";
print "$p % | \n";
}
$count++;
@@ -7742,7 +7776,7 @@ EOF
foreach my $key (@keylist) {
my $p=int($new_browser_h{$key}/$Total*1000)/10;
if ($key eq "Unknown") {
- print "![\"$Message[0]\"](\"$DirIcons\/browser\/unknown.png\") | $Message[0] | ? | $_browser_h{$key} | $p% | \n";
+ print " | $Message[0] | ? | $_browser_h{$key} | $p% | \n";
}
else {
my $keywithoutcumul=$key; $keywithoutcumul =~ s/cumul$//i;
@@ -7750,7 +7784,7 @@ EOF
my $nameicon=$BrowsersHashIcon{$keywithoutcumul}||"notavailable";
if ($libbrowser eq "netscape") { $libbrowser="Netscape ($Message[58])"; }
if ($libbrowser eq "msie") { $libbrowser="MS Internet Explorer ($Message[58])"; }
- print "![\"\"](\"$DirIcons\/browser\/$nameicon.png\") | $libbrowser | ".($BrowsersHereAreGrabbers{$key}?"$Message[112]":"$Message[113]")." | $new_browser_h{$key} | $p % | \n";
+ print " | $libbrowser | ".($BrowsersHereAreGrabbers{$key}?"$Message[112]":"$Message[113]")." | $new_browser_h{$key} | $p % | \n";
}
$count++;
}
|