Imported Upstream version 0.2~stable

[roundcube.git] / program / include / rcube_browser.php

diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index af393d63ef8385a8f40368b0766acdcdf298ae2b..162844f32ca2583dc640899202cda6849f9e8b6b 100644 (file)
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -38,12 +38,13 @@ class rcube_browser
         $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->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);