diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-06-28 19:38:50 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-06-28 19:38:50 +0200 |
| commit | 2698d7ff8c4e283ca09514e6b5bd3a3aebf60525 (patch) | |
| tree | d8b3ee6c3eb091d0b32b00c30e99c9b302771912 | |
| parent | b97d0e11b55fc2bc8ba27b44435b8b3599dd3073 (diff) | |
Fixed Konqueror browser detection
| -rw-r--r-- | program/include/rcube_browser.php | 4 | ||||
| -rw-r--r-- | program/js/common.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php index 609ddb842..06033e036 100644 --- a/program/include/rcube_browser.php +++ b/program/include/rcube_browser.php @@ -42,9 +42,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 b6407c5f3..70e435ef1 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -60,8 +60,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; |