From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 29 Apr 2016 09:04:38 +0000 (+0200)
Subject: Fix edge support #22
X-Git-Tag: AWSTATS_7_5~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3674922c5b6e0a7d7779d6fad851b1d05642722c;p=thirdparty%2FAWStats.git

Fix edge support #22
---

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 1e1b1767..9f99871f 100755
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -2306,7 +2306,7 @@ sub Read_Ref_Data {
 		);
 	}
 	if ( ( scalar keys %BrowsersHashIDLib )
-		&& @BrowsersSearchIDOrder != ( scalar keys %BrowsersHashIDLib ) - 9 )
+		&& @BrowsersSearchIDOrder != ( scalar keys %BrowsersHashIDLib ) - ( scalar keys %BrowsersFamily ) )
 	{
 		#foreach (sort keys %BrowsersHashIDLib)
 		#{
@@ -2319,7 +2319,7 @@ sub Read_Ref_Data {
 		error(  "Not same number of records of BrowsersSearchIDOrder ("
 			  . (@BrowsersSearchIDOrder)
 			  . " entries) and BrowsersHashIDLib ("
-			  . ( ( scalar keys %BrowsersHashIDLib ) - 9 )
+			  . ( ( scalar keys %BrowsersHashIDLib ) - ( scalar keys %BrowsersFamily ) )
 			  . " entries without firefox,opera,chrome,safari,konqueror,svn,msie,netscape,edge) 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." );
@@ -17965,7 +17965,7 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 	my $regipv4           = qr/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
 	my $regipv4l          = qr/^::ffff:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
 	my $regipv6           = qr/^[0-9A-F]*:/i;
-	my $regveredge        = qr/edge\/([\d]*)/i;
+	my $regveredge        = qr/edge\/([\d]+)/i;
 	my $regvermsie        = qr/msie([+_ ]|)([\d\.]*)/i;
 	#my $regvermsie11      = qr/trident\/7\.\d*\;([+_ ]|)rv:([\d\.]*)/i;
 	my $regvermsie11      = qr/trident\/7\.\d*\;([a-zA-Z;+_ ]+|)rv:([\d\.]*)/i;
diff --git a/wwwroot/cgi-bin/lib/browsers.pm b/wwwroot/cgi-bin/lib/browsers.pm
index 7307d6b4..0551b9fe 100644
--- a/wwwroot/cgi-bin/lib/browsers.pm
+++ b/wwwroot/cgi-bin/lib/browsers.pm
@@ -26,14 +26,14 @@
 # Relocated from main file for easier editing
 %BrowsersFamily = (
 	'msie'      => 1,
-	'firefox'   => 2,
-	'netscape'  => 3,
-	'svn'       => 4,
-	'opera'     => 5,
-	'safari'    => 6,
-	'chrome'    => 7,
-	'konqueror' => 8,
-	'edge'      => 9
+	'edge'      => 2,
+	'firefox'   => 3,
+	'netscape'  => 4,
+	'svn'       => 5,
+	'opera'     => 6,
+	'safari'    => 7,
+	'chrome'    => 8,
+	'konqueror' => 9
 );
 
 # BrowsersSearchIDOrder
@@ -271,8 +271,8 @@
 'konqueror','Konqueror',
 'svn', 'Subversion client', 
 'msie','MS Internet Explorer',
-'netscape','Netscape',
 'edge','Edge',
+'netscape','Netscape',
 
 'elinks','ELinks',
 'firebird','Firebird (Old Firefox)',
@@ -524,8 +524,8 @@
 'konqueror','konqueror',
 'svn','subversion',
 'msie','msie',
-'netscape','netscape',
 'edge','edge',
+'netscape','netscape',
 
 'firebird','phoenix',
 'go!zilla','gozilla',