From: eldy <> Date: Sun, 27 Jul 2003 14:38:43 +0000 (+0000) Subject: Added hostinfo plugin to handle the "Popup WhoIs link" code. X-Git-Tag: AWSTATS_5_7_BETA~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32a7984bd24e27cb4e4ea8305c17d3e3b6d97709;p=thirdparty%2FAWStats.git Added hostinfo plugin to handle the "Popup WhoIs link" code. --- diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt index 233f531a..88780251 100644 --- a/docs/awstats_changelog.txt +++ b/docs/awstats_changelog.txt @@ -28,11 +28,16 @@ New features/improvements: sendmail, postfix and qmail log files). - Added -addfilenum option in logresolvemerge.pl - Better management of plugin load failure. +- Added hostinfo plugin to handle the "Popup WhoIs link" code. Other/Documentation: - Added mp4 mime type. - Updated documentation. +Note 1: + The ShowLinksToWhoIs parameter has been removed. You must enable the plugin + 'hostinfo' to get the same result if it was used. + 5.6 diff --git a/docs/awstats_config.html b/docs/awstats_config.html index 57a169b2..2b6552f8 100644 --- a/docs/awstats_config.html +++ b/docs/awstats_config.html @@ -992,14 +992,8 @@ when reading it), follow the example:
SplitSearchString
Version : 2.24 - 4.0 (deprecated since 4.1)
+This parameter has been removed since 4.1.
AWStats 4.1+ supports both keywords AND keyphrases by default with no need of any parameter.
-
# Search engines keywords reported are full search string or separate keywords -
# Possible values: -
# 0 - Search keywords reported are full search string (ie: "town maps") -
# 1 - Search keywords reported are separated words (ie: "town" and "maps") -
# Default: 0 -
# -
SplitSearchString=0

@@ -1366,23 +1360,19 @@ ShowOSStats,ShowOriginStats,ShowKeyphrasesStats,ShowKeywordsStats,ShowHTTPErrors

ShowLinksToWhoIs
-Version : 4.0+
-
# AWStats can include a link to WhoIs database on all hostnames/ip. For this, you -
# must set ShowLinksToWhoIs to 1. Warning, a such feature depends on two next -
# parameter (LinksToWhoIs and LinksToIPWhoIs) and on WhoIs server -
# exhaustivity and availability. -
# For this reason, this feature can't be a reliable feature. -
# Possible values: 0 or 1 -
# Default: 0 -
# -
ShowLinksToWhoIs=0 + +Version : 4.0 - 5.6 (deprecated since 5.7, replaced by plugin 'hostinfo')
+This parameter has been removed since 5.7.
+You must enable the plugin 'hostinfo' to get the same result if you were using this +parameter. +

LinksToWhoIs
Version : 4.0+

# Set here the link used to point to Internet WhoIs database for hostnames. -
# This parameter is not used if ShowLinksToWhoIs is 0. +
# This parameter is not used if plugin hostinfo is not enabled.
# Default: "http://www.whois.net/search.cgi2?str="
# Example: "http://www.netsol.com/cgi-bin/whois/whois?SearchType=all&STRING="
# Example: "http://www.ripe.net/perl/whois?form_type=simple&searchtext=" @@ -1395,7 +1385,7 @@ ShowOSStats,ShowOriginStats,ShowKeyphrasesStats,ShowKeywordsStats,ShowHTTPErrors LinksToIPWhoIs
Version : 5.0+

# Set here the link used to point to Internet WhoIs database for ip addresses. -
# This parameter is not used if ShowLinksToWhoIs is 0. +
# This parameter is not used if plugin hostinfo is not enabled.
# Default: "http://ws.arin.net/cgi-bin/whois.pl?queryinput="
# Example: "http://ws.arin.net/cgi-bin/whois.pl?queryinput="
# diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index 3f014d71..69614139 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -949,19 +949,8 @@ UseHTTPSLinkForUrl="" MaxLengthOfURL=72 -# AWStats can include a link to WhoIs database on hostnames/ip. For this, you -# must set ShowLinksToWhoIs to 1. Warning, a such feature depends on two next -# parameters (LinksToWhoIs and LinksToIPWhoIs) and on WhoIs server -# exhaustivity and availability. -# For this reason, this feature can't be a reliable feature. -# Possible values: 0 or 1 -# Default: 0 -# -ShowLinksToWhoIs=0 - - # Set here the link used to point to Internet WhoIs database for hostnames. -# This parameter is not used if ShowLinksToWhoIs is 0. +# This parameter is not used if plugin hostinfo is not enabled. # Default: "http://www.whois.net/search.cgi2?str=" # Example: "http://www.ripe.net/perl/whois?form_type=simple&searchtext=" # Example: "http://ws.arin.net/cgi-bin/whois.pl?queryinput=" @@ -970,7 +959,7 @@ LinksToWhoIs="http://www.whois.net/search.cgi2?str=" # Set here the link used to point to Internet WhoIs database for ip addresses. -# This parameter is not used if ShowLinksToWhoIs is 0. +# This parameter is not used if plugin hostinfo is not enabled. # Default: "http://ws.arin.net/cgi-bin/whois.pl?queryinput=" # Example: "http://ws.arin.net/cgi-bin/whois.pl?queryinput=" # @@ -1106,6 +1095,13 @@ color_x="C1B2E2" # Background color for number of exit pages (Default = "C1B2 # #LoadPlugin="userinfo" +# Plugin: HostInfo +# Perl modules required: None +# Add a column into host chart with a clicable link to a popup that show WhoIs +# info, on a popup window. +# +#LoadPlugin="hostinfo" + # Plugin: UrlAliases # Perl modules required: None # Add a text (Page title, description...) in URL reports after URL value. diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 98184993..39c2bf56 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -27,7 +27,7 @@ $VERSION="5.7 (build $REVISION)"; use vars qw/ $DEBUGFORCED $NBOFLINESFORBENCHMARK $FRAMEWIDTH $NBOFLASTUPDATELOOKUPTOSAVE $LIMITFLUSH $NEWDAYVISITTIMEOUT $VISITTIMEOUT $NOTSORTEDRECORDTOLERANCE $MAXDIFFEXTRA -$WIDTHCOLICON $WIDTHINFO $HEIGHTINFO $TOOLTIPON +$WIDTHCOLICON $TOOLTIPON /; $DEBUGFORCED=0; # Force debug level to log lesser level into debug.log file (Keep this value to 0) $NBOFLINESFORBENCHMARK=8192; # Benchmark info are printing every NBOFLINESFORBENCHMARK lines (Must be a power of 2) @@ -39,8 +39,6 @@ $VISITTIMEOUT=10000; # Laps of time to consider a page load as a new visit. 1 $NOTSORTEDRECORDTOLERANCE=10000; # Laps of time to accept a record if not in correct order. 10000 = 1 hour (Default = 10000) $MAXDIFFEXTRA=500; $WIDTHCOLICON=32; -$WIDTHINFO=640; -$HEIGHTINFO=480; $TOOLTIPON=0; # Tooltips plugin loaded # ----- Running variables ----- use vars qw/ @@ -494,7 +492,7 @@ use vars qw/ @Message /; 'Grabber', 'Yes', 'No', -'WhoIs info', +'Info.', 'OK', 'Exit', 'Visits duration', @@ -527,7 +525,8 @@ use vars qw/ @Message /; 'Browsers with Quictime audio playing support', 'Browsers with Windows Media audio playing support', 'Browsers with PDF support', -'SMTP Error codes' +'SMTP Error codes', +'Countries' ); @@ -598,18 +597,6 @@ EOF } print "\n\n"; if ($FrameName ne 'index') { print "\n"; } - if ($FrameName ne 'index' && $FrameName ne 'mainleft' && $ShowLinksToWhoIs) { -print < -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"); - if (b==1) { fen=window.open('$LinksToWhoIs'+a,'whois',wfeatures); } - if (b==2) { fen=window.open('$LinksToIPWhoIs'+a,'whois',wfeatures); } -} - - -EOF - } } } @@ -1677,7 +1664,7 @@ sub Read_Plugins { if ($pluginname) { if (! $PluginsLoaded{'init'}{"$pluginname"}) { # Plugin not already loaded my %pluginisfor=('tooltips'=>'o','ipv6'=>'u','hashfiles'=>'u','geoip'=>'u', - 'geoipfree'=>'u','userinfo'=>'o','urlalias'=>'o','timehires'=>'u','timezone'=>'o'); + 'geoipfree'=>'u','hostinfo'=>'o','userinfo'=>'o','urlalias'=>'o','timehires'=>'u','timezone'=>'o'); if ($pluginisfor{$pluginname}) { # Do not load "update plugins" if output only if (! $UpdateStats && scalar keys %HTMLOutput && $pluginisfor{$pluginname} !~ /o/) { $PluginsLoaded{'init'}{"$pluginname"}=1; next; } @@ -1736,6 +1723,7 @@ sub Read_Plugins { error("Plugin \"$pluginfile\" is not a valid plugin name."); } } + if ($PluginsLoaded{'init'}{'geoip'} || $PluginsLoaded{'init'}{'geoipfree'}) { $Message[17]=$Message[25]=$Message[148]; } } #-------------------------------------------------------------------- @@ -1770,7 +1758,7 @@ sub Read_History_With_TmpUpdate { my $withread=0; - # Two variables used to read old format history files + # Variable used to read old format history files my $readvisitorforbackward=0; # In standard use of AWStats, the DayRequired variable is always empty @@ -4266,39 +4254,39 @@ sub ShowFormFilter { } #-------------------------------------------------------------------- -# Function: Write Host info -# Parameters: Key to used as WhoIs target -# Input: $ShowLinksToWhoIs +# Function: Write other user info (with help of plugin) +# Parameters: $user +# Input: $SiteConfig +# Output: URL link +# Return: None +#-------------------------------------------------------------------- +sub ShowUserInfo { + my $user=shift; + # Call to plugins' function ShowInfoUser + foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoUser'}}) { + my $function="ShowInfoUser_$pluginname('$user')"; + eval("$function"); + } +} + +#-------------------------------------------------------------------- +# Function: Write other host info (with help of plugin) +# Parameters: $host +# Input: $LinksToWhoIs $LinksToWhoIsIp # Output: None # Return: None #-------------------------------------------------------------------- sub ShowHostInfo { - if ($ShowLinksToWhoIs) { - my $keyurl=shift; - my $keyforwhois; - my $linkforwhois; - if ($keyurl =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { # IPv4 address - $keyforwhois=$keyurl; - $linkforwhois=2; - } - elsif ($keyurl =~ /^[0-9A-F]*:/i) { # IPv6 address - $keyforwhois=$keyurl; - $linkforwhois=2; - } - else { # Hostname - $keyurl =~ /([-\w]+\.[-\w]+\.(au|uk|jp|nz))$/ or $keyurl =~ /([-\w]+\.[-\w]+)$/; - $keyforwhois=$1; - $linkforwhois=1; - } - print ""; - if ($keyforwhois && $linkforwhois) { print "?"; } - else { print " " } - print ""; + my $host=shift; + # Call to plugins' function ShowInfoHost + foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoHost'}}) { + my $function="ShowInfoHost_$pluginname('$host')"; + eval("$function"); } } #-------------------------------------------------------------------- -# Function: Write URL info (with plugins info) +# Function: Write other url info (with help of plugin) # Parameters: $url # Input: %Aliases $MaxLengthOfURL $ShowLinksOnUrl $SiteDomain $UseHTTPSLinkForUrl # Output: URL link @@ -4336,22 +4324,6 @@ sub ShowURLInfo { } } -#-------------------------------------------------------------------- -# Function: Write other user info -# Parameters: $user -# Input: %Aliases $MaxLengthOfURL $ShowLinksOnUrl $SiteDomain $UseHTTPSLinkForUrl -# Output: URL link -# Return: None -#-------------------------------------------------------------------- -sub ShowUserInfo { - my $user=shift; - # Call to plugins' function ShowInfoUser - foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoUser'}}) { - my $function="ShowInfoUser_$pluginname('$user')"; - eval("$function"); - } -} - #-------------------------------------------------------------------- # Function: Define value for PerlParsingFormat (used for regex log record parsing) # Parameters: - @@ -6363,100 +6335,109 @@ if (scalar keys %HTMLOutput) { # Print menu links if (($HTMLOutput{'main'} && $FrameName ne 'mainright') || $FrameName eq 'mainleft') { # If main page asked + # Define link anchor my $linkanchor=($FrameName eq 'mainleft'?"$AWScript?${NewLinkParams}":""); if ($linkanchor && ($linkanchor !~ /framename=mainright/)) { $linkanchor.="framename=mainright"; } $linkanchor =~ s/&$//; my $targetpage=($FrameName eq 'mainleft'?" target=mainright":""); - my $linetitle=1; - print "\n"; - # When - $linetitle=&AtLeastOneNotNull($ShowMonthStats,$ShowDaysOfMonthStats,$ShowDaysOfWeekStats,$ShowHoursStats); - if ($linetitle) { print "$Message[93]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowMonthStats) { print ($frame?"":""); print "$Message[128]"; print ($frame?"\n":" "); } - #if ($ShowMonthDayStats) { print ($frame?" $\"...\"$ ":""); print "$Message[130]\n"; print ($frame?"\n":" "); } - if ($ShowDaysOfMonthStats) { print ($frame?"":""); print "$Message[138]"; print ($frame?"\n":" "); } - if ($ShowDaysOfWeekStats) { print ($frame?"":""); print "$Message[91]"; print ($frame?"\n":" "); } - if ($ShowHoursStats) { print ($frame?"":""); print "$Message[20]"; print ($frame?"\n":" "); } - if ($linetitle) { print ($frame?"":"\n"); } - # Who - $linetitle=&AtLeastOneNotNull($ShowDomainsStats,$ShowHostsStats,$ShowAuthenticatedUsers,$ShowEMailSenders,$ShowEMailReceivers,$ShowRobotsStats,$ShowWormsStats); - if ($linetitle) { print "$Message[92]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowDomainsStats) { print ($frame?"":""); print "$Message[17]"; print ($frame?"\n":" "); } - if ($ShowDomainsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowHostsStats) { print ($frame?"":""); print "".ucfirst($Message[81]).""; print ($frame?"\n":" "); } - if ($ShowHostsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowHostsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } - if ($ShowHostsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[45]\n"; print ($frame?"\n":" "); } - if ($ShowAuthenticatedUsers) { print ($frame?"":""); print "$Message[94]"; print ($frame?"\n":" "); } - if ($ShowAuthenticatedUsers) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowAuthenticatedUsers =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } - if ($ShowEMailSenders) { print ($frame?"":""); print "$Message[131]"; print ($frame?"\n":" "); } - if ($ShowEMailSenders) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowEMailSenders =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } - if ($ShowEMailReceivers) { print ($frame?"":""); print "$Message[132]"; print ($frame?"\n":" "); } - if ($ShowEMailReceivers) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowEMailReceivers =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } - if ($ShowRobotsStats) { print ($frame?"":""); print "$Message[53]"; print ($frame?"\n":" "); } - if ($ShowRobotsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowRobotsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } -# if ($ShowWormsStats) { print ($frame?"":""); print "$Message[136]"; print ($frame?"\n":" "); } -# if ($ShowWormsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } -# if ($ShowWormsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } - if ($linetitle) { print ($frame?"":"\n"); } - # Navigation - $linetitle=&AtLeastOneNotNull($ShowSessionsStats,$ShowPagesStats,$ShowFileTypesStats,$ShowFileSizesStats,$ShowOSStats,$ShowBrowsersStats,$ShowScreenSizeStats); - if ($linetitle) { print "$Message[72]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowSessionsStats) { print ($frame?"":""); print "$Message[117]"; print ($frame?"\n":" "); } - if ($ShowFileTypesStats) { print ($frame?"":""); print "$Message[73]"; print ($frame?"\n":" "); } - if ($ShowPagesStats) { print ($frame?"":""); print "$Message[29]\n"; print ($frame?"\n":" "); } - if ($ShowPagesStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } - if ($ShowPagesStats =~ /E/i) { print ($frame?" $\"...\"$ ":""); print "$Message[104]\n"; print ($frame?"\n":" "); } - if ($ShowPagesStats =~ /X/i) { print ($frame?" $\"...\"$ ":""); print "$Message[116]\n"; print ($frame?"\n":" "); } - if ($ShowOSStats) { print ($frame?"":""); print "$Message[59]"; print ($frame?"\n":" "); } - if ($ShowOSStats) { print ($frame?" $\"...\"$ ":""); print "$Message[58]\n"; print ($frame?"\n":" "); } - if ($ShowOSStats) { print ($frame?" $\"...\"$ ":""); print "$Message[0]\n"; print ($frame?"\n":" "); } - if ($ShowBrowsersStats) { print ($frame?"":""); print "$Message[21]"; print ($frame?"\n":" "); } - if ($ShowBrowsersStats) { print ($frame?" $\"...\"$ ":""); print "$Message[58]\n"; print ($frame?"\n":" "); } - if ($ShowBrowsersStats) { print ($frame?" $\"...\"$ ":""); print "$Message[0]\n"; print ($frame?"\n":" "); } - if ($ShowScreenSizeStats) { print ($frame?"":""); print "$Message[135]"; print ($frame?"\n":" "); } - if ($linetitle) { print ($frame?"":"\n"); } - # Referers - $linetitle=&AtLeastOneNotNull($ShowOriginStats,$ShowKeyphrasesStats,$ShowKeywordsStats); - if ($linetitle) { print "$Message[23]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowOriginStats) { print ($frame?"":""); print "$Message[37]\n"; print ($frame?"\n":" "); } - if ($ShowOriginStats) { print ($frame?" $\"...\"$ ":""); print "$Message[126]\n"; print ($frame?"\n":" "); } - if ($ShowOriginStats) { print ($frame?" $\"...\"$ ":""); print "$Message[127]\n"; print ($frame?"\n":" "); } - if ($ShowKeyphrasesStats || $ShowKeywordsStats) { print ($frame?"":""); print "$Message[14]"; print ($frame?"\n":" "); } - if ($ShowKeyphrasesStats) { print ($frame?" $\"...\"$ ":""); print "$Message[120]\n"; print ($frame?"\n":" "); } - if ($ShowKeywordsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[121]\n"; print ($frame?"\n":" "); } - if ($linetitle) { print ($frame?"":"\n"); } - # Others - $linetitle=&AtLeastOneNotNull($ShowFileTypesStats=~/C/i,$ShowMiscStats,$ShowHTTPErrorsStats,$ShowSMTPErrorsStats); - if ($linetitle) { print "$Message[2]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowFileTypesStats =~ /C/i) { print ($frame?"":""); print "$Message[98]"; print ($frame?"\n":" "); } - if ($ShowMiscStats) { print ($frame?"":""); print "$Message[139]"; print ($frame?"\n":" "); } - if ($ShowHTTPErrorsStats) { print ($frame?"":""); print "$Message[22]"; print ($frame?"\n":" "); } - foreach my $code (keys %TrapInfosForHTTPErrorCodes) { - if ($ShowHTTPErrorsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[31]\n"; print ($frame?"\n":" "); } - } - if ($ShowSMTPErrorsStats) { print ($frame?"":""); print "$Message[147]"; print ($frame?"\n":" "); } - if ($linetitle) { print ($frame?"":"\n"); } - # Extra/Marketing - $linetitle=&AtLeastOneNotNull(@ExtraStatTypes); - if ($linetitle) { print "$Message[134]: \n"; } - if ($linetitle) { print ($frame?"\n":""); } - foreach my $extranum (1..@ExtraName-1) { - print ($frame?"":""); print "$ExtraName[$extranum]\n"; print ($frame?"\n":" "); + my $linetitle; + # Print Menu + if (! $PluginsLoaded{'ShowMenu'}{'menuapplet'}) { + # Menu HTML + print "\n"; + # When + $linetitle=&AtLeastOneNotNull($ShowMonthStats,$ShowDaysOfMonthStats,$ShowDaysOfWeekStats,$ShowHoursStats); + if ($linetitle) { print "

$Message[93]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowMonthStats) { print ($frame?"":""); print "$Message[128]"; print ($frame?"\n":" "); } + #if ($ShowMonthDayStats) { print ($frame?" $\"...\"$ ":""); print "$Message[130]\n"; print ($frame?"\n":" "); } + if ($ShowDaysOfMonthStats) { print ($frame?"":""); print "$Message[138]"; print ($frame?"\n":" "); } + if ($ShowDaysOfWeekStats) { print ($frame?"":""); print "$Message[91]"; print ($frame?"\n":" "); } + if ($ShowHoursStats) { print ($frame?"":""); print "$Message[20]"; print ($frame?"\n":" "); } + if ($linetitle) { print ($frame?"":"\n"); } + # Who + $linetitle=&AtLeastOneNotNull($ShowDomainsStats,$ShowHostsStats,$ShowAuthenticatedUsers,$ShowEMailSenders,$ShowEMailReceivers,$ShowRobotsStats,$ShowWormsStats); + if ($linetitle) { print "

$Message[92]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowDomainsStats) { print ($frame?"":""); print "$Message[148]"; print ($frame?"\n":" "); } + if ($ShowDomainsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowHostsStats) { print ($frame?"":""); print "".ucfirst($Message[81]).""; print ($frame?"\n":" "); } + if ($ShowHostsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowHostsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } + if ($ShowHostsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[45]\n"; print ($frame?"\n":" "); } + if ($ShowAuthenticatedUsers) { print ($frame?"":""); print "$Message[94]"; print ($frame?"\n":" "); } + if ($ShowAuthenticatedUsers) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowAuthenticatedUsers =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } + if ($ShowEMailSenders) { print ($frame?"":""); print "$Message[131]"; print ($frame?"\n":" "); } + if ($ShowEMailSenders) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowEMailSenders =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } + if ($ShowEMailReceivers) { print ($frame?"":""); print "$Message[132]"; print ($frame?"\n":" "); } + if ($ShowEMailReceivers) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowEMailReceivers =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } + if ($ShowRobotsStats) { print ($frame?"":""); print "$Message[53]"; print ($frame?"\n":" "); } + if ($ShowRobotsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowRobotsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } +# if ($ShowWormsStats) { print ($frame?"":""); print "$Message[136]"; print ($frame?"\n":" "); } +# if ($ShowWormsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } +# if ($ShowWormsStats =~ /L/i) { print ($frame?" $\"...\"$ ":""); print "$Message[9]\n"; print ($frame?"\n":" "); } + if ($linetitle) { print ($frame?"":"\n"); } + # Navigation + $linetitle=&AtLeastOneNotNull($ShowSessionsStats,$ShowPagesStats,$ShowFileTypesStats,$ShowFileSizesStats,$ShowOSStats,$ShowBrowsersStats,$ShowScreenSizeStats); + if ($linetitle) { print "

$Message[72]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowSessionsStats) { print ($frame?"":""); print "$Message[117]"; print ($frame?"\n":" "); } + if ($ShowFileTypesStats) { print ($frame?"":""); print "$Message[73]"; print ($frame?"\n":" "); } + if ($ShowPagesStats) { print ($frame?"":""); print "$Message[29]\n"; print ($frame?"\n":" "); } + if ($ShowPagesStats) { print ($frame?" $\"...\"$ ":""); print "$Message[80]\n"; print ($frame?"\n":" "); } + if ($ShowPagesStats =~ /E/i) { print ($frame?" $\"...\"$ ":""); print "$Message[104]\n"; print ($frame?"\n":" "); } + if ($ShowPagesStats =~ /X/i) { print ($frame?" $\"...\"$ ":""); print "$Message[116]\n"; print ($frame?"\n":" "); } + if ($ShowOSStats) { print ($frame?"":""); print "$Message[59]"; print ($frame?"\n":" "); } + if ($ShowOSStats) { print ($frame?" $\"...\"$ ":""); print "$Message[58]\n"; print ($frame?"\n":" "); } + if ($ShowOSStats) { print ($frame?" $\"...\"$ ":""); print "$Message[0]\n"; print ($frame?"\n":" "); } + if ($ShowBrowsersStats) { print ($frame?"":""); print "$Message[21]"; print ($frame?"\n":" "); } + if ($ShowBrowsersStats) { print ($frame?" $\"...\"$ ":""); print "$Message[58]\n"; print ($frame?"\n":" "); } + if ($ShowBrowsersStats) { print ($frame?" $\"...\"$ ":""); print "$Message[0]\n"; print ($frame?"\n":" "); } + if ($ShowScreenSizeStats) { print ($frame?"":""); print "$Message[135]"; print ($frame?"\n":" "); } + if ($linetitle) { print ($frame?"":"\n"); } + # Referers + $linetitle=&AtLeastOneNotNull($ShowOriginStats,$ShowKeyphrasesStats,$ShowKeywordsStats); + if ($linetitle) { print "

$Message[23]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowOriginStats) { print ($frame?"":""); print "$Message[37]\n"; print ($frame?"\n":" "); } + if ($ShowOriginStats) { print ($frame?" $\"...\"$ ":""); print "$Message[126]\n"; print ($frame?"\n":" "); } + if ($ShowOriginStats) { print ($frame?" $\"...\"$ ":""); print "$Message[127]\n"; print ($frame?"\n":" "); } + if ($ShowKeyphrasesStats || $ShowKeywordsStats) { print ($frame?"":""); print "$Message[14]"; print ($frame?"\n":" "); } + if ($ShowKeyphrasesStats) { print ($frame?" $\"...\"$ ":""); print "$Message[120]\n"; print ($frame?"\n":" "); } + if ($ShowKeywordsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[121]\n"; print ($frame?"\n":" "); } + if ($linetitle) { print ($frame?"":"\n"); } + # Others + $linetitle=&AtLeastOneNotNull($ShowFileTypesStats=~/C/i,$ShowMiscStats,$ShowHTTPErrorsStats,$ShowSMTPErrorsStats); + if ($linetitle) { print "

$Message[2]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowFileTypesStats =~ /C/i) { print ($frame?"":""); print "$Message[98]"; print ($frame?"\n":" "); } + if ($ShowMiscStats) { print ($frame?"":""); print "$Message[139]"; print ($frame?"\n":" "); } + if ($ShowHTTPErrorsStats) { print ($frame?"":""); print "$Message[22]"; print ($frame?"\n":" "); } + foreach my $code (keys %TrapInfosForHTTPErrorCodes) { + if ($ShowHTTPErrorsStats) { print ($frame?" $\"...\"$ ":""); print "$Message[31]\n"; print ($frame?"\n":" "); } + } + if ($ShowSMTPErrorsStats) { print ($frame?"":""); print "$Message[147]"; print ($frame?"\n":" "); } + if ($linetitle) { print ($frame?"":"\n"); } + # Extra/Marketing + $linetitle=&AtLeastOneNotNull(@ExtraStatTypes); + if ($linetitle) { print "$Message[134]: \n"; } + if ($linetitle) { print ($frame?"\n":""); } + foreach my $extranum (1..@ExtraName-1) { + print ($frame?"":""); print "$ExtraName[$extranum]\n"; print ($frame?"\n":" "); + } + if ($linetitle) { print ($frame?"":"\n"); } + print "\n"; + } + else { + # Menu Applet + if ($frame) { } + else {} } - if ($linetitle) { print ($frame?"":"\n"); } - print "\n"; print ($frame?"":"
\n"); - } # Print Back link elsif (! $HTMLOutput{'main'}) { @@ -6779,7 +6760,7 @@ if (scalar keys %HTMLOutput) { # exit(0); # } if ($HTMLOutput{'alldomains'}) { - print "$Center
\n"; + print "$Center
\n"; # Show domains list my $title=''; my $cpt=0; if ($HTMLOutput{'alldomains'}) { $title.="$Message[25]"; $cpt=(scalar keys %_domener_h); } @@ -6859,7 +6840,7 @@ if (scalar keys %HTMLOutput) { else { print "$Message[102] : ".(scalar keys %_host_h); } } print ""; - if ($ShowLinksToWhoIs && $LinksToWhoIs) { print "$Message[114]"; } + &ShowHostInfo('__title__'); if ($ShowHostsStats =~ /P/i) { print "$Message[56]"; } if ($ShowHostsStats =~ /H/i) { print "$Message[57]"; } if ($ShowHostsStats =~ /B/i) { print "$Message[75]"; } @@ -6902,7 +6883,7 @@ if (scalar keys %HTMLOutput) { print "$Center
\n"; &tab_head("$Message[45]",19); print "".(scalar keys %_host_h)." $Message[1]"; - if ($ShowLinksToWhoIs && $LinksToWhoIs) { print "$Message[114]"; } + &ShowHostInfo('__title__'); if ($ShowHostsStats =~ /P/i) { print "$Message[56]"; } if ($ShowHostsStats =~ /H/i) { print "$Message[57]"; } if ($ShowHostsStats =~ /B/i) { print "$Message[75]"; } @@ -8137,7 +8118,7 @@ if (scalar keys %HTMLOutput) { #--------------------------- if ($ShowDomainsStats) { if ($Debug) { debug("ShowDomainsStats",2); } - print "$Center
\n"; + print "$Center
\n"; my $title="$Message[25] ($Message[77] $MaxNbOf{'Domain'}) - $Message[80]"; &tab_head("$title",19); print " $Message[17]"; @@ -8205,7 +8186,7 @@ if (scalar keys %HTMLOutput) { print ""; if ($MonthRequired ne 'all') { 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]"; } + &ShowHostInfo('__title__'); if ($ShowHostsStats =~ /P/i) { print "$Message[56]"; } if ($ShowHostsStats =~ /H/i) { print "$Message[57]"; } if ($ShowHostsStats =~ /B/i) { print "$Message[75]"; }