diff options
| author | alecpl <alec@alec.pl> | 2009-09-24 13:50:31 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-09-24 13:50:31 +0000 |
| commit | c2e697fe8170b2fe014f391874e00c1ee27f40bc (patch) | |
| tree | ab5d80ee9991e171ac610718b12536c1589e9bec | |
| parent | 38bf4253fb6f67d655ea119ee97fff492e84177a (diff) | |
- added Chrome detection (#1486163)
| -rw-r--r-- | program/include/rcube_browser.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php index 4010dbc48..9f37aaa0b 100644 --- a/program/include/rcube_browser.php +++ b/program/include/rcube_browser.php @@ -43,24 +43,21 @@ class rcube_browser $this->ns = ($this->ns4 || stristr($HTTP_USER_AGENT, 'netscape')); $this->ie = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera; $this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5'); + $this->chrome = stristr($HTTP_USER_AGENT, 'chrome'); $this->khtml = stristr($HTTP_USER_AGENT, 'khtml'); $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari')); - if ($this->ns) { - $test = preg_match('/mozilla\/([0-9.]+)/i', $HTTP_USER_AGENT, $regs); - $this->ver = $test ? (float)$regs[1] : 0; + if ($this->ns || $this->chrome) { + $test = preg_match('/(mozilla|chrome)\/([0-9.]+)/i', $HTTP_USER_AGENT, $regs); + $this->ver = $test ? (float)$regs[2] : 0; } - if ($this->mz) { + else if ($this->mz) { $test = preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs); $this->ver = $test ? (float)$regs[1] : 0; } - if($this->ie) { - $test = preg_match('/msie ([0-9.]+)/i', $HTTP_USER_AGENT, $regs); - $this->ver = $test ? (float)$regs[1] : 0; - } - if ($this->opera) { - $test = preg_match('/opera ([0-9.]+)/i', $HTTP_USER_AGENT, $regs); - $this->ver = $test ? (float)$regs[1] : 0; + else if ($this->ie || $this->opera) { + $test = preg_match('/(msie|opera) ([0-9.]+)/i', $HTTP_USER_AGENT, $regs); + $this->ver = $test ? (float)$regs[2] : 0; } if (preg_match('/ ([a-z]{2})-([a-z]{2})/i', $HTTP_USER_AGENT, $regs)) |