From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 27 Jan 2016 18:35:21 +0000 (+0100)
Subject: NEW Support for edge
X-Git-Tag: AWSTATS_7_5~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d63b6ce71fece513008075ca6667d4e5aadc19;p=thirdparty%2FAWStats.git

NEW Support for edge
---

diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 5fa215f6..273da685 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 ) - 8 )
+		&& @BrowsersSearchIDOrder != ( scalar keys %BrowsersHashIDLib ) - 9 )
 	{
 		#foreach (sort keys %BrowsersHashIDLib)
 		#{
@@ -2319,8 +2319,8 @@ sub Read_Ref_Data {
 		error(  "Not same number of records of BrowsersSearchIDOrder ("
 			  . (@BrowsersSearchIDOrder)
 			  . " entries) and BrowsersHashIDLib ("
-			  . ( ( scalar keys %BrowsersHashIDLib ) - 8 )
-			  . " entries without firefox,opera,chrome,safari,konqueror,svn,msie,netscape) 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 "
+			  . ( ( scalar keys %BrowsersHashIDLib ) - 9 )
+			  . " 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,6 +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\//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;
@@ -19535,8 +19536,16 @@ if ( $UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft' )
 					if ( !$uabrowser ) {
 						my $found = 1;
 
+						# Edge (must be at beginning)
+						if ($UserAgent =~ /$regveredge/o)
+						{
+							$_browser_h{"edge"}++;
+							if ($PageBool) { $_browser_p{"edge"}++; }
+							$TmpBrowser{$UserAgent} = "edge";
+						}
+						
 						# Opera ?
-						if ( $UserAgent =~ /$regveropera/o ) {	# !!!! version number in in regex $1 or $2 !!!
+						elsif ( $UserAgent =~ /$regveropera/o ) {	# !!!! version number in in regex $1 or $2 !!!
 						    $_browser_h{"opera".($1||$2)}++;
 						    if ($PageBool) { $_browser_p{"opera".($1||$2)}++; }
 						    $TmpBrowser{$UserAgent} = "opera".($1||$2);
diff --git a/wwwroot/cgi-bin/lib/browsers.pm b/wwwroot/cgi-bin/lib/browsers.pm
index 4d0dda89..981b5a85 100644
--- a/wwwroot/cgi-bin/lib/browsers.pm
+++ b/wwwroot/cgi-bin/lib/browsers.pm
@@ -32,7 +32,8 @@
 	'opera'     => 5,
 	'safari'    => 6,
 	'chrome'    => 7,
-	'konqueror' => 8
+	'konqueror' => 8,
+	'edge'      => 9
 );
 
 # BrowsersSearchIDOrder
@@ -44,7 +45,6 @@
 @BrowsersSearchIDOrder = (
 # Most frequent standard web browsers are first in this list except the ones hardcoded in awstats.pl:
 # firefox, opera, chrome, safari, konqueror, svn, msie, netscape
-'edge',
 'elinks',
 'firebird',
 'go!zilla',
@@ -272,8 +272,8 @@
 'svn', 'Subversion client', 
 'msie','MS Internet Explorer',
 'netscape','Netscape',
-
 'edge','Edge',
+
 'elinks','ELinks',
 'firebird','Firebird (Old Firefox)',
 'go!zilla','Go!Zilla',
@@ -525,8 +525,8 @@
 'svn','subversion',
 'msie','msie',
 'netscape','netscape',
-
 'edge','msie',
+
 'firebird','phoenix',
 'go!zilla','gozilla',
 'icab','icab',