summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-28 19:38:50 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-28 19:41:12 +0200
commit3e5e66fabf40392430a1b42101bf42870d8d8ebc (patch)
tree0f5d6c53d8de0c86b29242d125ecfec0e1cad04f /program
parent83d5540ab4eb7caf770fdae8d9b1320a411c8cc2 (diff)
Fixed Konqueror browser detection
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_browser.php4
-rw-r--r--program/js/common.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 0e3b405af..1a4e2356f 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -45,9 +45,9 @@ class rcube_browser
$this->ns4 = strpos($HTTP_USER_AGENT, 'mozilla/4') !== false && strpos($HTTP_USER_AGENT, 'msie') === false;
$this->ns = ($this->ns4 || strpos($HTTP_USER_AGENT, 'netscape') !== false);
$this->ie = !$this->opera && strpos($HTTP_USER_AGENT, 'compatible; msie') !== false;
- $this->mz = !$this->ie && strpos($HTTP_USER_AGENT, 'mozilla/5') !== false;
- $this->chrome = strpos($HTTP_USER_AGENT, 'chrome') !== false;
$this->khtml = strpos($HTTP_USER_AGENT, 'khtml') !== false;
+ $this->mz = !$this->ie && !$this->khtml && strpos($HTTP_USER_AGENT, 'mozilla/5') !== false;
+ $this->chrome = strpos($HTTP_USER_AGENT, 'chrome') !== false;
$this->safari = !$this->chrome && ($this->khtml || strpos($HTTP_USER_AGENT, 'safari') !== false);
if ($this->ns || $this->chrome) {
diff --git a/program/js/common.js b/program/js/common.js
index a1ba878d4..863ca4759 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -62,8 +62,8 @@ function roundcube_browser()
this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));
this.chrome = (this.agent_lc.indexOf('chrome') > 0);
this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0));
- this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && this.agent.indexOf('Mozilla') >= 0);
- this.konq = (this.agent_lc.indexOf('konqueror') > 0);
+ this.konq = (this.agent_lc.indexOf('konqueror') > 0);
+ this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && !this.konq && this.agent.indexOf('Mozilla') >= 0);
this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);
this.opera = window.opera ? true : false;