OPTIONAL ACCURACY SETUP SECTION (Not required but increase AWStats features)
@@ -602,6 +603,18 @@ it with its value when reading it), follow the example:
+WrapperScript
+Version : 4.0 +
+
# For some particular integration needs, you may want to have CGI links to +
# point to another script than awstats.pl. +
# Use the name of this script in WrapperScript parameter. +
# Example: "awstatslauncher.pl" +
# Default: "" +
# +
WrapperScript="" + +
+ LevelFor
Version : 4.0 +
# You can change value for following option to increase AWStats capabilities diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index 8b968edb..3dfd0b51 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -340,6 +340,14 @@ SplitSearchString=0 # Expires=0 +# For some particular integration needs, you may want to have CGI links to +# point to another script than awstats.pl. +# Use the name of this script in WrapperScript parameter. +# Example: "awstatslauncher.pl" +# Default: "" +# +WrapperScript="" + #----------------------------------------------------------------------------- # OPTIONAL ACCURACY SETUP SECTION (Not required but increase AWStats features) @@ -490,7 +498,7 @@ BarWidth = 260 BarHeight = 180 # You can ask AWStats to use a particular CSS (Cascading Style Sheet) to -# change its look (Feature not yet available). +# change its look. # Example: "/css/awstats.css" # Default: "" # diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index e5afcb5f..f4c3da27 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -21,11 +21,12 @@ use vars qw(%DomainsHashIDLib @RobotsSearchIDOrder_list1 @RobotsSearchIDOrder_li #------------------------------------------------------- # Defines #------------------------------------------------------- -my $VERSION="4.0 (build 53)"; +my $VERSION="4.0 (build 55)"; # ---------- Init variables ------- my $Debug=0; my $ShowSteps=0; +my $AWScript; my $DIR; my $PROG; my $Extension; @@ -89,6 +90,7 @@ $HTMLHeadSection, $HTMLEndSection, $HTMLOutput, $Host, $LastUpdate, $LogFile, $LogFormat, $LogFormatString, $Logo, $LogoLink, $MonthRequired, $PageCode, $PerlParsingFormat, $QueryString, $SiteConfig, $SiteDomain, $SiteToAnalyze, $SiteToAnalyzeWithoutwww, +$StyleSheet, $WrapperScript, $TotalEntries, $TotalBytesPages, $TotalKeyphrases, $TotalDifferentPages, $TotalDifferentKeyphrases, $URLFilter, $UserAgent, $YearRequired)= (); @@ -246,6 +248,10 @@ DIV { font: 12px arial,verdana,helvetica; text-align:justify; } //--> EOF + if ($StyleSheet) { + print "\n"; + } + print "\n\n"; print "\n"; # Write logo, flags and product name @@ -548,6 +554,7 @@ sub Read_Config_File { if ($param =~ /^NbOfLinesForCorruptedLog/) { $NbOfLinesForCorruptedLog=$value; next; } if ($param =~ /^SplitSearchString/) { $SplitSearchString=$value; next; } if ($param =~ /^Expires/) { $Expires=$value; next; } + if ($param =~ /^WrapperScript/) { $WrapperScript=$value; next; } # Read optional accuracy setup section if ($param =~ /^LevelForRobotsDetection/) { $LevelForRobotsDetection=$value; next; } # Not used yet if ($param =~ /^LevelForBrowsersDetection/) { $LevelForBrowsersDetection=$value; next; } # Not used yet @@ -602,6 +609,7 @@ sub Read_Config_File { if ($param =~ /^BarHeight/) { $BarHeight=$value; next; } if ($param =~ /^Logo$/) { $Logo=$value; next; } if ($param =~ /^LogoLink/) { $LogoLink=$value; next; } + if ($param =~ /^StyleSheet/) { $StyleSheet=$value; next; } if ($param =~ /^color_Background/) { $color_Background=$value; next; } if ($param =~ /^color_TableTitle/) { $color_TableTitle=$value; next; } if ($param =~ /^color_TableBGTitle/) { $color_TableBGTitle=$value; next; } @@ -1953,7 +1961,7 @@ sub Show_Flag_Links { if ($flag eq "it") { $lng="Italian"; } if ($flag eq "nl") { $lng="Dutch"; } if ($flag eq "es") { $lng="Spanish"; } - print "
![\"$lng\"](\"$DirIcons\/flags\/$flag.png\" "\\"$lng\\""){kind=small}
\n";
+ print " \n";
}
}
}
@@ -2366,6 +2374,9 @@ $SiteToAnalyzeWithoutwww = $SiteToAnalyze; $SiteToAnalyzeWithoutwww =~ s/www\.//
if ($FirstDayOfWeek == 1) { @DOWIndex = (1,2,3,4,5,6,0); }
else { @DOWIndex = (0,1,2,3,4,5,6); }
+# Should we link to ourselves or to a wrapper script
+$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
+
# Check year and month parameters
if ($QueryString =~ /year=/i) { $YearRequired=$QueryString; $YearRequired =~ s/.*year=//; $YearRequired =~ s/&.*//; $YearRequired =~ s/ .*//; }
if ((! $YearRequired) || ($YearRequired !~ /^\d\d\d\d$/)) { $YearRequired=$nowyear; }
@@ -3514,7 +3525,7 @@ EOF
$NewLinkParams =~ s/staticlinks[=]*[^ &]*//;
$NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//;
if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; }
- print "$Message[74]";
+ print "$Message[74]";
}
print "\n";
if ($QueryString !~ /output=/i) { # If main page asked
@@ -3530,22 +3541,22 @@ EOF
print "\n"; } # Referers print "
\n"; } } else { ${NewLinkParams} =~ s/&+$//; - if ($ShowBackLink) { print "
\n"; @@ -3846,7 +3857,7 @@ EOF if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; } foreach my $key (sort keys %listofyears) { if ($ENV{"GATEWAY_INTERFACE"} || !$StaticLinks) { - print "$Message[6] $key "; + print "$Message[6] $key "; } } print ""; @@ -3912,7 +3923,7 @@ EOF for (my $ix=1; $ix<=12; $ix++) { my $monthix=$ix; if ($monthix < 10) { $monthix="0$monthix"; } print "
"; $MaxNbOfHostsShown = (scalar keys %_hostmachine_h) if $MaxNbOfHostsShown > (scalar keys %_hostmachine_h); - &tab_head("$Message[81] ($Message[77] $MaxNbOfHostsShown) - $Message[80] - $Message[9] - $Message[45]",19); + &tab_head("$Message[81] ($Message[77] $MaxNbOfHostsShown) - $Message[80] - $Message[9] - $Message[45]",19); if ($MonthRequired ne "year") { print "
"; $MaxNbOfPageShown = $TotalDifferentPages if $MaxNbOfPageShown > $TotalDifferentPages; - &tab_head("$Message[19] ($Message[77] $MaxNbOfPageShown) - $Message[80]",19); + &tab_head("$Message[19] ($Message[77] $MaxNbOfPageShown) - $Message[80]",19); print "
"; - $BrowsersHashIDLib{"netscape"}="Netscape ($Message[58])"; - $BrowsersHashIDLib{"msie"}="MS Internet Explorer ($Message[58])"; + $BrowsersHashIDLib{"netscape"}="Netscape ($Message[58])"; + $BrowsersHashIDLib{"msie"}="MS Internet Explorer ($Message[58])"; my $Total=0; foreach my $key (keys %_browser_h) { $Total+=$_browser_h{$key}; } &tab_head($Message[21],19); print "
![](\"$DirIcons\/browser\/unknown.png\")
![](\"$DirIcons\/os\/unknown.png\")
"; $MaxNbOfKeywordsShown = $TotalDifferentKeyphrases if $MaxNbOfKeywordsShown > $TotalDifferentKeyphrases; - &tab_head("$Message[43] ($Message[77] $MaxNbOfKeywordsShown) - $Message[80]",19); + &tab_head("$Message[43] ($Message[77] $MaxNbOfKeywordsShown) - $Message[80]",19); print "