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

Timestamp:

10/09/2017 05:35:09 PM (8 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for Symbian as a platform and Ovi Browser as a browser.

File:

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

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

@@ -42 +42 @@
     // Identify platform/OS in user-agent string.
     if ( preg_match(
-        '/^.+?(?P<platform>Windows Phone( OS)?|Android|iPhone|iPad|Windows|Linux|Macintosh|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
+        '/^.+?(?P<platform>Windows Phone( OS)?|Symbian|SymbOS|Android|iPhone|iPad|Windows|Linux|Macintosh|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+)*(;|\))/im',
         $user_agent,
         $regs
@@ -51 +51 @@
     // 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',
+        '%(?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',
         $user_agent,
         $result,
@@ -68 +68 @@
     elseif ( 'Windows Phone' === $data['platform'] ) {
         $data['platform'] = 'Windows Phone OS';
+    }
+    // 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';
     }
     // Generically detect some mobile devices.
@@ -80 +94 @@
 
     // Flag known mobile platforms as mobile.
-    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Windows Phone OS' ) ) ) {
+    if ( in_array( $data['platform'], array( 'Android', 'Fire OS', 'iPad', 'iPhone', 'Mobile', 'PlayBook', 'RIM Tablet OS', 'Symbian', 'Windows Phone OS' ) ) ) {
         $data['mobile'] = true;
     }
@@ -217 +231 @@
             if ( 'Android' === $data['platform'] ) {
                 $data['name'] = 'Android Browser';
+            } elseif ( 'Symbian' === $data['platform'] ) {
+                $data['name'] = 'Nokia Browser';
+                $result['version'][ $key ] = '';
             } else {
                 $data['name'] = 'Safari';
@@ -227 +244 @@
         }
         $data['version'] = $result['version'][ $key ];
+    }
+    // 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;
     }
     // Fall back to whatever is being reported.