From 2698d7ff8c4e283ca09514e6b5bd3a3aebf60525 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 13:38:50 -0400
Subject: [PATCH] Fixed Konqueror browser detection
---
program/js/common.js | 4 ++--
program/include/rcube_browser.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 609ddb8..06033e0 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -42,9 +42,9 @@
$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 b6407c5..70e435e 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -60,8 +60,8 @@
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;
--
Gitblit v1.9.1