From: eldy <>
Date: Wed, 27 May 2009 18:32:22 +0000 (+0000)
Subject: Update databases
X-Git-Tag: AWSTATS_6_95_BETA~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5359ccb1c3adfeb637ef26e65c3d6bc37fef78a1;p=thirdparty%2FAWStats.git

Update databases
---

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 4f76ee6b..66dc4091 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Sat Nov 15 16:19:41 CET 2008
+#Wed May 27 20:00:21 CEST 2009
 eclipse.preferences.version=1
 encoding//wwwroot/cgi-bin/lang/awstats-be.txt=UTF-8
 encoding//wwwroot/cgi-bin/lang/awstats-bg.txt=UTF-8
@@ -7,3 +7,4 @@ encoding//wwwroot/cgi-bin/lang/awstats-sk.txt=UTF-8
 encoding//wwwroot/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt=UTF-8
 encoding//wwwroot/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt=UTF-8
 encoding//wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-gr.txt=UTF-8
+encoding//wwwroot/cgi-bin/lib=ISO-8859-1
diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index ae86fb35..2838a8c1 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -10,7 +10,9 @@ New features/improvements:
   default.
 - Enhance security of parameter sanitizing function.
 - Add name of config file used to build data files inside data files header.
-
+- Added details of version for Chrome, Opera, Safari and Konqueror browsers.
+- Update of browsers, robots and search_engines databases.
+ 
 Fixes:
 - awstats emmits ton of warnings with new geoipfree - ID: 2794728
 - fix: can detect robots with robots.txt url even if file is not root.
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 7587c9ba..3b557e30 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -352,7 +352,7 @@ use vars qw/
 use vars qw/
   @MiscListOrder %MiscListCalc
   %OSFamily %BrowsersFamily @SessionsRange %SessionsAverage
-  %LangBrowserToLangAwstats %LangAWStatsToFlagAwstats
+  %LangBrowserToLangAwstats %LangAWStatsToFlagAwstats %SafariBuildToVersion
   @HostAliases @AllowAccessFromWebToFollowingAuthenticatedUsers
   @DefaultFile @SkipDNSLookupFor
   @SkipHosts @SkipUserAgents @SkipFiles @SkipReferrers @NotPageFiles
@@ -390,7 +390,7 @@ use vars qw/
 			  'linux' => 'Linux',
 			  'bsd'   => 'BSD'
 );
-%BrowsersFamily = ( 'msie' => 1, 'firefox' => 2, 'netscape' => 3, 'svn' => 4 );
+%BrowsersFamily=('msie'=>1,'firefox'=>2,'netscape'=>3,'svn'=>4,'opera'=>5,'safari'=>6,'chrome'=>7,'konqueror'=>8);
 @SessionsRange =
   ( '0s-30s', '30s-2mn', '2mn-5mn', '5mn-15mn', '15mn-30mn', '30mn-1h', '1h+' );
 %SessionsAverage = (
@@ -457,6 +457,53 @@ use vars qw/
 							  'ar' => 'sa',
 							  'sr' => 'cs'
   );
+%SafariBuildToVersion=(
+'85'=>'1.0',
+'85.5'=>'1.0',
+'85.7'=>'1.0.2',
+'85.8'=>'1.0.3',
+'85.8.1'=>'1.0.3',
+'100'=>'1.1',
+'100.1'=>'1.1.1',
+'125.7'=>'1.2.2',
+'125.8'=>'1.2.2',
+'125.9'=>'1.2.3',
+'125.11'=>'1.2.4',
+'125.12'=>'1.2.4',
+'312'=>'1.3',
+'312.3'=>'1.3.1',
+'312.3.1'=>'1.3.1',
+'312.5'=>'1.3.2',
+'312.6'=>'1.3.2',
+'412'=>'2.0',
+'412.2'=>'2.0',
+'412.2.2'=>'2.0',
+'412.5'=>'2.0.1',
+'413'=>'2.0.1',
+'416.12'=>'2.0.2',
+'416.13'=>'2.0.2',
+'417.8'=>'2.0.3',
+'417.9.2'=>'2.0.3',
+'417.9.3'=>'2.0.3',
+'419.3'=>'2.0.4',
+'522.11.3'=>'3.0',
+'522.12'=>'3.0.2',
+'523.10'=>'3.0.4',
+'523.12'=>'3.0.4',
+'525.13'=>'3.1',
+'525.17'=>'3.1.1',
+'525.20'=>'3.1.1',
+'525.20.1'=>'3.1.2',
+'525.21'=>'3.1.2',
+'525.22'=>'3.1.2',
+'525.26'=>'3.2',
+'525.26.13'=>'3.2',
+'525.27'=>'3.2.1',
+'525.27.1'=>'3.2.1',
+'526.11.2'=>'4.0',
+'528.1'=>'4.0',
+'528.16'=>'4.0'
+);  
 @HostAliases = @AllowAccessFromWebToFollowingAuthenticatedUsers = ();
 @DefaultFile = @SkipDNSLookupFor = ();
 @SkipHosts = @SkipUserAgents = @NotPageFiles = @SkipFiles = @SkipReferrers = ();
@@ -717,7 +764,11 @@ use vars qw/ @Message /;
 	'Created by',
 	'plugins',
 	'Regions',
-	'Cities'
+	'Cities',
+	'Opera versions',
+	'Safari versions',
+	'Chrome versions',
+	'Konqueror versions'	
 );
 
 #------------------------------------------------------------------------------
@@ -2151,17 +2202,7 @@ sub Read_Ref_Data {
 			  . " is up to date."
 		);
 	}
-	if ( ( scalar keys %BrowsersHashIDLib )
-		 && @BrowsersSearchIDOrder != ( scalar keys %BrowsersHashIDLib ) - 4 )
-	{
-		error("Not same number of records of BrowsersSearchIDOrder ("
-			. (@BrowsersSearchIDOrder)
-			. " entries) and BrowsersHashIDLib ("
-			. ( ( scalar keys %BrowsersHashIDLib ) - 4 )
-			. " entries without msie,netscape,firefox,svn) in Browsers database. May be you updated AWStats without updating browsers.pm file or you made changed into browsers.pm not correctly. Check your file "
-			. $FilePath{"browsers.pm"}
-			. " is up to date." );
-	}
+	if ((scalar keys %BrowsersHashIDLib) && @BrowsersSearchIDOrder != (scalar keys %BrowsersHashIDLib) - 4) { error("Not same number of records of BrowsersSearchIDOrder (".(@BrowsersSearchIDOrder)." entries) and BrowsersHashIDLib (".((scalar keys %BrowsersHashIDLib) - 4)." entries without msie,netscape,firefox,svn,opera,safari,chrome,konqueror) in Browsers database. May be you updated AWStats without updating browsers.pm file or you made changed into browsers.pm not correctly. Check your file ".$FilePath{"browsers.pm"}." is up to date."); }
 	if (
 		 ( scalar keys %RobotsHashIDLib )
 		 && ( @RobotsSearchIDOrder_list1 + @RobotsSearchIDOrder_list2 +
@@ -10409,10 +10450,16 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 	my $regvermsie        = qr/msie([+_ ]|)([\d\.]*)/i;
 	my $regvernetscape    = qr/netscape.?\/([\d\.]*)/i;
 	my $regverfirefox     = qr/firefox\/([\d\.]*)/i;
+	my $regveropera       = qr/opera\/([\d\.]*)/i;	
+	my $regversafari      = qr/safari\/([\d\.]*)/i;	
+	my $regverchrome      = qr/chrome\/([\d\.]*)/i;
+    my $regverkonqueror   = qr/konqueror\/([\d\.]*)/i;
 	my $regversvn         = qr/svn\/([\d\.]*)/i;
 	my $regvermozilla     = qr/mozilla(\/|)([\d\.]*)/i;
 	my $regnotie          = qr/webtv|omniweb|opera/i;
-	my $regnotnetscape    = qr/gecko|compatible|opera|galeon|safari/i;
+	my $regnotnetscape    = qr/gecko|compatible|opera|galeon|safari|charon/i;
+    my $regnotfirefox     = qr/flock/i;
+	my $regnotsafari      = qr/arora|chrome|shiira/i;
 	my $regreferer        = qr/^(\w+):\/\/([^\/:]+)(:\d+|)/;
 	my $regreferernoquery = qr/^([^$URLQuerySeparators]+)/;
 	my $reglocal          = qr/^(www\.|)$sitewithoutwww/i;
@@ -11911,8 +11958,29 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 					if ( !$uabrowser ) {
 						my $found = 1;
 
+						# Opera ?
+						if ($UserAgent =~ /$regveropera/o) {
+							$_browser_h{"opera$1"}++;
+							$TmpBrowser{$UserAgent}="opera$1";
+						}
+						# Chrome ?
+						elsif ($UserAgent =~ /$regverchrome/o) {
+							$_browser_h{"chrome$1"}++;
+							$TmpBrowser{$UserAgent}="chrome$1";
+						}
+						# Safari ?
+						elsif ($UserAgent =~ /$regversafari/o && $UserAgent !~ /$regnotsafari/o) {
+							my $safariver = $SafariBuildToVersion{$1};
+							$_browser_h{"safari$safariver"}++;
+							$TmpBrowser{$UserAgent}="safari$safariver";
+						}
+						# Konqueror ?
+						elsif ($UserAgent =~ /$regverkonqueror/o) {
+							$_browser_h{"konqueror$1"}++;
+							$TmpBrowser{$UserAgent}="konqueror$1";
+						}
 						# IE ?
-						if (    $UserAgent =~ /$regvermsie/o
+						elsif (    $UserAgent =~ /$regvermsie/o
 							 && $UserAgent !~ /$regnotie/o )
 						{
 							$_browser_h{"msie$2"}++;
@@ -11920,7 +11988,7 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 						}
 
 						# Firefox ?
-						elsif ( $UserAgent =~ /$regverfirefox/o ) {
+						elsif ( $UserAgent =~ /$regverfirefox/o && $UserAgent !~ /$regnotfirefox/o) {
 							$_browser_h{"firefox$1"}++;
 							$TmpBrowser{$UserAgent} = "firefox$1";
 						}
diff --git a/wwwroot/cgi-bin/lang/awstats-en.txt b/wwwroot/cgi-bin/lang/awstats-en.txt
index 3ea038db..9e106991 100644
--- a/wwwroot/cgi-bin/lang/awstats-en.txt
+++ b/wwwroot/cgi-bin/lang/awstats-en.txt
@@ -173,4 +173,8 @@ message168=Javascript disabled
 message169=Created by
 message170=plugins
 message171=Regions
-message172=Cities
\ No newline at end of file
+message172=Cities
+message173=Opera versions
+message174=Safari versions
+message175=Chrome versions
+message176=Konqueror versions
\ No newline at end of file
diff --git a/wwwroot/cgi-bin/lang/awstats-fr.txt b/wwwroot/cgi-bin/lang/awstats-fr.txt
index e661e0a8..579489c3 100644
--- a/wwwroot/cgi-bin/lang/awstats-fr.txt
+++ b/wwwroot/cgi-bin/lang/awstats-fr.txt
@@ -174,3 +174,8 @@ message169=Généré par
 message170=plugins
 message171=Regions
 message172=Villes
+message173=Versions Opera
+message174=Versions Safari
+message175=Versions Chrome
+message176=Versions Konqueror	
+
diff --git a/wwwroot/icon/os/bsddflybsd.png b/wwwroot/icon/os/bsddflybsd.png
new file mode 100644
index 00000000..8cb6d852
Binary files /dev/null and b/wwwroot/icon/os/bsddflybsd.png differ
diff --git a/wwwroot/icon/os/bsdkfreebsd.png b/wwwroot/icon/os/bsdkfreebsd.png
new file mode 100644
index 00000000..7c3911e3
Binary files /dev/null and b/wwwroot/icon/os/bsdkfreebsd.png differ
diff --git a/wwwroot/icon/os/inferno.png b/wwwroot/icon/os/inferno.png
new file mode 100644
index 00000000..a7be5aa4
Binary files /dev/null and b/wwwroot/icon/os/inferno.png differ
diff --git a/wwwroot/icon/os/j2me.png b/wwwroot/icon/os/j2me.png
new file mode 100644
index 00000000..768d4c68
Binary files /dev/null and b/wwwroot/icon/os/j2me.png differ
diff --git a/wwwroot/icon/os/linuxandroid.png b/wwwroot/icon/os/linuxandroid.png
new file mode 100644
index 00000000..e2bf55e4
Binary files /dev/null and b/wwwroot/icon/os/linuxandroid.png differ
diff --git a/wwwroot/icon/os/linuxasplinux.png b/wwwroot/icon/os/linuxasplinux.png
new file mode 100644
index 00000000..85060154
Binary files /dev/null and b/wwwroot/icon/os/linuxasplinux.png differ
diff --git a/wwwroot/icon/os/linuxpclinuxos.png b/wwwroot/icon/os/linuxpclinuxos.png
new file mode 100644
index 00000000..5d4dcbc9
Binary files /dev/null and b/wwwroot/icon/os/linuxpclinuxos.png differ
diff --git a/wwwroot/icon/os/linuxvine.png b/wwwroot/icon/os/linuxvine.png
new file mode 100644
index 00000000..aa7f19ea
Binary files /dev/null and b/wwwroot/icon/os/linuxvine.png differ
diff --git a/wwwroot/icon/os/linuxzenwalk.png b/wwwroot/icon/os/linuxzenwalk.png
new file mode 100644
index 00000000..cd2220e0
Binary files /dev/null and b/wwwroot/icon/os/linuxzenwalk.png differ
diff --git a/wwwroot/icon/os/palmos.png b/wwwroot/icon/os/palmos.png
new file mode 100644
index 00000000..08325fa8
Binary files /dev/null and b/wwwroot/icon/os/palmos.png differ
diff --git a/wwwroot/icon/os/syllable.png b/wwwroot/icon/os/syllable.png
new file mode 100644
index 00000000..520b452a
Binary files /dev/null and b/wwwroot/icon/os/syllable.png differ
diff --git a/wwwroot/icon/os/win2008.png b/wwwroot/icon/os/win2008.png
new file mode 100644
index 00000000..63e4b5c2
Binary files /dev/null and b/wwwroot/icon/os/win2008.png differ
diff --git a/wwwroot/icon/os/winvista.png b/wwwroot/icon/os/winvista.png
new file mode 100644
index 00000000..aef452b7
Binary files /dev/null and b/wwwroot/icon/os/winvista.png differ