From c2e697fe8170b2fe014f391874e00c1ee27f40bc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 24 Sep 2009 09:50:31 -0400
Subject: [PATCH] - added Chrome detection (#1486163)
---
program/include/rcube_browser.php | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index af393d6..9f37aaa 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -5,7 +5,7 @@
| program/include/rcube_browser.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2007-2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2007-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -38,31 +38,29 @@
$this->linux = stristr($HTTP_USER_AGENT, 'linux');
$this->unix = stristr($HTTP_USER_AGENT, 'unix');
+ $this->opera = stristr($HTTP_USER_AGENT, 'opera');
$this->ns4 = stristr($HTTP_USER_AGENT, 'mozilla/4') && !stristr($HTTP_USER_AGENT, 'msie');
$this->ns = ($this->ns4 || stristr($HTTP_USER_AGENT, 'netscape'));
- $this->ie = stristr($HTTP_USER_AGENT, 'msie');
+ $this->ie = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera;
$this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5');
- $this->opera = stristr($HTTP_USER_AGENT, 'opera');
- $this->safari = stristr($HTTP_USER_AGENT, 'safari');
+ $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 = eregi("mozilla\/([0-9\.]+)", $HTTP_USER_AGENT, $regs);
+ if ($this->ns || $this->chrome) {
+ $test = preg_match('/(mozilla|chrome)\/([0-9.]+)/i', $HTTP_USER_AGENT, $regs);
+ $this->ver = $test ? (float)$regs[2] : 0;
+ }
+ else if ($this->mz) {
+ $test = preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs);
$this->ver = $test ? (float)$regs[1] : 0;
}
- if ($this->mz) {
- $test = ereg("rv:([0-9\.]+)", $HTTP_USER_AGENT, $regs);
- $this->ver = $test ? (float)$regs[1] : 0;
- }
- if($this->ie) {
- $test = eregi("msie ([0-9\.]+)", $HTTP_USER_AGENT, $regs);
- $this->ver = $test ? (float)$regs[1] : 0;
- }
- if ($this->opera) {
- $test = eregi("opera ([0-9\.]+)", $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 (eregi(" ([a-z]{2})-([a-z]{2})", $HTTP_USER_AGENT, $regs))
+ if (preg_match('/ ([a-z]{2})-([a-z]{2})/i', $HTTP_USER_AGENT, $regs))
$this->lang = $regs[1];
else
$this->lang = 'en';
--
Gitblit v1.9.1