Roundcubemail devel
parent: 3e15dbfa | patch | commit | ignore whitespace
alecpl
2010-09-06 372d3bf6dead9800d75a39ebfcd884da5128b64f 
- Fix Chrome browser was recognized as Safari


2 files modified
6 ■■■■■ changed files
program/include/rcube_browser.php 2 ●●●●● patch | view | raw | blame | history
program/js/common.js 4 ●●●●● patch | view | raw | blame | history 
 program/include/rcube_browser.php


@@ -45,7 +45,7 @@


        $this->mz  = stristr($HTTP_USER_AGENT, 'mozilla/5');


        $this->chrome = stristr($HTTP_USER_AGENT, 'chrome');


        $this->khtml = stristr($HTTP_USER_AGENT, 'khtml');


        $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));


        $this->safari = !$this->chrome && ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));




        if ($this->ns || $this->chrome) {


            $test = preg_match('/(mozilla|chrome)\/([0-9.]+)/i', $HTTP_USER_AGENT, $regs);




 program/js/common.js


@@ -57,9 +57,9 @@


  this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));


  this.ns6 = (this.ns && parseInt(this.vendver) == 6);  // (this.mz && this.ns) ? true : false;


  this.ns7 = (this.ns && parseInt(this.vendver) == 7);  // this.agent.indexOf('Netscape/7')>0);


  this.safari = (this.agent_lc.indexOf('safari') > 0 || this.agent.toLowerCase().indexOf('applewebkit') > 0);


  this.konq   = (this.agent_lc.indexOf('konqueror') > 0);


  this.chrome = (this.agent_lc.indexOf('chrome') > 0);


  this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent.toLowerCase().indexOf('applewebkit') > 0));


  this.konq   = (this.agent_lc.indexOf('konqueror') > 0);


  this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);


  this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);