X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Fuseragent.php-class;h=9026179b8ed99bfe0855c769241ecb95020b207f;hp=f5a5f8db6b9f8158d0f343367245eae452fb6906;hb=1486b1d9436a872c9658b78d534b7c1c8ce71f63;hpb=3cd2b543fb51197189309ba9ec54c1a45eadee97

diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class
index f5a5f8d..9026179 100755
--- a/include/classes/useragent.php-class
+++ b/include/classes/useragent.php-class
@@ -360,9 +360,10 @@ class userAgent {
       $this->bot = false;
     }
     elseif (preg_match('|Edge/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
-      $this->brand = 'Project Spartan';
-      $this->version = null;
+      $this->brand = 'Edge';
+      $this->version = $regs[1];
       $this->bot = false;
+      $this->mobile = preg_match('| Mobile |', $this->uastring);
     }
     elseif (preg_match('|Chromium/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Chromium';
@@ -410,6 +411,12 @@ class userAgent {
       $this->bot = true;
       $this->mobile = true;
     }
+    elseif (preg_match('|FxiOS/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'Firefox for iOS';
+      $this->version = $regs[1];
+      $this->bot = false;
+      $this->mobile = true;
+    }
     elseif (preg_match('|Safari/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       if (preg_match('| Mobile(/[0-9a-zA-Z\.+]+)? ?Safari/|', $this->uastring)) {
         $this->brand = 'Mobile Safari';
@@ -1061,7 +1068,7 @@ class userAgent {
           }
         }
         elseif (preg_match('|Edge/([0-9\.]+)|', $this->uastring, $regs)) {
-          $this->uadata['engine'] = 'edge';
+          $this->uadata['engine'] = 'edgehtml';
           $this->uadata['eng_version'] = $regs[1];
         }
         elseif ((strpos($this->brand, 'Internet Explorer') !== false) ||  (strpos($this->brand, 'FrontPage') !== false)) {
@@ -1197,6 +1204,11 @@ class userAgent {
             $this->uadata['eng_version'] = $regs[2];
             $this->mobile = ($regs[1] == 'Mobile');
           }
+          elseif (preg_match('#Mozilla/5.0 \(([^;]+); Viera; rv:([^\);]+)\)#', $this->uastring, $regs)) {
+            $this->uadata['os'] = 'Firefox OS (TV, '.$regs[1].')';
+            $this->uadata['lang'] = null;
+            $this->uadata['eng_version'] = $regs[2];
+          }
           elseif (preg_match('|Mozilla/5.0 \(([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) {
             if ((strpos($regs[2], 'Linux') !== false) && ($regs[1] != 'X11')) {
               $this->uadata['os'] = $regs[1].' ('.$regs[2].')';
@@ -1234,10 +1246,13 @@ class userAgent {
             $this->uadata['eng_version'] = null;
           }
         }
-        elseif ($this->hasEngine('edge')) {
+        elseif ($this->hasEngine('edgehtml')) {
           if (preg_match('#Mozilla/5.0 \(([^;]+); (WOW64|Win64); ([^\);]+)\)#', $this->uastring, $regs)) {
             $this->uadata['os'] = $regs[1].' ('.$regs[2].')';
           }
+          elseif (preg_match('#Mozilla/5.0 \(([^;]+Phone[^;]+); [^\)]+\)#i', $this->uastring, $regs)) {
+            $this->uadata['os'] = $regs[1];
+          }
         }
         elseif ($this->hasEngine('trident') || $this->hasEngine('tasman')) {
           if (preg_match('/Mozilla\/[^\(]+ \((IE [^;]+[^\)]*; )?((?:Mac|Win)[^;]+); ?(Win64|WOW64); ?Trident\/([^;\)]+);/i', $this->uastring, $regs)) {