Changeset 6017

Timestamp:

10/11/2017 03:54:00 PM (6 years ago)

Author:

coffee2code

Message:

Browse Happy API: Add support for FreeBSD, OpenBSD, and SunOS as platforms and Konqueror as a browser.

Location:

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

Files:

• parse.php (modified) (3 diffs)
• tests/phpunit/tests/browse-happy.php (modified) (1 diff)

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)?|Symbian|SymbOS|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|FreeBSD|OpenBSD|SunOS|RIM Tablet OS|PlayBook)(?: (NT|zvav))*(?: [ix]?[0-9._]+(\-[0-9a-z\.\-]+)?)*(;|\))/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|SymbianOS|Symbian|S40OviBrowser|Trident|Silk|PaleMoon|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|Konqueror|PaleMoon|Camino|Kindle|Firefox|SamsungBrowser|(?:Mobile )?Safari|NokiaBrowser|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
         $user_agent,
         $result,
@@ -165 +165 @@
     elseif ( false !== ( $key = array_search( 'SamsungBrowser', $result['name'] ) ) ) {
         $data['name']     = 'Samsung Browser';
+        $data['version']  = $result['version'][ $key ];
+    }
+    // Konqueror
+    elseif (
+        false !== ( $key = array_search( 'Konqueror', $result['name'] ) )
+    ||
+        false !== ( $key = array_search( 'konqueror', $result['name'] ) )
+    ) {
+        $data['name']     = 'Konqueror';
         $data['version']  = $result['version'][ $key ];
     }

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

@@ -342 +342 @@
             ],
 
+            // Konqueror
+
+            [
+                'Mozilla/5.0 (X11; FreeBSD) AppleWebKit/537.21 (KHTML, like Gecko) konqueror/4.14.3 Safari/537.21',
+                'FreeBSD Konqueror 4.14.3',
+            ],
+            [
+                'Mozilla/5.0 (compatible; Konqueror/3; Linux)',
+                'Linux Konqueror 3',
+            ],
+            [
+                'Mozilla/5.0 (compatible; Konqueror/4.4; Linux 2.6.32-22-generic; X11; en_US) KHTML/4.4.3 (like Gecko) Kubuntu',
+                'Linux Konqueror 4.4',
+            ],
+            [
+                'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) konqueror/4.14.2 Safari/537.21',
+                'Linux Konqueror 4.14.2',
+            ],
+            [
+                'Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)',
+                'OpenBSD Konqueror 4.1',
+            ],
+            [
+                'Mozilla/5.0 (compatible; Konqueror/3.5; SunOS) KHTML/3.5.1 (like Gecko)',
+                'SunOS Konqueror 3.5',
+            ],
+            [
+                'Mozilla/5.0 (Windows; Windows i686) KHTML/4.10.2 (like Gecko) Konqueror/4.10',
+                'Windows Konqueror 4.10',
+            ],
+
             // Microsoft Edge