<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6010] sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php: Browse Happy API: Miscellaneous code structure changes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6010">6010</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6010","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-09 17:27:45 +0000 (Mon, 09 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Browse Happy API: Miscellaneous code structure changes.
* Parse browser tokens immediately after parsing for platform identifiers, to facilitate future platform deductions requiring knowledge of browser
* Don't presume AppleWebKit token is always first when defined
* Use stricter comparison that results of `array_search()` calls aren't explicitly false
* Identify Trident and MSIE before AppleWebKit; the latter being a more generic token</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-08 12:21:59 UTC (rev 6009)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-09 17:27:45 UTC (rev 6010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $mobile_device = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Identify platform/OS in user-agent string.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match(
</span><span class="cx" style="display: block; padding: 0 10px"> '/^.+?(?P<platform>Windows Phone( OS)?|Android|iPhone|iPad|Windows|Linux|Macintosh|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +48,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['platform'] = $regs['platform'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Find tokens of interest in user-agent string.
+ preg_match_all(
+ '%(?P<name>Opera Mini|Opera|OPR|Edge|UCBrowser|UCWEB|QQBrowser|Trident|Silk|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+ $user_agent,
+ $result,
+ PREG_PATTERN_ORDER
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Properly set platform if Android is actually being reported.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'Linux' === $data['platform'] && false !== strpos( $user_agent, 'Android' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $user_agent, 'Kindle' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,15 +83,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['mobile'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all(
- '%(?P<name>Opera Mini|Opera|OPR|Edge|UCBrowser|UCWEB|QQBrowser|Trident|Silk|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
- $user_agent,
- $result,
- PREG_PATTERN_ORDER
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If Version/x.x.x was specified in UA string store it and ignore it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key = array_search( 'Version', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== ( $key = array_search( 'Version', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $version = $result['version'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $result['name'][ $key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $result['version'][ $key ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,12 +152,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Samsung Browser';
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trident (Internet Explorer)
+ elseif ( false !== ( $key = array_search( 'Trident', $result['name'] ) ) ) {
+ // IE 8-10 more reliably report version via Trident token than MSIE token.
+ // IE 11 uses Trident token without an MSIE token.
+ // https://msdn.microsoft.com/library/hh869301(v=vs.85).aspx
+ if ( false !== ( $key2 = array_search( 'IEMobile', $result['name'] ) ) ) {
+ $data['name'] = 'Internet Explorer Mobile';
+ $data['version'] = $result['version'][ $key2 ];
+ } else {
+ $data['name'] = 'Internet Explorer';
+ $trident_ie_mapping = array(
+ '4.0' => '8.0',
+ '5.0' => '9.0',
+ '6.0' => '10.0',
+ '7.0' => '11.0',
+ );
+ $ver = $result['version'][ $key ];
+ $data['version'] = $trident_ie_mapping[ $ver ] ?? $ver;
+ }
+ }
+ // Internet Explorer (pre v8.0)
+ elseif ( false !== ( $key = array_search( 'MSIE', $result['name'] ) ) ) {
+ if ( false !== ( $key = array_search( 'IEMobile', $result['name'] ) ) ) {
+ $data['name'] = 'Internet Explorer Mobile';
+ } else {
+ $data['name'] = 'Internet Explorer';
+ $key = 0;
+ }
+ $data['version'] = $result['version'][ $key ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> // AppleWebKit-emulating browsers
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'AppleWebKit' == $result['name'][0] ) {
- if ( $key = array_search( 'Edge', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( false !== ( $key = array_search( 'AppleWebKit', $result['name'] ) ) ) {
+ if ( false !== ( $key = array_search( 'Edge', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Microsoft Edge';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
- if ( $key2 = array_search( 'Chrome', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false !== ( $key = array_search( 'Mobile Safari', $result['name'] ) ) ) {
+ if ( false !== ( $key2 = array_search( 'Chrome', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Chrome';
</span><span class="cx" style="display: block; padding: 0 10px"> $version = $result['version'][ $key2 ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'Android' === $data['platform'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,14 +206,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Mobile Safari';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $key = array_search( 'RockMelt', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false !== ( $key = array_search( 'RockMelt', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'RockMelt';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $key = array_search( 'Chrome', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false !== ( $key = array_search( 'Chrome', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Chrome';
</span><span class="cx" style="display: block; padding: 0 10px"> $version = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'PlayBook';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false !== ( $key = array_search( 'Safari', $result['name'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'Android' === $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Android Browser';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,36 +227,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Trident (Internet Explorer)
- elseif ( false !== ( $key = array_search( 'Trident', $result['name'] ) ) ) {
- // IE 8-10 more reliably report version via Trident token than MSIE token.
- // IE 11 uses Trident token without an MSIE token.
- // https://msdn.microsoft.com/library/hh869301(v=vs.85).aspx
- if ( $key2 = array_search( 'IEMobile', $result['name'] ) ) {
- $data['name'] = 'Internet Explorer Mobile';
- $data['version'] = $result['version'][ $key2 ];
- } else {
- $data['name'] = 'Internet Explorer';
- $trident_ie_mapping = array(
- '4.0' => '8.0',
- '5.0' => '9.0',
- '6.0' => '10.0',
- '7.0' => '11.0',
- );
- $ver = $result['version'][ $key ];
- $data['version'] = $trident_ie_mapping[ $ver ] ?? $ver;
- }
- }
- // Internet Explorer (pre v8.0)
- elseif ( 'MSIE' == $result['name'][0] ) {
- if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
- $data['name'] = 'Internet Explorer Mobile';
- } else {
- $data['name'] = 'Internet Explorer';
- $key = 0;
- }
- $data['version'] = $result['version'][ $key ];
- }
</del><span class="cx" style="display: block; padding: 0 10px"> // Fall back to whatever is being reported.
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = $result['name'][0];
</span></span></pre>
</div>
</div>
</body>
</html>