X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Fuseragent.php-class;h=09415a7b852673120f2303e2cbe13ea942c821a7;hp=e5e91c5720baf8e62a1c33473f261af60208292e;hb=cbdcb61734834efb10a142a7c8e90b203bfe2c5b;hpb=55fef093d1027a06f8047e45148d71b48bb6b7d2

diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class
index e5e91c5..09415a7 100755
--- a/include/classes/useragent.php-class
+++ b/include/classes/useragent.php-class
@@ -359,6 +359,11 @@ class userAgent {
       $this->version = $regs[1];
       $this->bot = false;
     }
+    elseif (preg_match('|Edge/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'Edge';
+      $this->version = $regs[1];
+      $this->bot = false;
+    }
     elseif (preg_match('|Chromium/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Chromium';
       $this->version = $regs[1];
@@ -1055,6 +1060,10 @@ class userAgent {
             $this->uadata['eng_version'] = $regs[1];
           }
         }
+        elseif (preg_match('|Edge/([0-9\.]+)|', $this->uastring, $regs)) {
+          $this->uadata['engine'] = 'edgehtml';
+          $this->uadata['eng_version'] = $regs[1];
+        }
         elseif ((strpos($this->brand, 'Internet Explorer') !== false) ||  (strpos($this->brand, 'FrontPage') !== false)) {
           if ((strpos(strtolower($this->uastring), 'mac') !== false) && (intval($this->getVersion()) >= 5)) {
             $this->uadata['engine'] = 'tasman';
@@ -1225,6 +1234,11 @@ class userAgent {
             $this->uadata['eng_version'] = null;
           }
         }
+        elseif ($this->hasEngine('edge')) {
+          if (preg_match('#Mozilla/5.0 \(([^;]+); (WOW64|Win64); ([^\);]+)\)#', $this->uastring, $regs)) {
+            $this->uadata['os'] = $regs[1].' ('.$regs[2].')';
+          }
+        }
         elseif ($this->hasEngine('trident') || $this->hasEngine('tasman')) {
           if (preg_match('/Mozilla\/[^\(]+ \((IE [^;]+[^\)]*; )?((?:Mac|Win)[^;]+); ?(Win64|WOW64); ?Trident\/([^;\)]+);/i', $this->uastring, $regs)) {
             $this->uadata['eng_version'] = $regs[4];
@@ -1494,6 +1508,9 @@ class userAgent {
         elseif ($this->uadata['os'] == 'Windows NT 6.4') { $this->uadata['os'] = 'Windows 10'; }
         elseif ($this->uadata['os'] == 'Windows NT 6.4 (Win64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
         elseif ($this->uadata['os'] == 'Windows NT 6.4 (WOW64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
+        elseif ($this->uadata['os'] == 'Windows NT 10.0') { $this->uadata['os'] = 'Windows 10'; }
+        elseif ($this->uadata['os'] == 'Windows NT 10.0 (Win64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
+        elseif ($this->uadata['os'] == 'Windows NT 10.0 (WOW64)') { $this->uadata['os'] = 'Windows 10 (64bit)'; }
         elseif ($this->uadata['os'] == 'Win95') { $this->uadata['os'] = 'Windows 95'; }
         elseif ($this->uadata['os'] == 'Win98') { $this->uadata['os'] = 'Windows 98'; }
         elseif ($this->uadata['os'] == 'WinNT') { $this->uadata['os'] = 'Windows NT'; }