fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-483 Fixing and reusing the getBrowser method in G class.

Browse Source
This commit is contained in:
jennylee
2014-10-22 09:16:14 -04:00
parent 6bb876cdec
commit 4f43680b83
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gulliver/system/class.g.php
View File

@@ -4391,15 +4391,15 @@ class G
} elseif (preg_match( '/Firefox/i', $u_agent )) { } elseif (preg_match( '/Firefox/i', $u_agent )) {
$bname = 'Mozilla Firefox'; $bname = 'Mozilla Firefox';
$ub = "Firefox"; $ub = "Firefox";
} elseif ((preg_match( '/Opera/i', $u_agent )) || (preg_match( '/OPR/i', $u_agent ))) {
$bname = 'Opera';
$ub = "Opera";
} elseif (preg_match( '/Chrome/i', $u_agent )) { } elseif (preg_match( '/Chrome/i', $u_agent )) {
$bname = 'Google Chrome'; $bname = 'Google Chrome';
$ub = "Chrome"; $ub = "Chrome";
} elseif (preg_match( '/Safari/i', $u_agent )) { } elseif (preg_match( '/Safari/i', $u_agent )) {
$bname = 'Apple Safari'; $bname = 'Apple Safari';
$ub = "Safari"; $ub = "Safari";
} elseif (preg_match( '/Opera/i', $u_agent )) {
$bname = 'Opera';
$ub = "Opera";
} elseif (preg_match( '/Netscape/i', $u_agent )) { } elseif (preg_match( '/Netscape/i', $u_agent )) {
$bname = 'Netscape'; $bname = 'Netscape';
$ub = "Netscape"; $ub = "Netscape";
@@ -4427,7 +4427,19 @@ class G
// check if we have a number // check if we have a number
if ($version == null || $version == "") { if ($version == null || $version == "") {
$version = "?"; if($ub == 'MSIE'){
$parent = 'RV';
} elseif ($ub == 'Opera'){
$parent = 'OPR';
}
if ($parent != null || $parent != ""){
$s = strpos(strtoupper($u_agent), $parent);
$f = $s + strlen($parent);
$version = substr($u_agent, $f, 15);
$version = preg_replace('/[^0-9,.]/','',$version);
}else {
$version = "?";
}
} }
return array ('userAgent' => $u_agent,'name' => strtolower( $ub ),'longName' => $bname,'version' => $version,'platform' => $platform,'pattern' => $pattern return array ('userAgent' => $u_agent,'name' => strtolower( $ub ),'longName' => $bname,'version' => $version,'platform' => $platform,'pattern' => $pattern
@@ -5552,13 +5564,13 @@ class G
public function checkBrowserCompatibility($browser = null, $version = null) public function checkBrowserCompatibility($browser = null, $version = null)
{ {
if ($browser == null || $version == null) { if ($browser == null || $version == null) {
$info = G::getActualBrowser(); $info = G::getBrowser();
$browser = $info['browser']; $browser = $info['name'];
$version = $info['version']; $version = $info['version'];
} }
if ((($browser== 'IE') && (($version >= 8) && ($version <= 11))) || if ((($browser== 'msie') && (($version >= 8) && ($version <= 11))) ||
(($browser== 'CHROME') && ($version >= 26)) || (($browser== 'chrome') && ($version >= 26)) ||
(($browser== 'FIREFOX') && ($version >= 20)) (($browser== 'firefox') && ($version >= 20))
) { ) {
return true; return true;
} }