Merge branch 'master' of github.com:roundcube/roundcubemail

2 files changed, 17 insertions, 40 deletions

diff --git a/program/lib/Roundcube/rcube_browser.php b/program/lib/Roundcube/rcube_browser.php
index 6d5decf3e..e53e31200 100644
--- a/program/lib/Roundcube/rcube_browser.php
+++ b/program/lib/Roundcube/rcube_browser.php
@@ -28,37 +28,24 @@ class rcube_browser
     {
         $HTTP_USER_AGENT = strtolower($_SERVER['HTTP_USER_AGENT']);
 
-        $this->ver = 0;
-        $this->win = strpos($HTTP_USER_AGENT, 'win') != false;
-        $this->mac = strpos($HTTP_USER_AGENT, 'mac') != false;
+        $this->ver   = 0;
+        $this->win   = strpos($HTTP_USER_AGENT, 'win') != false;
+        $this->mac   = strpos($HTTP_USER_AGENT, 'mac') != false;
         $this->linux = strpos($HTTP_USER_AGENT, 'linux') != false;
         $this->unix  = strpos($HTTP_USER_AGENT, 'unix') != false;
 
-        $this->opera = strpos($HTTP_USER_AGENT, 'opera') !== false;
-        $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 || strpos($HTTP_USER_AGENT, 'trident/') !== false);
-        $this->khtml = strpos($HTTP_USER_AGENT, 'khtml') !== false;
-        $this->mz  = !$this->ie && !$this->khtml && strpos($HTTP_USER_AGENT, 'mozilla/5') !== false;
+        $this->opera  = strpos($HTTP_USER_AGENT, 'opera') !== false;
+        $this->ns     = strpos($HTTP_USER_AGENT, 'netscape') !== false;
         $this->chrome = strpos($HTTP_USER_AGENT, 'chrome') !== false;
-        $this->safari = !$this->chrome && ($this->khtml || strpos($HTTP_USER_AGENT, 'safari') !== false);
+        $this->ie     = !$this->opera && (strpos($HTTP_USER_AGENT, 'compatible; msie') !== false || strpos($HTTP_USER_AGENT, 'trident/') !== false);
+        $this->safari = !$this->chrome && (strpos($HTTP_USER_AGENT, 'safari') !== false || strpos($HTTP_USER_AGENT, 'applewebkit') !== false);
+        $this->mz     = !$this->ie && !$this->safari && !$this->chrome && !$this->ns && strpos($HTTP_USER_AGENT, 'mozilla') !== false;
 
-        if ($this->ns || $this->chrome) {
-            $test = preg_match('/(mozilla|chrome)\/([0-9.]+)/', $HTTP_USER_AGENT, $regs);
-            $this->ver = $test ? (float)$regs[2] : 0;
+        if (preg_match('/(chrome|msie|opera|version|khtml)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+            $this->ver = (float) $regs[3];
         }
-        else if ($this->mz) {
-            $test = preg_match('/rv:([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.]+)/', $HTTP_USER_AGENT, $regs);
-            $this->ver = $test ? (float)$regs[2] : 0;
-
-            // IE 11
-            if (!$this->ver && preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
-                $this->ver = (float) $regs[1];
-            }
+        else if (preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+            $this->ver = (float) $regs[1];
         }
 
         if (preg_match('/ ([a-z]{2})-([a-z]{2})/', $HTTP_USER_AGENT, $regs))
@@ -66,10 +53,10 @@ class rcube_browser
         else
             $this->lang =  'en';
 
-        $this->dom = ($this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7));
+        $this->dom      = $this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7);
         $this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) ||
             ($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7) ? true : false;
-        $this->imgdata = !$this->ie;
+        $this->imgdata  = !$this->ie;
     }
 }
 
diff --git a/tests/Framework/Browser.php b/tests/Framework/Browser.php
index ac92e41e9..a042572a8 100644
--- a/tests/Framework/Browser.php
+++ b/tests/Framework/Browser.php
@@ -21,7 +21,7 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
     /**
      * @dataProvider browsers
      */
-    function test_browser($useragent, $opera, $chrome, $ie, $ns, $ns4, $khtml, $safari, $mz)
+    function test_browser($useragent, $opera, $chrome, $ie, $ns, $safari, $mz)
     {
 
         $object = $this->getBrowser($useragent);
@@ -30,8 +30,6 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
         $this->assertEquals($chrome, $object->chrome, 'Check for Chrome failed');
         $this->assertEquals($ie, $object->ie, 'Check for IE failed');
         $this->assertEquals($ns, $object->ns, 'Check for NS failed');
-        $this->assertEquals($ns4, $object->ns4, 'Check for NS4 failed');
-        $this->assertEquals($khtml, $object->khtml, 'Check for khtml failed');
         $this->assertEquals($safari, $object->safari, 'Check for Safari failed');
         $this->assertEquals($mz, $object->mz, 'Check for MZ failed');
     }
@@ -132,7 +130,7 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
 
     function browsers()
     {
-        return $this->extractDataSet(array('isOpera','isChrome','isIE','isNS','isNS4','isKHTML','isSafari','isMZ'));
+        return $this->extractDataSet(array('isOpera','isChrome','isIE','isNS','isSafari','isMZ'));
     }
 
     function useragents()
@@ -149,8 +147,6 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
                  'isChrome'     => false,                                                                                           //isChrome
                  'isIE'         => false,                                                                                           //isIE
                  'isNS'         => false,                                                                                           //isNS
-                 'isNS4'        => false,                                                                                           //isNS4
-                 'isKHTML'      => false,                                                                                           //isKHTML
                  'isSafari'     => false,                                                                                           //isSafari
                  'isMZ'         => true,                                                                                           //isMZ
                  'lang'         => 'en-US',                                                                               //lang
@@ -169,8 +165,6 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
                  'isChrome'     => false,                                                                                           //isChrome
                  'isIE'         => false,                                                                                           //isIE
                  'isNS'         => false,                                                                                           //isNS
-                 'isNS4'        => false,                                                                                           //isNS4
-                 'isKHTML'      => false,                                                                                           //isKHTML
                  'isSafari'     => false,                                                                                           //isSafari
                  'isMZ'         => true,                                                                                           //isMZ
                  'lang'         => 'en-US',                                                                               //lang
@@ -181,7 +175,7 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
 
             'Chrome Mac' => array(
                  'useragent'    => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/534.3 (KHTML, like Gecko) Chrome/6.0.461.0 Safari/534.3',
-                 'version'      => '5',                                                                                      //Version
+                 'version'      => '6',                                                                                      //Version
                  'isWin'        => false,                                                                                           //isWindows
                  'isLinux'      => false,
                  'isMac'        => true,                                                                                           //isMac
@@ -190,8 +184,6 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
                  'isChrome'     => true,                                                                                           //isChrome
                  'isIE'         => false,                                                                                           //isIE
                  'isNS'         => false,                                                                                           //isNS
-                 'isNS4'        => false,                                                                                           //isNS4
-                 'isKHTML'      => true,                                                                                           //isKHTML
                  'isSafari'     => false,                                                                                           //isSafari
                  'isMZ'         => false,                                                                                           //isMZ
                  'lang'         => 'en-US',                                                                               //lang
@@ -211,8 +203,6 @@ class Framework_Browser extends PHPUnit_Framework_TestCase
                  'isChrome'     => false,                                                                                           //isChrome
                  'isIE'         => true,                                                                                           //isIE
                  'isNS'         => false,                                                                                           //isNS
-                 'isNS4'        => false,                                                                                           //isNS4
-                 'isKHTML'      => false,                                                                                           //isKHTML
                  'isSafari'     => false,                                                                                           //isSafari
                  'isMZ'         => false,                                                                                           //isMZ
                  'lang'         => '',                                                                                         //lang