From: robert Date: Sun, 3 Jul 2005 01:37:30 +0000 (+0000) Subject: detect OS and language correctly for an even bigger amout of UA string variants X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=f9a0c27d72955f610860bf7be800e89e002114d1;p=php-utility-classes.git detect OS and language correctly for an even bigger amout of UA string variants --- diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class index 6d67596..d060a62 100755 --- a/include/classes/useragent.php-class +++ b/include/classes/useragent.php-class @@ -526,7 +526,7 @@ class userAgent { if ($this->hasEngine('gecko')) { if (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); ([^;]+); rv:([^\);]+)(; [^\)]+)?\)|', $this->uastring, $regs)) { $this->uadata['os'] = $regs[2]; - $this->uadata['lang'] = $regs[3]; + $this->uadata['lang'] = (strpos($regs[3],'chrome://')===false)?$regs[3]:null; $this->uadata['eng_version'] = $regs[4]; } elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); rv:([^\);]+)(; [^\)]+)?\)|', $this->uastring, $regs)) { @@ -544,6 +544,11 @@ class userAgent { $this->uadata['lang'] = $regs[3]; $this->uadata['eng_version'] = null; } + elseif (preg_match('|Mozilla/5.0 \(([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) { + $this->uadata['os'] = $regs[2]; + $this->uadata['lang'] = null; + $this->uadata['eng_version'] = $regs[3]; + } elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^\);]+)\)|', $this->uastring, $regs)) { $this->uadata['os'] = $regs[2]; $this->uadata['lang'] = null; @@ -595,40 +600,45 @@ class userAgent { } } elseif ($this->hasEngine('presto')) { - if (preg_match('/Opera\/[^\(]+ \(([^;]+)[^\)]+\) +\[([a-z_-]+)\]/i', $this->uastring, $regs)) { + if (preg_match('/Opera\/[^\(]+ \((?:X11; )?([^;]+)[^\)]+\) +\[([a-z_-]+)\]/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } - elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; .+; ([^;]+)\) Opera [^ ]+ \[([a-z_-]+)\]/i', $this->uastring, $regs)) { + elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE [^;]+; (?:X11; )?([^;\)]+)[^\)]*\) Opera [^ ]+ +\[([a-z_-]+)\]/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } - elseif (preg_match('/Mozilla\/[^\(]+ \(([^;]+);.+\) Opera [^ ]+ \[([a-z_-]+)\]/i', $this->uastring, $regs)) { + elseif (preg_match('/Mozilla\/[^\(]+ \((?:X11; )?([^;]+);.+\) Opera [^ ]+ \[([a-z_-]+)\]/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } // Opera 8 - elseif (preg_match('/Opera\/[^\(]+ \(([^;]+); [^\)]+; ([a-z_-]+)\)/i', $this->uastring, $regs)) { + elseif (preg_match('/Opera\/[^\(]+ \((?:X11; )?([^;]+); [^\)]+; ([a-z_-]+)\)/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } - elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; .+; ([^;]+); ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) { + elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE [^;]+; (?:X11; )?([^;]+); ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } - elseif (preg_match('/Mozilla\/[^\(]+ \(([^;]+);.+; ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) { + elseif (preg_match('/Mozilla\/[^\(]+ \((?:X11; )?([^;]+);.+; ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $this->getVersion(); $this->uadata['os'] = $regs[1]; $this->uadata['lang'] = $regs[2]; } } elseif ($this->hasEngine('nscp')) { - if (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) (?:\[([a-z_-]+)\][^\(]+)?\(([^;]+);[^\)]+\)/i', $this->uastring, $regs)) { + if (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) (?:\[([a-z_-]+)\][^\(]+)?\(X11; [^;]+; ([^\)]+)\)/i', $this->uastring, $regs)) { + $this->uadata['eng_version'] = $regs[1]; + $this->uadata['os'] = $regs[3]; + $this->uadata['lang'] = $regs[2]; + } + elseif (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) (?:\[([a-z_-]+)\][^\(]+)?\(([^;]+);[^\)]+\)/i', $this->uastring, $regs)) { $this->uadata['eng_version'] = $regs[1]; $this->uadata['os'] = $regs[3]; $this->uadata['lang'] = $regs[2];