X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;f=include%2Fclasses%2Fuseragent.php-class;h=0512f693f88737177e4cf372e27c559112808ba0;hb=705a28fb9b294efc9f10f793dcb980feaec6f016;hp=a7a137ce4526572915511fcf38afe7b85b11eaeb;hpb=ff8d4ab22be7a962dbc57496459a4c5fd16c8d2d;p=php-utility-classes.git diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class index a7a137c..0512f69 100755 --- a/include/classes/useragent.php-class +++ b/include/classes/useragent.php-class @@ -933,6 +933,11 @@ class userAgent { $this->version = "9.0"; $this->bot = false; } + elseif (preg_match('|MSIE 7\.0.+Trident/6.0|', $this->uastring, $regs)) { + $this->brand = 'Microsoft Internet Explorer'; + $this->version = "10.0"; + $this->bot = false; + } elseif (preg_match('|MSIE ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) { $this->brand = 'Microsoft Internet Explorer'; $this->version = $regs[1]; @@ -1235,6 +1240,11 @@ class userAgent { $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } + elseif (preg_match('|Mozilla/5.0 \(Linux; ([^;]+); ([^\);]+)\)|', $this->uastring, $regs)) { + // (Chrome for) Android - $regs[2] is device + $this->uadata['os'] = $regs[1]; + $this->uadata['lang'] = null; + } elseif (preg_match('|Mozilla/5.0 \(([^\);]+); ([^\);]+)\)|', $this->uastring, $regs)) { if (($regs[1] == 'X11') || ($regs[1] == 'Macintosh') || ($regs[1] == 'iPhone')) { $this->uadata['os'] = $regs[2]; @@ -1395,6 +1405,9 @@ class userAgent { elseif ($this->uadata['os'] == 'Windows NT 6.1') { $this->uadata['os'] = 'Windows 7'; } elseif ($this->uadata['os'] == 'Windows NT 6.1 (Win64)') { $this->uadata['os'] = 'Windows 7 (64bit)'; } elseif ($this->uadata['os'] == 'Windows NT 6.1 (WOW64)') { $this->uadata['os'] = 'Windows 7 (64bit)'; } + elseif ($this->uadata['os'] == 'Windows NT 6.2') { $this->uadata['os'] = 'Windows 8'; } + elseif ($this->uadata['os'] == 'Windows NT 6.2 (Win64)') { $this->uadata['os'] = 'Windows 8 (64bit)'; } + elseif ($this->uadata['os'] == 'Windows NT 6.2 (WOW64)') { $this->uadata['os'] = 'Windows 8 (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'; }