<!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>[6011] sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0: Browse Happy API: Add support for Symbian as a platform and Ovi Browser as a browser.</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/6011">6011</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/6011","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:35:09 +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: Add support for Symbian as a platform and Ovi Browser as a browser.</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>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.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-09 17:27:45 UTC (rev 6010)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-09 17:35:09 UTC (rev 6011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Identify platform/OS in user-agent string.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match(
</span><del style="background-color: #fdd; text-decoration:none; 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',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/^.+?(?P<platform>Windows Phone( OS)?|Symbian|SymbOS|Android|iPhone|iPad|Windows|Linux|Macintosh|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_agent,
</span><span class="cx" style="display: block; padding: 0 10px"> $regs
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Find tokens of interest in user-agent string.
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '%(?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',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '%(?P<name>Opera Mini|Opera|OPR|Edge|UCBrowser|UCWEB|QQBrowser|SymbianOS|Symbian|S40OviBrowser|Trident|Silk|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_agent,
</span><span class="cx" style="display: block; padding: 0 10px"> $result,
</span><span class="cx" style="display: block; padding: 0 10px"> PREG_PATTERN_ORDER
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,6 +68,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( 'Windows Phone' === $data['platform'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['platform'] = 'Windows Phone OS';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Standardize Symbian OS name.
+ elseif (
+ in_array( $data['platform'], array( 'Symbian', 'SymbOS' ) )
+ ||
+ false !== ( $key = array_search( 'SymbianOS', $result['name'] ) )
+ ||
+ false !== ( $key = array_search( 'Symbian', $result['name'] ) )
+ ) {
+ if ( ! in_array( $data['platform'], array( 'Symbian', 'SymbOS' ) ) ) {
+ unset( $result['name'][ $key ] );
+ unset( $result['version'][ $key ] );
+ }
+ $data['platform'] = 'Symbian';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> // Generically detect some mobile devices.
</span><span class="cx" style="display: block; padding: 0 10px"> elseif (
</span><span class="cx" style="display: block; padding: 0 10px"> ! $data['platform']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Flag known mobile platforms as mobile.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Symbian', 'Windows Phone OS' ) ) ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,6 +230,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false !== ( $key = array_search( 'Safari', $result['name'] ) ) ) {
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'Symbian' === $data['platform'] ) {
+ $data['name'] = 'Nokia Browser';
+ $result['version'][ $key ] = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Safari';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,6 +244,13 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ovi Browser
+ elseif ( false !== ( $key = array_search( 'S40OviBrowser', $result['name'] ) ) ) {
+ $data['name'] = 'Ovi Browser';
+ $data['version'] = $result['version'][ $key ];
+ $data['platform'] = 'Symbian';
+ $data['mobile'] = true;
+ }
</ins><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>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp"></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/tests/phpunit/tests/browse-happy.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/tests/phpunit/tests/browse-happy.php 2017-10-09 17:27:45 UTC (rev 6010)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php 2017-10-09 17:35:09 UTC (rev 6011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +62,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (Linux; U; Android 4.0.4; pt-br; MZ608 Build/7.7.1-141-7-FLEM-UMTS-LA) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Android Android Browser 4.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [
+ 'Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; IdeaTab S6000-F Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30',
+ 'Android Android Browser 4.0', // Actually: Symbian, but not worth accurately detecting.
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> [ // on Galaxy SIII
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; SCH-I535 Build/KOT49H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Android Android Browser 4.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,6 +382,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mobile Nokia Browser 8.5.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [
+ 'Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba',
+ 'Symbian Nokia Browser',
+ ],
+ [
+ 'Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 Nokia5233/51.1.002; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.33 Mobile Safari/533.4 3gpp-gba',
+ 'Symbian Nokia Browser 7.3.1.33',
+ ],
+ [
+ 'Mozilla/5.0 (Symbian/3; Series60/5.3 NokiaN8-00/111.040.1511; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.1.4 Mobile Safari/535.1 3gpp-gba',
+ 'Symbian Nokia Browser 8.3.1.4',
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Opera
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +460,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Opera/9.80 (SpreadTrum; Opera Mini/4.4.31492/66.299; U; en) Presto/2.12.423 Version/12.16',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mobile Opera Mini 12.16',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [
+ 'Opera/9.80 (J2ME/MIDP; Opera Mini/9.80 (S60; SymbOS; Opera Mobi/23.348; U; en) Presto/2.5.25 Version/10.54',
+ 'Symbian Opera Mini 10.54',
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ovi Browser
+
+ [
+ 'Mozilla/5.0 (Series40; Nokia2055/03.20; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/5.5.0.0.27',
+ 'Symbian Ovi Browser 5.5.0.0.27'
+ ],
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // QQ Browser
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,6 +596,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mobile UC Browser 9.5.0.449',
</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">+ 'UCWEB/2.0 (Symbian; U; S60 V5; en-US; Nokia5233) U2/1.0.0 UCBrowser/9.2.0.336 U2/1.0.0 Mobile',
+ 'Symbian UC Browser 9.2.0.336',
+ ],
+ [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (Windows NT 6.2; ARM; Trident/7.0; Touch; rv:11.0; WPDesktop) like Gecko UCBrowser/4.2.1.541',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Windows UC Browser 4.2.1.541',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,7 +712,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_mobile_browsers( $header ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = browsehappy_parse_user_agent( $header );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $parsed['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $parsed['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Symbian', 'Windows Phone OS' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $parsed['mobile'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $parsed['mobile'] );
</span></span></pre>
</div>
</div>
</body>
</html>