From: eldy <> Date: Fri, 9 Apr 2004 20:00:21 +0000 (+0000) Subject: Reduced awstats main code size. X-Git-Tag: AWSTATS_6_1_BETA~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e29aff89d19df7225b9469de49faf1ab7486f781;p=thirdparty%2FAWStats.git Reduced awstats main code size. --- diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 8af8a63e..45a1f196 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -673,21 +673,21 @@ sub html_end { #------------------------------------------------------------------------------ # Function: Print on stdout tab header of a chart -# Parameters: $title $tooltip_number [$width percentage of chart title] +# Parameters: $title $tooltipnb [$width percentage of chart title] # Input: None # Output: None # Return: None #------------------------------------------------------------------------------ sub tab_head { my $title=shift; - my $tooltip=shift; + my $tooltipnb=shift; my $width=shift||70; my $class=shift; if ($width == 70 && $QueryString =~ /buildpdf/i) { print "\n"; } else { print "
\n"; } - if ($tooltip) { - print ""; + if ($tooltipnb) { + print ""; } else { print ""; @@ -4568,6 +4568,18 @@ sub AtLeastOneNotNull { return 0; } +#------------------------------------------------------------------------------ +# Function: Return the string to add in html tag to include popup javascript code +# Parameters: tooltip number +# Input: None +# Output: None +# Return: string with javascript code +#------------------------------------------------------------------------------ +sub Tooltip { + my $ttnb=shift; + return ($TOOLTIPON?" onmouseover=\"ShowTip($ttnb);\" onmouseout=\"HideTip($ttnb);\"":""); +} + #------------------------------------------------------------------------------ # Function: Insert a form filter # Parameters: Name of filter field, default for filter field, default for exclude filter field @@ -4982,8 +4994,8 @@ sub ShowEmailSendersChart { } &tab_head("$title",19,0,'emailsenders'); print ""; - if ($ShowEMailSenders =~ /H/i) { print ""; } - if ($ShowEMailSenders =~ /B/i) { print ""; } + if ($ShowEMailSenders =~ /H/i) { print ""; } + if ($ShowEMailSenders =~ /B/i) { print ""; } if ($ShowEMailSenders =~ /M/i) { print ""; } if ($ShowEMailSenders =~ /L/i) { print ""; } print "\n"; @@ -5055,8 +5067,8 @@ sub ShowEmailReceiversChart { } &tab_head("$title",19,0,'emailreceivers'); print ""; - if ($ShowEMailReceivers =~ /H/i) { print ""; } - if ($ShowEMailReceivers =~ /B/i) { print ""; } + if ($ShowEMailReceivers =~ /H/i) { print ""; } + if ($ShowEMailReceivers =~ /B/i) { print ""; } if ($ShowEMailReceivers =~ /M/i) { print ""; } if ($ShowEMailReceivers =~ /L/i) { print ""; } print "\n"; @@ -7469,11 +7481,11 @@ if (scalar keys %HTMLOutput) { # # Show data array for month # print "
$title
$title
$title
$Message[131] : ".(scalar keys %_emails_h)."$Message[57]$Message[75]$Message[57]$Message[75]$Message[106]$Message[9]
$Message[132] : ".(scalar keys %_emailr_h)."$Message[57]$Message[75]$Message[57]$Message[75]$Message[106]$Message[9]
\n"; # print ""; -# if ($ShowMonthDayStats =~ /U/i) { print ""; } -# if ($ShowMonthDayStats =~ /V/i) { print ""; } -# if ($ShowMonthDayStats =~ /P/i) { print ""; } -# if ($ShowMonthDayStats =~ /H/i) { print ""; } -# if ($ShowMonthDayStats =~ /B/i) { print ""; } +# if ($ShowMonthDayStats =~ /U/i) { print ""; } +# if ($ShowMonthDayStats =~ /V/i) { print ""; } +# if ($ShowMonthDayStats =~ /P/i) { print ""; } +# if ($ShowMonthDayStats =~ /H/i) { print ""; } +# if ($ShowMonthDayStats =~ /B/i) { print ""; } # print "\n"; # for (my $ix=1; $ix<=12; $ix++) { # my $monthix=($ix<10?"0$ix":"$ix"); @@ -7587,7 +7599,7 @@ if (scalar keys %HTMLOutput) { # print "\n"; # } # print ""; -# print "\n"; +# print "\n"; # print "\n"; # print "\n"; # print "
$Message[5]$Message[11]$Message[10]$Message[56]$Message[57]$Message[75]$Message[11]$Message[10]$Message[56]$Message[57]$Message[75]
 $Message[96]$Message[96]
\n
\n"; @@ -7595,10 +7607,10 @@ if (scalar keys %HTMLOutput) { # # Show data array for days # print "\n"; # print ""; -# if ($ShowMonthDayStats =~ /V/i) { print ""; } -# if ($ShowMonthDayStats =~ /P/i) { print ""; } -# if ($ShowMonthDayStats =~ /H/i) { print ""; } -# if ($ShowMonthDayStats =~ /B/i) { print ""; } +# if ($ShowMonthDayStats =~ /V/i) { print ""; } +# if ($ShowMonthDayStats =~ /P/i) { print ""; } +# if ($ShowMonthDayStats =~ /H/i) { print ""; } +# if ($ShowMonthDayStats =~ /B/i) { print ""; } # print "\n"; # foreach my $daycursor ($firstdaytoshowtime..$lastdaytoshowtime) { # $daycursor =~ /^(\d\d\d\d)(\d\d)(\d\d)/; @@ -8332,7 +8344,7 @@ if (scalar keys %HTMLOutput) { if ($HTMLOutput{'keyphrases'}) { print "$Center 
\n"; &tab_head($Message[43],19,0,'keyphrases'); - print "\n"; + print "\n"; $total_s=0; my $count=0; &BuildKeyList($MaxRowsInHTMLOutput,$MinHit{'Keyphrase'},\%_keyphrases,\%_keyphrases); @@ -8361,7 +8373,7 @@ if (scalar keys %HTMLOutput) { if ($HTMLOutput{'keywords'}) { print "$Center 
\n"; &tab_head($Message[44],19,0,'keywords'); - print "\n"; + print "\n"; $total_s=0; my $count=0; &BuildKeyList($MaxRowsInHTMLOutput,$MinHit{'Keyword'},\%_keywords,\%_keywords); @@ -8474,11 +8486,11 @@ if (scalar keys %HTMLOutput) { # Show main indicators title row print ""; if ($LogType eq 'W' || $LogType eq 'S') { print ""; } - if ($ShowMonthStats =~ /U/i) { print ""; } else { print ""; } - if ($ShowMonthStats =~ /V/i) { print ""; } else { print ""; } - if ($ShowMonthStats =~ /P/i) { print ""; } else { print ""; } - if ($ShowMonthStats =~ /H/i) { print ""; } else { print ""; } - if ($ShowMonthStats =~ /B/i) { print ""; } else { print ""; } + if ($ShowMonthStats =~ /U/i) { print ""; } else { print ""; } + if ($ShowMonthStats =~ /V/i) { print ""; } else { print ""; } + if ($ShowMonthStats =~ /P/i) { print ""; } else { print ""; } + if ($ShowMonthStats =~ /H/i) { print ""; } else { print ""; } + if ($ShowMonthStats =~ /B/i) { print ""; } else { print ""; } print "\n"; # Show main indicators values for viewed traffic print ""; @@ -8631,11 +8643,11 @@ if (scalar keys %HTMLOutput) { if ($AddDataArrayMonthStats) { print "
$Message[4]$Message[10]$Message[56]$Message[57]$Message[75]$Message[10]$Message[56]$Message[57]$Message[75]
$TotalDifferentKeyphrases $Message[103]$Message[14]$Message[15]
$TotalDifferentKeyphrases $Message[103]$Message[14]$Message[15]
$TotalDifferentKeywords $Message[13]$Message[14]$Message[15]
$TotalDifferentKeywords $Message[13]$Message[14]$Message[15]
 $Message[11] $Message[10] $Message[56] $Message[57] $Message[75] $Message[11] $Message[10] $Message[56] $Message[57] $Message[75] 
\n"; print ""; - if ($ShowMonthStats =~ /U/i) { print ""; } - if ($ShowMonthStats =~ /V/i) { print ""; } - if ($ShowMonthStats =~ /P/i) { print ""; } - if ($ShowMonthStats =~ /H/i) { print ""; } - if ($ShowMonthStats =~ /B/i) { print ""; } + if ($ShowMonthStats =~ /U/i) { print ""; } + if ($ShowMonthStats =~ /V/i) { print ""; } + if ($ShowMonthStats =~ /P/i) { print ""; } + if ($ShowMonthStats =~ /H/i) { print ""; } + if ($ShowMonthStats =~ /B/i) { print ""; } print "\n"; for (my $ix=1; $ix<=12; $ix++) { my $monthix=sprintf("%02s",$ix); @@ -8820,7 +8832,7 @@ if (scalar keys %HTMLOutput) { print "\n"; } print ""; - print "\n"; + print "\n"; print "\n"; print "
$Message[5]$Message[11]$Message[10]$Message[56]$Message[57]$Message[75]$Message[11]$Message[10]$Message[56]$Message[57]$Message[75]
 $Message[96]$Message[96]
\n"; } @@ -8830,10 +8842,10 @@ if (scalar keys %HTMLOutput) { if ($AddDataArrayShowDaysOfMonthStats) { print "\n"; print ""; - if ($ShowDaysOfMonthStats =~ /V/i) { print ""; } - if ($ShowDaysOfMonthStats =~ /P/i) { print ""; } - if ($ShowDaysOfMonthStats =~ /H/i) { print ""; } - if ($ShowDaysOfMonthStats =~ /B/i) { print ""; } + if ($ShowDaysOfMonthStats =~ /V/i) { print ""; } + if ($ShowDaysOfMonthStats =~ /P/i) { print ""; } + if ($ShowDaysOfMonthStats =~ /H/i) { print ""; } + if ($ShowDaysOfMonthStats =~ /B/i) { print ""; } print ""; foreach my $daycursor ($firstdaytoshowtime..$lastdaytoshowtime) { $daycursor =~ /^(\d\d\d\d)(\d\d)(\d\d)/; @@ -8959,7 +8971,7 @@ if (scalar keys %HTMLOutput) { print "\n"; } print "\n"; - print "\n"; + print "\n"; for (@DOWIndex) { print "".$Message[$_+84].""; } @@ -8971,9 +8983,9 @@ if (scalar keys %HTMLOutput) { if ($AddDataArrayShowDaysOfWeekStats) { print "
$Message[4]$Message[10]$Message[56]$Message[57]$Message[75]$Message[10]$Message[56]$Message[57]$Message[75]
\n"; print ""; - if ($ShowDaysOfWeekStats =~ /P/i) { print ""; } - if ($ShowDaysOfWeekStats =~ /H/i) { print ""; } - if ($ShowDaysOfWeekStats =~ /B/i) { print ""; } + if ($ShowDaysOfWeekStats =~ /P/i) { print ""; } + if ($ShowDaysOfWeekStats =~ /H/i) { print ""; } + if ($ShowDaysOfWeekStats =~ /B/i) { print ""; } for (@DOWIndex) { print ""; print ""; @@ -9041,13 +9053,13 @@ if (scalar keys %HTMLOutput) { } print "\n"; # Show hour lib - print ""; + print ""; for (my $ix=0; $ix<=23; $ix++) { print "\n"; # width=19 instead of 18 to avoid a MacOS browser bug. } print "\n"; # Show clock icon - print "\n"; + print "\n"; for (my $ix=0; $ix<=23; $ix++) { my $hrs=($ix>=12?$ix-12:$ix); my $hre=($ix>=12?$ix-11:$ix+1); @@ -9066,9 +9078,9 @@ if (scalar keys %HTMLOutput) { print "
$Message[4]$Message[56]$Message[57]$Message[75]
$Message[56]$Message[57]$Message[75]
".$Message[$_+84]."
$ix
\n"; print ""; - if ($ShowHoursStats =~ /P/i) { print ""; } - if ($ShowHoursStats =~ /H/i) { print ""; } - if ($ShowHoursStats =~ /B/i) { print ""; } + if ($ShowHoursStats =~ /P/i) { print ""; } + if ($ShowHoursStats =~ /H/i) { print ""; } + if ($ShowHoursStats =~ /B/i) { print ""; } print ""; for (my $ix=0; $ix<=11; $ix++) { my $monthix=($ix<10?"0$ix":"$ix"); @@ -9087,9 +9099,9 @@ if (scalar keys %HTMLOutput) { print "
$Message[20]$Message[56]$Message[57]$Message[75]$Message[56]$Message[57]$Message[75]
\n"; print ""; - if ($ShowHoursStats =~ /P/i) { print ""; } - if ($ShowHoursStats =~ /H/i) { print ""; } - if ($ShowHoursStats =~ /B/i) { print ""; } + if ($ShowHoursStats =~ /P/i) { print ""; } + if ($ShowHoursStats =~ /H/i) { print ""; } + if ($ShowHoursStats =~ /B/i) { print ""; } print "\n"; for (my $ix=12; $ix<=23; $ix++) { my $monthix=($ix<10?"0$ix":"$ix"); @@ -9120,9 +9132,9 @@ if (scalar keys %HTMLOutput) { my $title="$Message[25] ($Message[77] $MaxNbOf{'Domain'})   -   $Message[80]"; &tab_head("$title",19,0,'countries'); print ""; - if ($ShowDomainsStats =~ /P/i) { print ""; } - if ($ShowDomainsStats =~ /H/i) { print ""; } - if ($ShowDomainsStats =~ /B/i) { print ""; } + if ($ShowDomainsStats =~ /P/i) { print ""; } + if ($ShowDomainsStats =~ /H/i) { print ""; } + if ($ShowDomainsStats =~ /B/i) { print ""; } print ""; print "\n"; $total_p=$total_h=$total_k=0; @@ -9185,9 +9197,9 @@ if (scalar keys %HTMLOutput) { if ($MonthRequired ne 'all') { print "$Message[81] : $TotalHostsKnown $Message[82], $TotalHostsUnknown $Message[1] - $TotalUnique $Message[11]"; } else { print "$Message[81] : ".(scalar keys %_host_h).""; } &ShowHostInfo('__title__'); - if ($ShowHostsStats =~ /P/i) { print ""; } - if ($ShowHostsStats =~ /H/i) { print ""; } - if ($ShowHostsStats =~ /B/i) { print ""; } + if ($ShowHostsStats =~ /P/i) { print ""; } + if ($ShowHostsStats =~ /H/i) { print ""; } + if ($ShowHostsStats =~ /B/i) { print ""; } if ($ShowHostsStats =~ /L/i) { print ""; } print "\n"; $total_p=$total_h=$total_k=0; @@ -9245,9 +9257,9 @@ if (scalar keys %HTMLOutput) { &tab_head("$title",19,0,'logins'); print ""; &ShowUserInfo('__title__'); - if ($ShowAuthenticatedUsers =~ /P/i) { print ""; } - if ($ShowAuthenticatedUsers =~ /H/i) { print ""; } - if ($ShowAuthenticatedUsers =~ /B/i) { print ""; } + if ($ShowAuthenticatedUsers =~ /P/i) { print ""; } + if ($ShowAuthenticatedUsers =~ /H/i) { print ""; } + if ($ShowAuthenticatedUsers =~ /B/i) { print ""; } if ($ShowAuthenticatedUsers =~ /L/i) { print ""; } print "\n"; $total_p=$total_h=$total_k=0; @@ -9293,7 +9305,7 @@ if (scalar keys %HTMLOutput) { if ($Debug) { debug("ShowRobotStats",2); } print "$Center 
\n"; &tab_head("$Message[53] ($Message[77] $MaxNbOf{'RobotShown'})   -   $Message[80]   -   $Message[9]",19,0,'robots'); - print ""; + print ""; if ($ShowRobotsStats =~ /H/i) { print ""; } if ($ShowRobotsStats =~ /B/i) { print ""; } if ($ShowRobotsStats =~ /L/i) { print ""; } @@ -9338,7 +9350,7 @@ if (scalar keys %HTMLOutput) { if ($Debug) { debug("ShowWormsStats",2); } print "$Center 
\n"; &tab_head("$Message[163] ($Message[77] $MaxNbOf{'WormsShown'})",19,0,'worms'); - print ""; + print ""; print ""; print ""; if ($ShowWormsStats =~ /H/i) { print ""; } @@ -9392,7 +9404,7 @@ if (scalar keys %HTMLOutput) { my $Totals=0; foreach (@SessionsRange) { $average_s+=($_session{$_}||0)*$SessionsAverage{$_}; $Totals+=$_session{$_}||0; } if ($Totals) { $average_s=int($average_s/$Totals); } else { $average_s='?'; } - print "\n"; + print "\n"; $average_s=0; $total_s=0; my $count=0; @@ -9410,7 +9422,7 @@ if (scalar keys %HTMLOutput) { if ($rest_s > 0) { # All others sessions my $p=0; if ($TotalVisits) { $p=int($rest_s/$TotalVisits*1000)/10; } - print ""; + print ""; print ""; print ""; print "\n"; @@ -9429,8 +9441,8 @@ if (scalar keys %HTMLOutput) { if ($ShowFileTypesStats =~ /C/i) { $title.=" - $Message[98]"; } &tab_head("$title",19,0,'filetypes'); print ""; - if ($ShowFileTypesStats =~ /H/i) { print ""; } - if ($ShowFileTypesStats =~ /B/i) { print ""; } + if ($ShowFileTypesStats =~ /H/i) { print ""; } + if ($ShowFileTypesStats =~ /B/i) { print ""; } if ($ShowFileTypesStats =~ /C/i) { print ""; } print "\n"; my $total_con=0; my $total_cre=0; @@ -9751,7 +9763,7 @@ if (scalar keys %HTMLOutput) { if ($ShowOriginStats =~ /H/i) { print ""; } print "\n"; #------- Referrals by search engines - print "
$Message[20]$Message[56]$Message[57]$Message[75]$Message[56]$Message[57]$Message[75]
 $Message[17]$Message[56]$Message[57]$Message[75]$Message[56]$Message[57]$Message[75] 
$Message[56]$Message[57]$Message[75]$Message[56]$Message[57]$Message[75]$Message[9]
$Message[94] : ".(scalar keys %_login_h)."$Message[56]$Message[57]$Message[75]$Message[56]$Message[57]$Message[75]$Message[9]
".(scalar keys %_robot_h)." $Message[51]*
".(scalar keys %_robot_h)." $Message[51]*$Message[57]$Message[75]$Message[9]
".(scalar keys %_worm_h)." $Message[164]*$Message[167]$Message[57]
$Message[10]: $TotalVisits - $Message[96]: $average_s s$Message[10]$Message[15]
$Message[10]: $TotalVisits - $Message[96]: $average_s s$Message[10]$Message[15]
$Message[0]$Message[0]$rest_s".($rest_s?"$p %":" ")."
$Message[73]$Message[57]$Message[15]$Message[75]$Message[15]$Message[57]$Message[15]$Message[75]$Message[15]$Message[100]$Message[101]$Message[99]
".($_from_h[5]?$_from_h[5]:" ")."".($_from_h[5]?"$p_h[5] %":" ")."
$Message[40] - $Message[80]
\n"; + print "		$Message[40] - $Message[80]
\n"; if (scalar keys %_se_referrals_h) { print "\n"; $total_p=0; $total_h=0; @@ -9783,7 +9795,7 @@ if (scalar keys %HTMLOutput) { if ($ShowOriginStats =~ /H/i) { print ""; } print "\n"; #------- Referrals by external HTML link - print "
".($_from_h[2]?$_from_h[2]:" ")."".($_from_h[2]?"$p_h[2] %":" ")."
$Message[41] - $Message[80]
\n"; + print "		$Message[41] - $Message[80]
\n"; if (scalar keys %_pagesrefs_h) { print "\n"; $total_p=0; $total_h=0; @@ -9843,7 +9855,7 @@ if (scalar keys %HTMLOutput) { if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; + print "\n"; $total_s=0; my $count=0; &BuildKeyList($MaxNbOf{'KeyphrasesShown'},$MinHit{'Keyphrase'},\%_keyphrases,\%_keyphrases); @@ -9875,7 +9887,7 @@ if (scalar keys %HTMLOutput) { if ($ShowKeyphrasesStats && $ShowKeywordsStats) { print "\n"; + print "\n"; $total_s=0; my $count=0; &BuildKeyList($MaxNbOf{'KeywordsShown'},$MinHit{'Keyword'},\%_keywords,\%_keywords); @@ -9960,7 +9972,7 @@ if (scalar keys %HTMLOutput) { &BuildKeyList($MaxRowsInHTMLOutput,1,\%_errors_h,\%_errors_h); foreach my $key (@keylist) { my $p=int($_errors_h{$key}/$TotalHitsErrors*1000)/10; - print ""; + print ""; if ($TrapInfosForHTTPErrorCodes{$key}) { print ""; } else { print ""; } print ""; @@ -9984,7 +9996,7 @@ if (scalar keys %HTMLOutput) { &BuildKeyList($MaxRowsInHTMLOutput,1,\%_errors_h,\%_errors_h); foreach my $key (@keylist) { my $p=int($_errors_h{$key}/$TotalHitsErrors*1000)/10; - print ""; + print ""; print ""; print ""; print "\n";
\n"; } if ($Debug) { debug("ShowKeyphrasesStats",2); } &tab_head("$Message[120] ($Message[77] $MaxNbOf{'KeyphrasesShown'})
$Message[80]",19,($ShowKeyphrasesStats && $ShowKeywordsStats)?95:70,'keyphrases'); - print "
$TotalDifferentKeyphrases $Message[103]$Message[14]$Message[15]
$TotalDifferentKeyphrases $Message[103]$Message[14]$Message[15]
\n"; } if ($Debug) { debug("ShowKeywordsStats",2); } &tab_head("$Message[121] ($Message[77] $MaxNbOf{'KeywordsShown'})
$Message[80]",19,($ShowKeyphrasesStats && $ShowKeywordsStats)?95:70,'keywords'); - print "
$TotalDifferentKeywords $Message[13]$Message[14]$Message[15]
$TotalDifferentKeywords $Message[13]$Message[14]$Message[15]
$key$key".($httpcodelib{$key}?$httpcodelib{$key}:'Unknown error')."$_errors_h{$key}$p %".Format_Bytes($_errors_k{$key})."$key".($smtpcodelib{$key}?$smtpcodelib{$key}:'Unknown error')."$_errors_h{$key}$p %".Format_Bytes($_errors_k{$key})."