From: eldy <>
Date: Sat, 25 Nov 2000 01:53:22 +0000 (+0000)
Subject: Now awstats.pl can be renamed into awstats.plx (for ActiveState perl) and still works.
X-Git-Tag: AWSTATS_1_0~377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f872318b57e776baae69218949df54ca7d2f05dd;p=thirdparty%2FAWStats.git
Now awstats.pl can be renamed into awstats.plx (for ActiveState perl) and still works.
Add 2 other robots in robot database list.
---
diff --git a/awstats.pl b/awstats.pl
index 9be5a216..bc74ee4b 100644
--- a/awstats.pl
+++ b/awstats.pl
@@ -13,7 +13,7 @@
#-------------------------------------------------------
# Defines
#-------------------------------------------------------
-$VERSION="2.23k";
+$VERSION="2.23m";
$Lang=0;
# Default value
@@ -93,7 +93,7 @@ $BarImageHorizontal_k = "barrehk.png";
"mamma\.","query=",
"northernlight\.","qr="
);
-@WordsToCleanSearchUrl= ("act=","annuaire=","btng=","categoria=","cou=","dd=","domain=","dt=","dw=","exec=","geo=","hc=","height=","hl=","hs=","kl=","lang=","loc=","lr=","medor=","message=","meta=","mode=","order=","page=","par=","pays=","pg=","pos=","prg=","qc=","refer=","sa=","safe=","sc=","sort=","src=","start=","stype=","tag=","temp=","theme=","url=","user=","width=","what=","\\.x=","\\.y=");
+@WordsToCleanSearchUrl= ("act=","annuaire=","btng=","categoria=","cou=","dd=","domain=","dt=","dw=","exec=","geo=","hc=","height=","hl=","hs=","kl=","lang=","loc=","lr=","matchmode=","medor=","message=","meta=","mode=","order=","page=","par=","pays=","pg=","pos=","prg=","qc=","refer=","sa=","safe=","sc=","sort=","src=","start=","stype=","tag=","temp=","theme=","url=","user=","width=","what=","\\.x=","\\.y=");
# Never put the following exclusion ("Claus=","kw=","keyword=","MT","p=","q=","qr=","qt=","query=","s=","search=","searchText=") because they are strings that contain keywords we're looking for.
# ---------- HTTP Code with tooltip --------
@@ -842,7 +842,7 @@ $message[57][6]="Hits";
"webcopy", "WebCopy",
"webfetcher", "webfetcher",
"webfoot", "The Webfoot Robot",
-"weblayers", "weblayers",
+"weblayers", "Weblayers",
"weblinker", "WebLinker",
"webmirror", "WebMirror",
"webmoose", "The Web Moose",
@@ -867,14 +867,17 @@ $message[57][6]="Hits";
"nederland.zoek", "Nederland.zoek",
# Not declared robots
+"antibot", "Antibot (Not referenced robot)",
+"daviesbot", "DaviesBot (Not referenced robot)",
"ezresult", "Ezresult (Not referenced robot)",
"fast-webcrawler", "Fast-Webcrawler (Not referenced robot)",
-"perman surfer", "Perman surfer (Not referenced robot)",
+"jennybot", "JennyBot (Not referenced robot)",
+"justview", "JustView (Not referenced robot)",
"mercator", "Mercator (Not referenced robot)",
-"antibot", "Antibot (Not referenced robot)",
-"daviesbot", "DaviesBot (Not referenced robot)",
+#"msiecrawler", "MSIECrawler (Not referenced robot)", MSIECrawler seems to be a grabber not a robot
+"perman surfer", "Perman surfer (Not referenced robot)",
"unlost_web_crawler", "Unlost_Web_Crawler (Not referenced robot)",
-"justview", "JustView (Not referenced robot)",
+"webbase", "WebBase (Not referenced robot)",
# Supposed to be robots
"webcompass", "webcompass (Not referenced robot)",
"digout4u", "digout4u (Not referenced robot)",
@@ -1011,6 +1014,7 @@ sub UnescapeURL {
$_[0] =~ s/%2b/ /gi; #+
$_[0] =~ s/%2c/ /gi; #,
$_[0] =~ s/%2d//gi; #-
+ $_[0] =~ s/%2e/\./gi; #.
$_[0] =~ s/%2f/ /gi; #/
$_[0] =~ s/%3c/ /gi; #<
$_[0] =~ s/%3d/ /gi; #=
@@ -1390,12 +1394,16 @@ if ($ENV{"GATEWAY_INTERFACE"} ne "") {
$QueryString = $ENV{"QUERY_STRING"};
if ($QueryString =~ /site=/) { $LocalSite=$QueryString; $LocalSite =~ s/.*site=//; $LocalSite =~ s/&.*//; }
else { $LocalSite = $ENV{"SERVER_NAME"}; }
- $PROG=$0; $PROG =~ s/.*\\//; $PROG =~ s/.*\///; $DIR=$0; $DIR =~ s/$PROG//; $PROG =~ s/\.pl$//;
+ $PROG=$0; $PROG =~ s/.*\\//; $PROG =~ s/.*\///; $DIR=$0; $DIR =~ s/$PROG//;
+ $Extension=$PROG; $Extension =~ s/.*\.pl?/pl/;
+ $PROG =~ s/\.$Extension$//;
print("Content-type: text/html\n\n\n");
}
else {
$LocalSite = $ARGV[1];
- $PROG=$0; $PROG =~ s/.*\\//; $PROG =~ s/.*\///; $DIR=$0; $DIR =~ s/$PROG//; $PROG =~ s/\.pl$//;
+ $PROG=$0; $PROG =~ s/.*\\//; $PROG =~ s/.*\///; $DIR=$0; $DIR =~ s/$PROG//;
+ $Extension=$PROG; $Extension =~ s/.*\.pl?/pl/;
+ $PROG =~ s/\.$Extension$//;
}
$LocalSite =~ tr/A-Z/a-z/;
$LocalSiteWithoutwww = $LocalSite; $LocalSiteWithoutwww =~ s/www\.//;
@@ -1403,7 +1411,7 @@ if (($ENV{"GATEWAY_INTERFACE"} eq "") && ($ARGV[0] eq "" || $ARGV[0] ne "-h" ||
print "----- $PROG $VERSION (c) Laurent Destailleur -----\n";
print "$PROG is a free web server logfile analyzer (in Perl) to show you advanced\n";
print "web statistics. Distributed under GNU General Public Licence.\n";
- print "Syntax: $PROG.pl -h www.host.com\n";
+ print "Syntax: $PROG.$Extension -h www.host.com\n";
print " Runs $PROG from command line to have statistics of www.host.com web site.\n";
print " First, $PROG tries to use $PROG.www.host.com.conf as the config file, if\n";
print " not found, $PROG will use $PROG.conf.\n";
@@ -1461,8 +1469,8 @@ $smallyear=$year;$smallyear =~ s/^..//;
$month++;if ($month < 10) { $month = "0$month"; }
if ($QueryString =~ /month=/) { $MonthOnly=$QueryString; $MonthOnly =~ s/.*month=//; $MonthOnly =~ s/&.*//; }
if ($MonthOnly eq "") { $MonthOnly=$month; }
-$BrowsersHash{"netscape"}="Netscape (Versions)";
-$BrowsersHash{"msie"}="MS Internet Explorer (Versions)";
+$BrowsersHash{"netscape"}="Netscape (Versions)";
+$BrowsersHash{"msie"}="MS Internet Explorer (Versions)";
if (@HostAliases == 0) {
warning("Warning: HostAliases parameter is not defined, $PROG will choose \"$LocalSite localhost 127.0.0.1\".");
$HostAliases[0]=$LocalSite; $HostAliases[1]="localhost"; $HostAliases[2]="127.0.0.1";
@@ -1500,12 +1508,12 @@ print "