Changeset 5963 for sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

Timestamp:

09/25/2017 07:09:46 PM (9 years ago)

Author:

coffee2code

Message:

Browse Happy API: Improve detection of Opera and add detection of Opera Mini.

• Detects modern desktop Opera user-agents (previously misidentified as Chrome)
• Detects Opera Mini user-agents
• Fix to identify Linux as platform for Linux Opera
• Adds more Opera-related user-agents for unit testing

TODO: Separately notify about the 12.x branch and desktop versions of Opera (the latest of which is 47), and maybe eventually Opera Mini.

File:

• sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

@@ -40 +40 @@
 
         if ( preg_match(
-                '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: NT)*(?: [ix]?[0-9._]+)*(;|\))/im',
+                '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
                 $user_agent,
                 $regs
@@ -57 +57 @@
 
         preg_match_all(
-                '%(?P<name>Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Opera|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+                '%(?P<name>Opera Mini|Opera|OPR|Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
                 $user_agent,
                 $result,
@@ -70 +70 @@
         }
 
-        if ( 'AppleWebKit' == $result['name'][0] ) {
+        // Opera
+        if (
+                false !== ( $key = array_search( 'Opera Mini', $result['name'] ) )
+        ||
+                false !== ( $key = array_search( 'Opera', $result['name'] ) )
+        ||
+                false !== ( $key = array_search( 'OPR', $result['name'] ) )
+        ) {
+                $data['name'] = $result['name'][ $key ];
+                if ( 'OPR' === $data['name'] ) {
+                        $data['name'] = 'Opera';
+                } elseif ( 'Opera Mini' === $data['name'] ) {
+                        $data['mobile'] = true;
+                }
+                $data['version'] = $result['version'][ $key ];
+        } elseif ( 'AppleWebKit' == $result['name'][0] ) {
                 if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
                         $data['name'] = 'Mobile Safari';
@@ -88 +103 @@
                         $data['name'] = 'webkit';
                 }
-                $data['version'] = $result['version'][ $key ];
-        } elseif ( $key = array_search( 'Opera', $result['name'] ) ) {
-                $data['name'] = $result['name'][ $key ];
                 $data['version'] = $result['version'][ $key ];
         } elseif ( 'MSIE' == $result['name'][0] ) {