Changeset 1415915

Timestamp:

05/12/2016 08:50:00 PM (10 years ago)

Author:

kyleabaker

Message:

v1.0.12

• Added option to adjust how version numbers are shown: Full (previous appearance, ex. 'Opera 10.52'), Simple (ex. 'Opera 10'), off (ex. 'Opera')
• Cleaned up web browser version parsing (simplified pretty dramatically)
• Cleaned up os/device version parsing and architecture parsing (x64)

Location:

wp-useragent

Files:

• assets (added)
• assets/icon-128x128.png (added)
• assets/icon-256x256.png (added)
• assets/screenshot-1.png (added)
• assets/screenshot-2.png (added)
• trunk/assets (deleted)
• trunk/img/16/net/opera-2-developer.png (added)
• trunk/img/16/net/opera-2-next.png (added)
• trunk/img/16/net/opera-3.png (added)
• trunk/img/16/net/opera-developer.png (deleted)
• trunk/img/16/net/opera-next.png (deleted)
• trunk/img/24/net/opera-2-developer.png (added)
• trunk/img/24/net/opera-2-next.png (added)
• trunk/img/24/net/opera-3.png (added)
• trunk/img/24/net/opera-developer.png (deleted)
• trunk/img/24/net/opera-next.png (deleted)
• trunk/languages (added)
• trunk/readme.txt (modified) (3 diffs)
• trunk/uninstall.php (modified) (2 diffs)
• trunk/wp-useragent-detect-device.php (modified) (17 diffs)
• trunk/wp-useragent-detect-os.php (modified) (64 diffs)
• trunk/wp-useragent-detect-trackback.php (modified) (2 diffs)
• trunk/wp-useragent-detect-webbrowser-version.php (modified) (1 diff)
• trunk/wp-useragent-detect-webbrowser.php (modified) (262 diffs)
• trunk/wp-useragent-options.php (modified) (8 diffs)
• trunk/wp-useragent.php (modified) (5 diffs)

wp-useragent/trunk/readme.txt

@@ -84 +84 @@
 
 == Changelog ==
+
+= v1.0.12 =
+* Added option to adjust how version numbers are shown: Full (previous appearance, ex. 'Opera 10.52'), Simple (ex. 'Opera 10'), off (ex. 'Opera')
+* Cleaned up web browser version parsing (simplified pretty dramatically)
+* Cleaned up os/device version parsing and architecture parsing (x64)
+
 
 = v1.0.11 =
@@ -662 +668 @@
 == Upgrade Notice ==
 
+= v1.0.12 =
+* Added option to adjust how version numbers are shown: Full (previous appearance, ex. 'Opera 10.52'), Simple (ex. 'Opera 10'), off (ex. 'Opera')
+* Cleaned up web browser version parsing (simplified pretty dramatically)
+* Cleaned up os/device version parsing and architecture parsing (x64)
+
+
 = v1.0.11 =
 * Added text domain to enable user contributed language translations (popular request: all options and text for this plugin should now be translatable)!
@@ -669 +681 @@
 * Added frequently asked questions/answers to readme
 * Added screenshot assets
-
-
-= v1.0.10 =
-* Fix issue with custom output layout ([Support Forum](https://wordpress.org/support/topic/new-div-and-custom-output))
-* Updated Windows icons with higher resolution and more accurate replacements
-
-
-= v1.0.9 =
-* Fix Windows Phone 8.1 detection ([Support Forum](https://wordpress.org/support/topic/windows-phone-81-is-being-detected-as-iphone-ios-703?replies=1))
-* Fixed Compatibility for the wpDiscuz plugin - WordPress Comments ([Support Thread](https://wordpress.org/support/topic/compatibility-for-the-wpdiscuz-plugin-wordpress-comments?replies=1))
-* WP-UserAgent output is now wrapped by a div with classname "wp-useragent". This should make it much easier for those of you wishing to apply your own CSS to adjust the appearance on your site.
-* Improved settings page with cleaner layout and improved comment preview section.
-* Simplified some option descriptions.
-* Reset default options button now available.
-* Quick links at the top of the page for Plugin Homepage, Support, Changelog and Donate.
-* Removed get_currentuserinfo() call which was deprecated in Wordpress 4.5+
-* Refactored codebase to simplify maintaince of this plugin, general cleanup and reduced duplicate code.
-* DEPRECATED custom output function 'useragent_output_custom()'. Please use 'wpua_custom_output()' instead.
-* Added extra layer of security for escaping user input
-* Updated database schema and migrate settings automatically
-* Updated plugin options to disable autoloading (removes unnecessary memory usage)
-* Added database cleanup on uninstall

wp-useragent/trunk/uninstall.php

@@ -31 +31 @@
 delete_option('wpua_text_on');
 delete_option('wpua_text_via');
+delete_option('wpua_show_version');
 delete_option('wpua_text_links');
 delete_option('wpua_show_full_ua');
@@ -46 +47 @@
 delete_site_option('wpua_text_on');
 delete_site_option('wpua_text_via');
+delete_site_option('wpua_show_version');
 delete_site_option('wpua_text_links');
 delete_site_option('wpua_show_full_ua');

wp-useragent/trunk/wp-useragent-detect-device.php

@@ -23 +23 @@
 function wpua_detect_device()
 {
-    global $useragent;
+    global $useragent, $wpua_show_version;
+
+    $version = null;
 
     // Apple
@@ -33 +35 @@
         if (preg_match('/CPU\ OS\ ([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' iOS '.str_replace('_', '.', $regmatch[1]);
+            $version = 'iOS '.str_replace('_', '.', $regmatch[1]);
         }
 
@@ -45 +47 @@
         if (preg_match('/iPhone\ OS\ ([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' iOS '.str_replace('_', '.', $regmatch[1]);
+            $version = 'iOS '.str_replace('_', '.', $regmatch[1]);
         }
 
@@ -57 +59 @@
         if (preg_match('/iPhone\ OS\ ([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' iOS '.str_replace('_', '.', $regmatch[1]);
+            $version = 'iOS '.str_replace('_', '.', $regmatch[1]);
         }
 
@@ -71 +73 @@
         if (preg_match('/[^M]SIE-([.0-9a-zA-Z]+)\//i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -85 +87 @@
         if (preg_match('/blackberry([.0-9a-zA-Z]+)\//i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -187 +189 @@
         elseif (preg_match('/HTC[\ |_|-]?([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $title .= ' '.$regmatch[1]; // Matche other HTC product names (possibly versions?)
         }
         elseif (preg_match('/HTC([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
@@ -205 +207 @@
         if (preg_match('/Kindle\/([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -219 +221 @@
         if (preg_match('/LG[E]?[\ |-|\/]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -231 +233 @@
     {
         $link = 'http://www.microsoft.com/windowsphone/';
-        $title = 'Windows Phone 7';
+        $title = 'Windows Phone';
+        $version = '7';
         $code = 'wp7';
     }
@@ -239 +242 @@
     {
         $link = 'http://www.microsoft.com/windowsphone/';
-        $title = 'Windows Phone 8.1';
+        $title = 'Windows Phone';
+        $version = '8.1';
         $code = 'wp7';
     }
@@ -247 +251 @@
     {
         $link = 'http://www.microsoft.com/windowsphone/';
-        $title = 'Windows Phone 8';
+        $title = 'Windows Phone';
+        $version = '8';
         $code = 'wp7';
     }
@@ -254 +259 @@
     {
         $link = 'http://www.microsoft.com/windowsphone/';
-        $title = 'Windows Phone 10';
+        $title = 'Windows Phone';
+        $version = '10';
         $code = 'wp10';
     }
@@ -298 +304 @@
         if (preg_match('/MOTO([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
         if (preg_match('/MOT-([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -363 +369 @@
         $title = 'Nokia';
         if (preg_match('/Nokia(E|N)?([0-9]+)/i', $useragent, $regmatch))
-            $title .= ' '.$regmatch[1].$regmatch[2];
+            $title .= ' '.$regmatch[1].$regmatch[2]; // Model name
         $code = 'nokia';
     }
@@ -470 +476 @@
     {
         $link = 'http://en.wikipedia.org/wiki/SonyEricsson';
-        $title = 'SonyEricsson';
+        $title = 'Sony Ericsson';
 
         if (preg_match('/SonyEricsson([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
@@ -515 +521 @@
     }
 
+    // Append version to title (as long as show version isn't 'off')
+    if (isset($version) && $wpua_show_version !== 'false')
+    {
+        $title .= " $version";
+    }
+
     return wpua_get_icon_text($link, $title, $code, '/device/');
 }

wp-useragent/trunk/wp-useragent-detect-os.php

@@ -23 +23 @@
 function wpua_detect_os()
 {
-    global $useragent;
+    global $useragent, $wpua_show_version;
+
+    $version = null;
 
     if (preg_match('/AmigaOS/i', $useragent))
@@ -32 +34 @@
         if (preg_match('/AmigaOS\ ([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'amigaos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Android/i', $useragent))
@@ -51 +48 @@
         {
             $version = $regmatch[1];
-            $title .= ' '.$version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -64 +55 @@
         $title = 'Arch Linux';
         $code = 'archlinux';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/BeOS/i', $useragent))
@@ -75 +61 @@
         $title = 'BeOS';
         $code = 'beos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/CentOS/i', $useragent))
@@ -88 +69 @@
         if (preg_match('/.el([.0-9a-zA-Z]+).centos/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'centos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Chakra/i', $useragent))
@@ -103 +79 @@
         $title = 'Chakra Linux';
         $code = 'chakra';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/CrOS/i', $useragent))
@@ -114 +85 @@
         $title = 'Google Chrome OS';
         $code = 'chromeos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Crunchbang/i', $useragent))
@@ -125 +91 @@
         $title = 'Crunchbang';
         $code = 'crunchbang';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Debian/i', $useragent))
@@ -136 +97 @@
         $title = 'Debian GNU/Linux';
         $code = 'debian';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/DragonFly/i', $useragent))
@@ -147 +103 @@
         $title = 'DragonFly BSD';
         $code = 'dragonflybsd';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Edubuntu/i', $useragent))
@@ -160 +111 @@
         if (preg_match('/Edubuntu[\/|\ ]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -170 +121 @@
         {
             $code = 'edubuntu-2';
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -189 +130 @@
         if (preg_match('/.fc([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'fedora';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Foresight\ Linux/i', $useragent))
@@ -206 +142 @@
         if (preg_match('/Foresight\ Linux\/([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'foresight';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/FreeBSD/i', $useragent))
@@ -221 +152 @@
         $title = 'FreeBSD';
         $code = 'freebsd';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Gentoo/i', $useragent))
@@ -232 +158 @@
         $title = 'Gentoo';
         $code = 'gentoo';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Inferno/i', $useragent))
@@ -243 +164 @@
         $title = 'Inferno';
         $code = 'inferno';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/IRIX/i', $useragent))
@@ -256 +172 @@
         if (preg_match('/IRIX(64)?\ ([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            if ($regmatch[1])
-            {
-                $title .= ' x'.$regmatch[1];
-            }
             if ($regmatch[2])
             {
-                $title .= ' '.$regmatch[2];
+                $version = $regmatch[2];
             }
+            if ($regmatch[1] && $wpua_show_version === 'full')
+            {
+                // Non-standard 64-bit detection
+                // If version isn't null append 64 bit, otherwise set it to x64
+                $version = (is_null($version)) ? 'x64' : "$version x64";
+            }
         }
 
         $code = 'irix';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Kanotix/i', $useragent))
@@ -278 +191 @@
         $title = 'Kanotix';
         $code = 'kanotix';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Knoppix/i', $useragent))
@@ -289 +197 @@
         $title = 'Knoppix';
         $code = 'knoppix';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Kubuntu/i', $useragent))
@@ -302 +205 @@
         if (preg_match('/Kubuntu[\/|\ ]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -312 +215 @@
         {
             $code = 'kubuntu-2';
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -329 +222 @@
         $title = 'LindowsOS';
         $code = 'lindowsos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Linspire/i', $useragent))
@@ -340 +228 @@
         $title = 'Linspire';
         $code = 'lindowsos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Linux\ Mint/i', $useragent))
@@ -353 +236 @@
         if (preg_match('/Linux\ Mint\/([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'linuxmint';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Lubuntu/i', $useragent))
@@ -370 +248 @@
         if (preg_match('/Lubuntu[\/|\ ]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -380 +258 @@
         {
             $code = 'lubuntu-2';
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -395 +263 @@
         || preg_match('/Darwin/i', $useragent))
     {
+        $title = 'Mac';
         $link = 'http://www.apple.com/macosx/';
 
-        if (preg_match('/Mac OS X/i', $useragent))
-        {
-            $title = substr($useragent, strpos(strtolower($useragent), strtolower('Mac OS X')));
-            $title = substr($title, 0, strpos($title, ')'));
-
-            if (strpos($title, ';'))
+        if (preg_match('/Mac OS X/i', $useragent)
+            || preg_match('/Mac OSX/i', $useragent))
+        {
+            if (preg_match('/Mac OS X/i', $useragent))
             {
-                $title = substr($title, 0, strpos($title, ';'));
+                $version = substr($useragent, strpos(strtolower($useragent), strtolower('OS X'))+4);
+                $code = 'mac-3';
             }
-
-            $title = str_replace('_', '.', $title);
-            $code = 'mac-3';
-        }
-        elseif (preg_match('/Mac OSX/i', $useragent))
-        {
-            $title = substr($useragent, strpos(strtolower($useragent), strtolower('Mac OS X')));
-            $title = substr($title, 0, strpos($title, ')'));
-
-            if (strpos($title, ';'))
+            else
             {
-                $title = substr($title, 0, strpos($title, ';'));
+                $version = substr($useragent, strpos(strtolower($useragent), strtolower('OSX'))+3);
+                $code = 'mac-2';
             }
 
-            $title = str_replace('_', '.', $title);
-            $code = 'mac-2';
+            // Parse OS X version number
+            $version = substr($version, 0, strpos($version, ')'));
+            if (strpos($version, ';') > -1)
+            {
+                $version = substr($version, 0, strpos($version, ';'));
+            }
+            $version = str_replace('_', '.', $version);
+
+            // Build version string: full, simple (ignore off)
+            if ($wpua_show_version === 'simple' && preg_match('/([0-9]+\.[0-9]+)/i', $version, $regmatch))
+            {
+                // Return only the major.minor, ex. 10.11.4 -> 10.11
+                $version = $regmatch[1];
+            }
+            $version = (empty($version)) ? 'OS X' : "OS X $version";
         }
         elseif (preg_match('/Darwin/i', $useragent))
         {
-            $title = 'Mac OS Darwin';
+            $version = 'OS Darwin';
             $code = 'mac-1';
         }
@@ -447 +320 @@
         if (preg_match('/mdv([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'mandriva';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/moonOS/i', $useragent))
@@ -464 +332 @@
         if (preg_match('/moonOS\/([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'moonos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/MorphOS/i', $useragent))
@@ -479 +342 @@
         $title = 'MorphOS';
         $code = 'morphos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/NetBSD/i', $useragent))
@@ -490 +348 @@
         $title = 'NetBSD';
         $code = 'netbsd';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Nova/i', $useragent))
@@ -503 +356 @@
         if (preg_match('/Nova[\/|\ ]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
+            $version = $regmatch[1];
         }
 
         $code = 'nova';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/OpenBSD/i', $useragent))
@@ -523 +366 @@
         $title = 'OpenBSD';
         $code = 'openbsd';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Oracle/i', $useragent))
@@ -536 +374 @@
         if (preg_match('/.el([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' Enterprise Linux '.str_replace('_', '.', $regmatch[1]);
+            $title .= ' Enterprise Linux';
+            $version = str_replace('_', '.', $regmatch[1]);
         }
         else
@@ -544 +383 @@
 
         $code = 'oracle';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Pardus/i', $useragent))
@@ -555 +389 @@
         $title = 'Pardus';
         $code = 'pardus';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/PCLinuxOS/i', $useragent))
@@ -568 +397 @@
         if (preg_match('/PCLinuxOS\/[.\-0-9a-zA-Z]+pclos([.\-0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.str_replace('_', '.', $regmatch[1]);
+            $version = str_replace('_', '.', $regmatch[1]);
         }
 
         $code = 'pclinuxos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Red\ Hat/i', $useragent)
@@ -586 +410 @@
         if (preg_match('/.el([._0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' Enterprise Linux '.str_replace('_', '.', $regmatch[1]);
+            $title .= ' Enterprise Linux';
+            $version = str_replace('_', '.', $regmatch[1]);
         }
 
         $code = 'red-hat';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Rosa/i', $useragent))
@@ -601 +421 @@
         $title = 'Rosa Linux';
         $code = 'rosa';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Sabayon/i', $useragent))
@@ -612 +427 @@
         $title = 'Sabayon Linux';
         $code = 'sabayon';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Slackware/i', $useragent))
@@ -623 +433 @@
         $title = 'Slackware';
         $code = 'slackware';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Solaris/i', $useragent))
@@ -646 +451 @@
         $title = 'openSUSE';
         $code = 'suse';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Symb[ian]?[OS]?/i', $useragent))
@@ -659 +459 @@
         if (preg_match('/Symb[ian]?[OS]?\/([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $title .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
         $code = 'symbianos';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Unix/i', $useragent))
@@ -674 +469 @@
         $title = 'Unix';
         $code = 'unix';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/VectorLinux/i', $useragent))
@@ -685 +475 @@
         $title = 'VectorLinux';
         $code = 'vectorlinux';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Venenux/i', $useragent))
@@ -696 +481 @@
         $title = 'Venenux GNU Linux';
         $code = 'venenux';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/webOS/i', $useragent))
@@ -712 +492 @@
         || preg_match('/Win32/i', $useragent))
     {
+        $title = 'Windows';
         $link = 'http://www.microsoft.com/windows/';
 
-        if (preg_match('/Windows NT 10.0; Win64; x64/i', $useragent)
-            || preg_match('/Windows NT 10.0; WOW64/i', $useragent)
-            || preg_match('/Windows NT 6.4; Win64; x64/i', $useragent)
-            || preg_match('/Windows NT 6.4; WOW64/i', $useragent))
-        {
-            $title = 'Windows 10 x64 Edition';
+        if (preg_match('/Windows NT 10.0/i', $useragent)
+            || preg_match('/Windows NT 6.4/i', $useragent))
+        {
+            $version = '10';
             $code = 'win-6';
         }
-        elseif (preg_match('/Windows NT 10.0/i', $useragent)
-            || preg_match('/Windows NT 6.4/i', $useragent))
-        {
-            $title = 'Windows 10';
-            $code = 'win-6';
-        }
-        elseif (preg_match('/Windows NT 6.3; Win64; x64/i', $useragent)
-            || preg_match('/Windows NT 6.3; WOW64/i', $useragent))
-        {
-            $title = 'Windows 8.1 x64 Edition';
+        elseif (preg_match('/Windows NT 6.3/i', $useragent))
+        {
+            $version = '8.1';
             $code = 'win-5';
         }
-        elseif (preg_match('/Windows NT 6.3/i', $useragent))
-        {
-            $title = 'Windows 8.1';
+        elseif (preg_match('/Windows NT 6.2/i', $useragent))
+        {
+            $version = '8';
             $code = 'win-5';
         }
-        elseif (preg_match('/Windows NT 6.2; Win64; x64/i', $useragent)
-            || preg_match('/Windows NT 6.2; WOW64/i', $useragent))
-        {
-            $title = 'Windows 8 x64 Edition';
-            $code = 'win-5';
-        }
-        elseif (preg_match('/Windows NT 6.2/i', $useragent))
-        {
-            $title = 'Windows 8';
-            $code = 'win-5';
-        }
-        elseif (preg_match('/Windows NT 6.1; Win64; x64/i', $useragent)
-            || preg_match('/Windows NT 6.1; WOW64/i', $useragent))
-        {
-            $title = 'Windows 7 x64 Edition';
+        elseif (preg_match('/Windows NT 6.1/i', $useragent))
+        {
+            $version = '7';
             $code = 'win-4';
         }
-        elseif (preg_match('/Windows NT 6.1/i', $useragent))
-        {
-            $title = 'Windows 7';
-            $code = 'win-4';
-        }
         elseif (preg_match('/Windows NT 6.0/i', $useragent))
         {
-            $title = 'Windows Vista';
+            $version = 'Vista';
             $code = 'win-3';
         }
         elseif (preg_match('/Windows NT 5.2 x64/i', $useragent))
         {
-            $title = 'Windows XP x64 Edition';
+            $version = 'XP'; //x64 Edition very similar to Win 2003
             $code = 'win-2';
         }
-        elseif (preg_match('/Windows NT 5.2; Win64; x64/i', $useragent))
-        {
-            $title = 'Windows Server 2003 x64 Edition';
-            $code = 'win-2';
-        }
         elseif (preg_match('/Windows NT 5.2/i', $useragent))
         {
-            $title = 'Windows Server 2003';
+            $version = 'Server 2003';
             $code = 'win-2';
         }
@@ -784 +534 @@
             || preg_match('/Windows XP/i', $useragent))
         {
-            $title = 'Windows XP';
+            $version = 'XP';
             $code = 'win-2';
         }
         elseif (preg_match('/Windows NT 5.01/i', $useragent))
         {
-            $title = 'Windows 2000, Service Pack 1 (SP1)';
+            $version = '2000, Service Pack 1 (SP1)';
             $code = 'win-1';
         }
         elseif (preg_match('/Windows NT 5.0/i', $useragent)
+            || preg_match('/Windows NT5/i', $useragent)
             || preg_match('/Windows 2000/i', $useragent))
         {
-            $title = 'Windows 2000';
+            $version = '2000';
             $code = 'win-1';
         }
@@ -801 +552 @@
             || preg_match('/WinNT4.0/i', $useragent))
         {
-            $title = 'Microsoft Windows NT 4.0';
+            $version = 'NT 4.0';
             $code = 'win-1';
         }
@@ -807 +558 @@
             || preg_match('/WinNT3.51/i', $useragent))
         {
-            $title = 'Microsoft Windows NT 3.11';
+            $version = 'NT 3.11';
+            $code = 'win-1';
+        }
+        elseif (preg_match('/Windows NT/i', $useragent)
+            || preg_match('/WinNT/i', $useragent))
+        {
+            $version = 'NT';
             $code = 'win-1';
         }
@@ -814 +571 @@
             || preg_match('/Win16/i', $useragent))
         {
-            $title = 'Microsoft Windows 3.11';
+            $version = '3.11';
             $code = 'win-1';
         }
         elseif (preg_match('/Windows 3.1/i', $useragent))
         {
-            $title = 'Microsoft Windows 3.1';
+            $version = '3.1';
             $code = 'win-1';
         }
@@ -826 +583 @@
             || preg_match('/Windows ME/i', $useragent))
         {
-            $title = 'Windows Millennium Edition (Windows Me)';
+            $version = 'Millennium Edition (Windows Me)';
             $code = 'win-1';
         }
         elseif (preg_match('/Win98/i', $useragent))
         {
-            $title = 'Windows 98 SE';
+            $version = '98 SE';
             $code = 'win-1';
         }
@@ -837 +594 @@
             || preg_match('/Windows\ 4.10/i', $useragent))
         {
-            $title = 'Windows 98';
+            $version = '98';
             $code = 'win-1';
         }
@@ -843 +600 @@
             || preg_match('/Win95/i', $useragent))
         {
-            $title = 'Windows 95';
+            $version = '95';
             $code = 'win-1';
         }
         elseif (preg_match('/Windows CE/i', $useragent))
         {
-            $title = 'Windows CE';
+            $version = 'CE';
             $code = 'win-2';
         }
         elseif (preg_match('/WM5/i', $useragent))
         {
-            $title = 'Windows Mobile 5';
+            $version = 'Mobile 5';
             $code = 'win-phone';
         }
         elseif (preg_match('/WindowsMobile/i', $useragent))
         {
-            $title = 'Windows Mobile';
+            $version = 'Mobile';
             $code = 'win-phone';
         }
         else
         {
-            $title = 'Windows';
             $code = 'win-2';
         }
@@ -872 +628 @@
         $title = 'Xandros';
         $code = 'xandros';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/Xubuntu/i', $useragent))
@@ -885 +636 @@
         if (preg_match('/Xubuntu[\/|\ ]([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -895 +646 @@
         {
             $code = 'xubuntu-2';
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -912 +653 @@
         $title = 'Zenwalk GNU Linux';
         $code = 'zenwalk';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
 
@@ -927 +663 @@
         if (preg_match('/Ubuntu[\/|\ ]([.0-9]+[.0-9a-zA-Z]+)/i', $useragent, $regmatch))
         {
-            $version .= ' '.$regmatch[1];
+            $version = $regmatch[1];
         }
 
@@ -937 +673 @@
         {
             $code = 'ubuntu-2';
-        }
-
-        if (strlen($version) > 1)
-        {
-            $title .= $version;
-        }
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
         }
     }
@@ -954 +680 @@
         $title = 'GNU/Linux';
         $code = 'linux';
-
-        if (preg_match('/x86_64/i', $useragent))
-        {
-            $title .= ' x64';
-        }
     }
     elseif (preg_match('/J2ME\/MIDP/i', $useragent))
@@ -973 +694 @@
     }
 
+    // Check x64 architecture
+    if (preg_match('/x86_64/i', $useragent) && $wpua_show_version === 'full')
+    {
+        // If version isn't null append 64 bit, otherwise set it to x64
+        $version = (is_null($version)) ? 'x64' : "$version x64";
+    }
+    elseif ( $wpua_show_version === 'full'
+        && (preg_match('/Windows/i', $useragent) // is Windows?
+        || preg_match('/WinNT/i', $useragent)
+        || preg_match('/Win32/i', $useragent))
+        && (preg_match('/Win64/i', $useragent) // is x64?
+        || preg_match('/x64/i', $useragent)
+        || preg_match('/WOW64/i', $useragent)) )
+    {
+        $version .= ' x64 Edition';
+    }
+
+    // Append version to title (as long as show version isn't 'off')
+    if (isset($version) && $wpua_show_version !== 'false')
+    {
+        $title .= " $version";
+    }
+
     return wpua_get_icon_text($link, $title, $code, '/os/');
 }

wp-useragent/trunk/wp-useragent-detect-trackback.php

@@ -23 +23 @@
 function wpua_detect_trackback()
 {
-    global $useragent;
+    global $useragent, $wpua_show_version;
 
-    $version = '';
+    $version = null;
 
     if (preg_match('/Drupal/i', $useragent))
@@ -130 +130 @@
     }
 
-    // Append version to title string before processing
-    $title .= " $version";
+    // Append version to title (as long as show version isn't 'off')
+    if (isset($version) && $wpua_show_version === 'full')
+    {
+        $title .= " $version";
+    }
 
     return wpua_get_icon_text($link, $title, $code, '/trackback/');

wp-useragent/trunk/wp-useragent-detect-webbrowser-version.php

@@ -21 +21 @@
 
 // Detect Web Browser versions
-function wpua_detect_browser_version($title)
+function wpua_detect_browser_version($version_ptr)
 {
-    global $useragent;
+    global $useragent, $wpua_show_version;
 
-    // Fix for Opera's UA string changes in v10.00+ (and others)
-    $start = $title;
-    if ( (strtolower($title) === strtolower('Opera')
-            || strtolower($title) === strtolower('Opera Next')
-            || strtolower($title) === strtolower('Opera Labs'))
-        && preg_match('/Version/i', $useragent))
+    // If show versions option is disabled, return immediately.
+    if ($wpua_show_version === 'false') return '';
+
+    // Grab the browser version if its present
+    preg_match('/'.$version_ptr.'[\ |\/|\:]?([.0-9a-zA-Z]+)/i', $useragent, $regmatch);
+    $version = (is_null($regmatch[1])) ? '' : $regmatch[1] ;
+
+    // Only show simple version? If so, only return the major (ex. 10.52 -> 10)
+    if ($wpua_show_version === 'simple' && preg_match('/^([0-9]+)/i', $version, $regmatch))
     {
-        $start = 'Version';
-    }
-    elseif ( (strtolower($title) === strtolower('Opera')
-            || strtolower($title) === strtolower('Opera Next')
-            || strtolower($title) === strtolower('Opera Developer'))
-        && preg_match('/OPR/i', $useragent))
-    {
-        $start = 'OPR';
-    }
-    elseif (strtolower($title) === strtolower('Opera Mobi')
-        && preg_match('/Version/i', $useragent))
-    {
-        $start = 'Version';
-    }
-    elseif (strtolower($title) === strtolower('Safari')
-        && preg_match('/Version/i', $useragent))
-    {
-        $start = 'Version';
-    }
-    elseif (strtolower($title) === strtolower('Pre')
-        && preg_match('/Version/i', $useragent))
-    {
-        $start = 'Version';
-    }
-    elseif (strtolower($title) === strtolower('Android Webkit'))
-    {
-        $start = 'Version';
-    }
-    elseif (strtolower($title) === strtolower('Links'))
-    {
-        $start = 'Links \\(';
-    }
-    elseif (strtolower($title) === strtolower('UC Browser'))
-    {
-        $start = 'UC Browse';
-    }
-    elseif (strtolower($title) === strtolower('TenFourFox'))
-    {
-        $start = ' rv';
-    }
-    elseif (strtolower($title) === strtolower('Classilla'))
-    {
-        $start = ' rv';
-    }
-    elseif (strtolower($title) === strtolower('SmartTV'))
-    {
-        $start = 'WebBrowser';
-    }
-    elseif (strtolower($title) === strtolower('MSIE') && preg_match('/\ rv:([.0-9a-zA-Z]+)/i', $useragent))
-    {
-        // We have IE11 or newer
-        $start = ' rv';
+        $version = $regmatch[1];
     }
 
-    // Grab the browser version if its present
-    preg_match('/'.$start.'[\ |\/|\:]?([.0-9a-zA-Z]+)/i', $useragent, $regmatch);
-    $version = $regmatch[1];
-
-    // Return browser Title and Version, but first..some titles need to be changed
-    if (strtolower($title) === 'msie'
-        && strtolower($version) === '7.0'
-        && preg_match('/Trident\/4.0/i', $useragent))
-    {
-        return ' 8.0 (Compatibility Mode)'; // Fix for IE8 quirky UA string with Compatibility Mode enabled
-    }
-    elseif (strtolower($title) === 'msie')
-    {
-        return " $version";
-    }
-    elseif (strtolower($title) === 'NetFrontLifeBrowser')
-    {
-        return "NetFront Life $version";
-    }
-    elseif (strtolower($title) === 'ninesky-android-mobile')
-    {
-        return "Ninesky $version";
-    }
-    elseif (strtolower($title) === 'coc_coc_browser')
-    {
-        return "Coc Coc $version";
-    }
-    elseif (strtolower($title) === 'gsa')
-    {
-        return "Google Search App $version";
-    }
-    elseif (strtolower($title) === 'multi-browser')
-    {
-        return "Multi-Browser XP $version";
-    }
-    elseif (strtolower($title) === 'nf-browser')
-    {
-        return "NetFront $version";
-    }
-    elseif (strtolower($title) === 'semc-browser')
-    {
-        return "SEMC Browser $version";
-    }
-    elseif (strtolower($title) === 'ucweb')
-    {
-        return "UC Browser $version";
-    }
-    elseif (strtolower($title) === 'up.browser'
-        || strtolower($title) === 'up.link')
-    {
-        return "Openwave Mobile Browser $version";
-    }
-    elseif (strtolower($title) === 'chromeframe')
-    {
-        return "Google Chrome Frame $version";
-    }
-    elseif (strtolower($title) === 'mozilladeveloperpreview')
-    {
-        return "Mozilla Developer Preview $version";
-    }
-    elseif (strtolower($title) === 'multi-browser')
-    {
-        return "Multi-Browser XP $version";
-    }
-    elseif (strtolower($title) === 'opera mobi')
-    {
-        return "Opera Mobile $version";
-    }
-    elseif (strtolower($title) === 'osb-browser')
-    {
-        return "Gtk+ WebCore $version";
-    }
-    elseif (strtolower($title) === 'tablet browser')
-    {
-        return "MicroB $version";
-    }
-    elseif (strtolower($title) === 'tencenttraveler')
-    {
-        return "TT Explorer $version";
-    }
-    elseif (strtolower($title) === 'crmo')
-    {
-        return "Chrome Mobile $version";
-    }
-    elseif (strtolower($title) === 'smarttv')
-    {
-        return "Maple Browser $version";
-    }
-    elseif (strtolower($title) === 'wp-android'
-        || strtolower($title) === 'wp-iphone')
-    {
-        //TODO check into Android version being returned
-        return "Wordpress App $version";
-    }
-    elseif (strtolower($title) === 'atomicbrowser')
-    {
-        return "Atomic Web Browser $version";
-    }
-    elseif (strtolower($title) === 'barcapro')
-    {
-        return "Barca Pro $version";
-    }
-    elseif (strtolower($title) === 'dplus')
-    {
-        return "D+ $version";
-    }
-    elseif (strtolower($title) === 'nichrome\/self')
-    {
-        return "Rambler browser $version";
-    }
-    elseif (strtolower($title) === 'opera labs')
-    {
-        preg_match('/Edition\ Labs([\ ._0-9a-zA-Z]+);/i', $useragent, $regmatch);
-        return $title.$regmatch[1]." $version";
-    }
-    elseif (strtolower($title) === 'escape'
-        || strtolower($title) === 'espial')
-    {
-        return $version;
-    }
-    else
-    {
-        return "$title $version";
-    }
+    // Return simple browser version
+    return $version;
 }
 

wp-useragent/trunk/wp-useragent-detect-webbrowser.php

@@ -23 +23 @@
 function wpua_detect_webbrowser()
 {
-    global $useragent;
+    global $useragent, $wpua_show_version;
+
+    $version = null;
 
     if (preg_match('/360se/i', $useragent))
@@ -29 +31 @@
         $link = 'http://se.360.cn/';
         $title = '360Safe Explorer';
+        $version = '';
         $code = '360se';
     }
@@ -35 +38 @@
         $link = 'http://www.aborange.de/products/freeware/abolimba-multibrowser.php';
         $title = 'Abolimba';
+        $version = '';
         $code = 'abolimba';
     }
@@ -40 +44 @@
     {
         $link = 'http://www.acoobrowser.com/';
-        $title = 'Acoo '.wpua_detect_browser_version('Browser');
+        $title = 'Acoo Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'acoobrowser';
     }
@@ -46 +51 @@
     {
         $link = 'http://sourceforge.net/projects/alienforce/';
-        $title = wpua_detect_browser_version('Alienforce');
+        $title = 'Alienforce';
         $code = 'alienforce';
     }
@@ -52 +57 @@
     {
         $link = 'http://www.w3.org/Amaya/';
-        $title = wpua_detect_browser_version('Amaya');
+        $title = 'Amaya';
         $code = 'amaya';
     }
@@ -58 +63 @@
     {
         $link = 'http://aweb.sunsite.dk/';
-        $title = 'Amiga '.wpua_detect_browser_version('AWeb');
+        $title = 'Amiga AWeb';
+        $version = wpua_detect_browser_version('AWeb');
         $code = 'amiga-aweb';
     }
@@ -65 +71 @@
         $link = 'http://amigo.mail.ru/';
         $title = 'Amigo';
+        $version = '';
         $code = 'amigo';
     }
@@ -70 +77 @@
     {
         $link = 'http://downloads.channel.aol.com/browser';
-        $title = 'America Online '.wpua_detect_browser_version('Browser');
+        $title = 'America Online Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'aol';
     }
@@ -76 +84 @@
     {
         $link = 'http://v3.vapor.com/voyager/';
-        $title = 'Amiga '.wpua_detect_browser_version('Voyager');
+        $title = 'Amiga Voyager';
+        $version = wpua_detect_browser_version('Voyager');
         $code = 'amigavoyager';
     }
@@ -82 +91 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Fresco_(web_browser)';
-        $title = 'ANT '.wpua_detect_browser_version('Fresco');
+        $title = 'ANT Fresco';
+        $version = wpua_detect_browser_version('Fresco');
         $code = 'antfresco';
     }
@@ -88 +98 @@
     {
         $link = 'http://downloads.channel.aol.com/browser';
-        $title = wpua_detect_browser_version('AOL');
+        $title = 'AOL';
         $code = 'aol';
     }
@@ -94 +104 @@
     {
         $link = 'http://code.google.com/p/arora/';
-        $title = wpua_detect_browser_version('Arora');
+        $title = 'Arora';
         $code = 'arora';
     }
@@ -100 +110 @@
     {
         $link = 'http://www.atomicwebbrowser.com/';
-        $title = wpua_detect_browser_version('AtomicBrowser');
+        $title = 'Atomic Web Browser';
+        $version = wpua_detect_browser_version('AtomicBrowser');
         $code = 'atomicwebbrowser';
     }
@@ -106 +117 @@
     {
         $link = 'http://www.avantbrowser.com/';
-        $title = 'Avant '.wpua_detect_browser_version('Browser');
+        $title = 'Avant Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'avantbrowser';
     }
@@ -112 +124 @@
     {
         $link = 'http://www.whitehatsec.com/aviator/';
-        $title = wpua_detect_browser_version('Aviator');
+        $title = 'Aviator';
         $code = 'aviator';
     }
@@ -118 +130 @@
     {
         $link = 'http://liulanqi.baidu.com/';
-        $title = 'Baidu '.wpua_detect_browser_version('Browser');
+        $title = 'Baidu Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'baidubrowser';
     }
@@ -124 +137 @@
     {
         $link = 'http://en.browser.baidu.com/';
-        $title = 'Baidu '.wpua_detect_browser_version('Spark');
+        $title = 'Baidu Spark';
+        $version = wpua_detect_browser_version('Spark');
         $code = 'baiduspark';
     }
@@ -130 +144 @@
     {
         $link = 'http://www.pocosystems.com/home/index.php?option=content&task=category&sectionid=2&id=9&Itemid=27';
-        $title = wpua_detect_browser_version('BarcaPro');
+        $title = 'Barca Pro';
+        $version = wpua_detect_browser_version('BarcaPro');
         $code = 'barca';
     }
@@ -136 +151 @@
     {
         $link = 'http://www.pocosystems.com/home/index.php?option=content&task=category&sectionid=2&id=9&Itemid=27';
-        $title = wpua_detect_browser_version('Barca');
+        $title = 'Barca';
         $code = 'barca';
     }
@@ -142 +157 @@
     {
         $link = 'http://www.beamrise.com/';
-        $title = wpua_detect_browser_version('Beamrise');
+        $title = 'Beamrise';
         $code = 'beamrise';
     }
@@ -148 +163 @@
     {
         $link = 'http://www.beonex.com/';
-        $title = wpua_detect_browser_version('Beonex');
+        $title = 'Beonex';
         $code = 'beonex';
     }
@@ -154 +169 @@
     {
         $link = 'http://www.blackberry.com/';
-        $title = wpua_detect_browser_version('BlackBerry');
+        $title = 'BlackBerry';
         $code = 'blackberry';
     }
@@ -160 +175 @@
     {
         $link = 'http://www.blackbirdbrowser.com/';
-        $title = wpua_detect_browser_version('Blackbird');
+        $title = 'Blackbird';
         $code = 'blackbird';
     }
@@ -166 +181 @@
     {
         $link = 'http://www.netgate.sk/blackhawk/help/welcome-to-blackhawk-web-browser.html';
-        $title = wpua_detect_browser_version('BlackHawk');
+        $title = 'BlackHawk';
         $code = 'blackhawk';
     }
@@ -172 +187 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Blazer_(web_browser)';
-        $title = wpua_detect_browser_version('Blazer');
+        $title = 'Blazer';
         $code = 'blazer';
     }
@@ -178 +193 @@
     {
         $link = 'http://www.boltbrowser.com/';
-        $title = wpua_detect_browser_version('Bolt');
+        $title = 'Bolt';
         $code = 'bolt';
     }
@@ -184 +199 @@
     {
         $link = 'http://www.mozilla.org/projects/minefield/';
-        $title = wpua_detect_browser_version('BonEcho');
+        $title = 'BonEcho';
         $code = 'firefoxdevpre';
     }
@@ -191 +206 @@
         $link = 'http://pdqi.com/browsex/';
         $title = 'BrowseX';
+        $version = '';
         $code = 'browsex';
     }
@@ -196 +212 @@
     {
         $link = 'http://www.browzar.com/';
-        $title = wpua_detect_browser_version('Browzar');
+        $title = 'Browzar';
         $code = 'browzar';
     }
@@ -202 +218 @@
     {
         $link = 'http://code.google.com/p/quirkysoft/';
-        $title = wpua_detect_browser_version('Bunjalloo');
+        $title = 'Bunjalloo';
         $code = 'bunjalloo';
     }
@@ -208 +224 @@
     {
         $link = 'http://www.caminobrowser.org/';
-        $title = wpua_detect_browser_version('Camino');
+        $title = 'Camino';
         $code = 'camino';
     }
@@ -214 +230 @@
     {
         $link = 'http://www.caymanbrowser.com/';
-        $title = 'Cayman '.wpua_detect_browser_version('Browser');
+        $title = 'Cayman Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'caymanbrowser';
     }
@@ -220 +237 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Charon_(web_browser)';
-        $title = wpua_detect_browser_version('Charon');
+        $title = 'Charon';
         $code = 'null';
     }
@@ -226 +243 @@
     {
         $link = 'http://downloads.channel.aol.com/browser';
-        $title = wpua_detect_browser_version('Cheshire');
+        $title = 'Cheshire';
         $code = 'aol';
     }
@@ -232 +249 @@
     {
         $link = 'http://www.chimera.org/';
-        $title = wpua_detect_browser_version('Chimera');
+        $title = 'Chimera';
         $code = 'null';
     }
@@ -238 +255 @@
     {
         $link = 'http://code.google.com/chrome/chromeframe/';
-        $title = wpua_detect_browser_version('chromeframe');
+        $title = 'Google Chrome Frame';
+        $version = wpua_detect_browser_version('chromeframe');
         $code = 'google';
     }
@@ -244 +262 @@
     {
         $link = 'http://www.chromeplus.org/';
-        $title = wpua_detect_browser_version('ChromePlus');
+        $title = 'ChromePlus';
         $code = 'chromeplus';
     }
@@ -250 +268 @@
     {
         $link = 'http://www.srware.net/';
-        $title = 'SRWare '.wpua_detect_browser_version('Iron');
+        $title = 'SRWare Iron';
+        $version = wpua_detect_browser_version('Iron');
         $code = 'srwareiron';
     }
@@ -256 +275 @@
     {
         $link = 'http://www.chromium.org/';
-        $title = wpua_detect_browser_version('Chromium');
+        $title = 'Chromium';
         $code = 'chromium';
     }
@@ -262 +281 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Classilla';
-        $title = wpua_detect_browser_version('Classilla');
+        $title = 'Classilla';
+        $version = wpua_detect_browser_version(' rv');
         $code = 'classilla';
     }
@@ -268 +288 @@
     {
         $link = 'http://coastbyopera.com/';
-        $title = wpua_detect_browser_version('Coast');
+        $title = 'Coast';
         $code = 'coast';
     }
@@ -274 +294 @@
     {
         $link = 'http://coccoc.vn/';
-        $title = wpua_detect_browser_version('coc_coc_browser');
+        $title = 'Coc Coc';
+        $version = wpua_detect_browser_version('coc_coc_browser');
         $code = 'coccoc';
     }
@@ -280 +301 @@
     {
         $link = 'http://www.columbus-browser.com/';
-        $title = wpua_detect_browser_version('Columbus');
+        $title = 'Columbus';
         $code = 'columbus';
     }
@@ -286 +307 @@
     {
         $link = 'http://www.cometbird.com/';
-        $title = wpua_detect_browser_version('CometBird');
+        $title = 'CometBird';
         $code = 'cometbird';
     }
@@ -292 +313 @@
     {
         $link = 'http://www.comodo.com/home/internet-security/browser.php';
-        $title = 'Comodo '.wpua_detect_browser_version('Dragon');
+        $title = 'Comodo Dragon';
+        $version = wpua_detect_browser_version('Dragon');
         $code = 'comodo-dragon';
     }
@@ -298 +320 @@
     {
         $link = 'http://www.conkeror.org/';
-        $title = wpua_detect_browser_version('Conkeror');
+        $title = 'Conkeror';
         $code = 'conkeror';
     }
@@ -304 +326 @@
     {
         $link = 'http://www.coolnovo.com/';
-        $title = wpua_detect_browser_version('CoolNovo');
+        $title = 'CoolNovo';
         $code = 'coolnovo';
     }
@@ -310 +332 @@
     {
         $link = 'http://en.wikipedia.org/wiki/C%E1%BB%9D_R%C3%B4m%2B_(browser)';
-        $title = wpua_detect_browser_version('CoRom');
+        $title = 'CoRom';
         $code = 'corom';
     }
@@ -316 +338 @@
     {
         $link = 'http://www.crazybrowser.com/';
-        $title = 'Crazy '.wpua_detect_browser_version('Browser');
+        $title = 'Crazy Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'crazybrowser';
     }
@@ -322 +345 @@
     {
         $link = 'http://www.google.com/chrome';
-        $title = wpua_detect_browser_version('CrMo');
+        $title = 'Chrome Mobile';
+        $version = wpua_detect_browser_version('CrMo');
         $code = 'chrome';
     }
@@ -328 +352 @@
     {
         $link = 'http://www.cruzapp.com/';
-        $title = wpua_detect_browser_version('Cruz');
+        $title = 'Cruz';
         $code = 'cruz';
     }
@@ -334 +358 @@
     {
         $link = 'http://www.cyberdog.org/about/cyberdog/cyberbrowse.html';
-        $title = wpua_detect_browser_version('Cyberdog');
+        $title = 'Cyberdog';
         $code = 'cyberdog';
     }
+    elseif (preg_match('/Deepnet\ Explorer/i', $useragent))
+    {
+        $link = 'http://www.deepnetexplorer.com/';
+        $title = 'Deepnet Explorer';
+        $code = 'deepnetexplorer';
+    }
+    elseif (preg_match('/Demeter/i', $useragent))
+    {
+        $link = 'http://www.hurrikenux.com/Demeter/';
+        $title = 'Demeter';
+        $code = 'demeter';
+    }
+    elseif (preg_match('/DeskBrowse/i', $useragent))
+    {
+        $link = 'http://www.deskbrowse.org/';
+        $title = 'DeskBrowse';
+        $code = 'deskbrowse';
+    }
+    elseif (preg_match('/Dillo/i', $useragent))
+    {
+        $link = 'http://www.dillo.org/';
+        $title = 'Dillo';
+        $code = 'dillo';
+    }
+    elseif (preg_match('/DoCoMo/i', $useragent))
+    {
+        $link = 'http://www.nttdocomo.com/';
+        $title = 'DoCoMo';
+        $code = 'null';
+    }
+    elseif (preg_match('/DocZilla/i', $useragent))
+    {
+        $link = 'http://www.doczilla.com/';
+        $title = 'DocZilla';
+        $code = 'doczilla';
+    }
+    elseif (preg_match('/Dolfin/i', $useragent))
+    {
+        $link = 'http://www.samsungmobile.com/';
+        $title = 'Dolfin';
+        $code = 'samsung';
+    }
+    elseif (preg_match('/Dooble/i', $useragent))
+    {
+        $link = 'http://dooble.sourceforge.net/';
+        $title = 'Dooble';
+        $code = 'dooble';
+    }
+    elseif (preg_match('/Doris/i', $useragent))
+    {
+        $link = 'http://www.anygraaf.fi/browser/indexe.htm';
+        $title = 'Doris';
+        $code = 'doris';
+    }
+    elseif (preg_match('/Dorothy/i', $useragent))
+    {
+        $link = 'http://www.dorothybrowser.com/';
+        $title = 'Dorothy';
+        $code = 'dorothybrowser';
+    }
     elseif (preg_match('/DPlus/i', $useragent))
     {
         $link = 'http://dplus-browser.sourceforge.net/';
-        $title = wpua_detect_browser_version('DPlus');
+        $version = wpua_detect_browser_version('DPlus');
+        $title = 'D+';
         $code = 'dillo';
     }
-    elseif (preg_match('/Deepnet\ Explorer/i', $useragent))
-    {
-        $link = 'http://www.deepnetexplorer.com/';
-        $title = wpua_detect_browser_version('Deepnet Explorer');
-        $code = 'deepnetexplorer';
-    }
-    elseif (preg_match('/Demeter/i', $useragent))
-    {
-        $link = 'http://www.hurrikenux.com/Demeter/';
-        $title = wpua_detect_browser_version('Demeter');
-        $code = 'demeter';
-    }
-    elseif (preg_match('/DeskBrowse/i', $useragent))
-    {
-        $link = 'http://www.deskbrowse.org/';
-        $title = wpua_detect_browser_version('DeskBrowse');
-        $code = 'deskbrowse';
-    }
-    elseif (preg_match('/Dillo/i', $useragent))
-    {
-        $link = 'http://www.dillo.org/';
-        $title = wpua_detect_browser_version('Dillo');
-        $code = 'dillo';
-    }
-    elseif (preg_match('/DoCoMo/i', $useragent))
-    {
-        $link = 'http://www.nttdocomo.com/';
-        $title = wpua_detect_browser_version('DoCoMo');
+    elseif (preg_match('/Edbrowse/i', $useragent))
+    {
+        $link = 'http://edbrowse.sourceforge.net/';
+        $title = 'Edbrowse';
+        $code = 'edbrowse';
+    }
+    elseif (preg_match('/Element\ Browser/i', $useragent))
+    {
+        $link = 'http://www.elementsoftware.co.uk/software/elementbrowser/';
+        $title = 'Element Browser';
+        $version = wpua_detect_browser_version('Browser');
+        $code = 'elementbrowser';
+    }
+    elseif (preg_match('/Elinks/i', $useragent))
+    {
+        $link = 'http://elinks.or.cz/';
+        $title = 'Elinks';
+        $code = 'elinks';
+    }
+    elseif (preg_match('/Enigma\ Browser/i', $useragent))
+    {
+        $link = 'http://en.wikipedia.org/wiki/Enigma_Browser';
+        $title = 'Enigma Browser';
+        $version = wpua_detect_browser_version('Browser');
+        $code = 'enigmabrowser';
+    }
+    elseif (preg_match('/EnigmaFox/i', $useragent))
+    {
+        $link = '#';
+        $title = 'EnigmaFox';
         $code = 'null';
     }
-    elseif (preg_match('/DocZilla/i', $useragent))
-    {
-        $link = 'http://www.doczilla.com/';
-        $title = wpua_detect_browser_version('DocZilla');
-        $code = 'doczilla';
-    }
-    elseif (preg_match('/Dolfin/i', $useragent))
-    {
-        $link = 'http://www.samsungmobile.com/';
-        $title = wpua_detect_browser_version('Dolfin');
-        $code = 'samsung';
-    }
-    elseif (preg_match('/Dooble/i', $useragent))
-    {
-        $link = 'http://dooble.sourceforge.net/';
-        $title = wpua_detect_browser_version('Dooble');
-        $code = 'dooble';
-    }
-    elseif (preg_match('/Doris/i', $useragent))
-    {
-        $link = 'http://www.anygraaf.fi/browser/indexe.htm';
-        $title = wpua_detect_browser_version('Doris');
-        $code = 'doris';
-    }
-    elseif (preg_match('/Dorothy/i', $useragent))
-    {
-        $link = 'http://www.dorothybrowser.com/';
-        $title = wpua_detect_browser_version('Dorothy');
-        $code = 'dorothybrowser';
-    }
-    elseif (preg_match('/DPlus/i', $useragent))
-    {
-        $link = 'http://dplus-browser.sourceforge.net/';
-        $title = wpua_detect_browser_version('DPlus');
-        $code = 'dillo';
-    }
-    elseif (preg_match('/Edbrowse/i', $useragent))
-    {
-        $link = 'http://edbrowse.sourceforge.net/';
-        $title = wpua_detect_browser_version('Edbrowse');
-        $code = 'edbrowse';
-    }
-    elseif (preg_match('/Element\ Browser/i', $useragent))
-    {
-        $link = 'http://www.elementsoftware.co.uk/software/elementbrowser/';
-        $title = 'Element '.wpua_detect_browser_version('Browser');
-        $code = 'elementbrowser';
-    }
-    elseif (preg_match('/Elinks/i', $useragent))
-    {
-        $link = 'http://elinks.or.cz/';
-        $title = wpua_detect_browser_version('Elinks');
-        $code = 'elinks';
-    }
-    elseif (preg_match('/Enigma\ Browser/i', $useragent))
-    {
-        $link = 'http://en.wikipedia.org/wiki/Enigma_Browser';
-        $title = 'Enigma '.wpua_detect_browser_version('Browser');
-        $code = 'enigmabrowser';
-    }
-    elseif (preg_match('/EnigmaFox/i', $useragent))
-    {
-        $link = '#';
-        $title = wpua_detect_browser_version('EnigmaFox');
-        $code = 'null';
-    }
     elseif (preg_match('/Epic/i', $useragent))
     {
         $link = 'http://www.epicbrowser.com/';
-        $title = wpua_detect_browser_version('Epic');
+        $title = 'Epic';
         $code = 'epicbrowser';
     }
@@ -448 +469 @@
     {
         $link = 'http://gnome.org/projects/epiphany/';
-        $title = wpua_detect_browser_version('Epiphany');
+        $title = 'Epiphany';
         $code = 'epiphany';
     }
@@ -454 +475 @@
     {
         $link = 'http://www.espial.com/products/evo_browser/';
-        $title = 'Espial TV Browser '.wpua_detect_browser_version('Escape');
+        $title = 'Espial TV Browser';
         $code = 'espialtvbrowser';
     }
@@ -460 +481 @@
     {
         $link = 'http://www.espial.com/products/evo_browser/';
-        $title = 'Espial TV Browser '.wpua_detect_browser_version('Espial');
+        $title = 'Espial TV Browser';
         $code = 'espialtvbrowser';
     }
@@ -466 +487 @@
     {
         $link = 'https://wiki.mozilla.org/Fennec';
-        $title = wpua_detect_browser_version('Fennec');
+        $title = 'Fennec';
         $code = 'fennec';
     }
@@ -472 +493 @@
     {
         $link = 'http://seb.mozdev.org/firebird/';
-        $title = wpua_detect_browser_version('Firebird');
+        $title = 'Firebird';
         $code = 'firebird';
     }
@@ -478 +499 @@
     {
         $link = 'http://www.arsslensoft.tk/?q=node/7';
-        $title = wpua_detect_browser_version('Fireweb Navigator');
+        $title = 'Fireweb Navigator';
         $code = 'firewebnavigator';
     }
@@ -484 +505 @@
     {
         $link = 'http://www.flock.com/';
-        $title = wpua_detect_browser_version('Flock');
+        $title = 'Flock';
         $code = 'flock';
     }
@@ -490 +511 @@
     {
         $link = 'http://www.fluidapp.com/';
-        $title = wpua_detect_browser_version('Fluid');
+        $title = 'Fluid';
         $code = 'fluid';
     }
@@ -497 +518 @@
     {
         $link = 'http://www.traos.org/';
-        $title = wpua_detect_browser_version('Galaxy');
+        $title = 'Galaxy';
         $code = 'galaxy';
     }
@@ -503 +524 @@
     {
         $link = 'http://galeon.sourceforge.net/';
-        $title = wpua_detect_browser_version('Galeon');
+        $title = 'Galeon';
         $code = 'galeon';
     }
@@ -509 +530 @@
     {
         $link = 'http://www.globalmojo.com/';
-        $title = wpua_detect_browser_version('GlobalMojo');
+        $title = 'GlobalMojo';
         $code = 'globalmojo';
     }
@@ -515 +536 @@
     {
         $link = 'http://www.gobrowser.cn/';
-        $title = 'GO '.wpua_detect_browser_version('Browser');
+        $title = 'GO Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'gobrowser';
     }
@@ -522 +544 @@
         $link = 'http://google.com/gwt/n';
         $title = 'Google Wireless Transcoder';
+        $version = '';
         $code = 'google';
     }
@@ -527 +550 @@
     {
         $link = 'http://gosurfbrowser.com/?ln=en';
-        $title = wpua_detect_browser_version('GoSurf');
+        $title = 'GoSurf';
         $code = 'gosurf';
     }
@@ -533 +556 @@
     {
         $link = 'http://www.mozilla.org/';
-        $title = wpua_detect_browser_version('GranParadiso');
+        $title = 'GranParadiso';
         $code = 'firefoxdevpre';
     }
@@ -539 +562 @@
     {
         $link = 'http://www.morequick.com/';
-        $title = wpua_detect_browser_version('GreenBrowser');
+        $title = 'GreenBrowser';
         $code = 'greenbrowser';
     }
@@ -546 +569 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Google_Search#Mobile_app';
-        $title = wpua_detect_browser_version('GSA');
+        $title = 'Google Search App';
+        $version = wpua_detect_browser_version('GSA');
         $code = 'google';
     }
@@ -552 +576 @@
     {
         $link = 'http://www.alloutsoftware.com/';
-        $title = wpua_detect_browser_version('Hana');
+        $title = 'Hana';
         $code = 'hana';
     }
@@ -558 +582 @@
     {
         $link = 'http://java.sun.com/products/archive/hotjava/';
-        $title = wpua_detect_browser_version('HotJava');
+        $title = 'HotJava';
         $code = 'hotjava';
     }
@@ -564 +588 @@
     {
         $link = 'http://tkhtml.tcl.tk/hv3.html';
-        $title = wpua_detect_browser_version('Hv3');
+        $title = 'Hv3';
         $code = 'hv3';
     }
@@ -571 +595 @@
         $link = 'http://www.hydrabrowser.com/';
         $title = 'Hydra Browser';
+        $version = '';
         $code = 'hydrabrowser';
     }
@@ -576 +601 @@
     {
         $link = 'http://www.torchmobile.com/';
-        $title = wpua_detect_browser_version('Iris');
+        $title = 'Iris';
         $code = 'iris';
     }
@@ -582 +607 @@
     {
         $link = 'http://www.networking.ibm.com/WebExplorer/';
-        $title = 'IBM '.wpua_detect_browser_version('WebExplorer');
+        $title = 'IBM WebExplorer';
+        $version = wpua_detect_browser_version('WebExplorer');
         $code = 'ibmwebexplorer';
     }
@@ -588 +614 @@
     {
         $link = 'http://www.ibrowse-dev.net/';
-        $title = wpua_detect_browser_version('IBrowse');
+        $title = 'IBrowse';
         $code = 'ibrowse';
     }
@@ -594 +620 @@
     {
         $link = 'http://www.icab.de/';
-        $title = wpua_detect_browser_version('iCab');
+        $title = 'iCab';
         $code = 'icab';
     }
@@ -600 +626 @@
     {
         $link = 'http://www.icesoft.com/products/icebrowser.html';
-        $title = wpua_detect_browser_version('Ice Browser');
+        $title = 'Ice Browser';
         $code = 'icebrowser';
     }
@@ -606 +632 @@
     {
         $link = 'http://packages.debian.org/iceape';
-        $title = wpua_detect_browser_version('Iceape');
+        $title = 'Iceape';
         $code = 'iceape';
     }
@@ -612 +638 @@
     {
         $link = 'http://gnuzilla.gnu.org/';
-        $title = 'GNU '.wpua_detect_browser_version('IceCat');
+        $title = 'GNU IceCat';
+        $version = wpua_detect_browser_version('IceCat');
         $code = 'icecat';
     }
@@ -618 +645 @@
     {
         $link = 'http://www.comodo.com/home/browsers-toolbars/icedragon-browser.php';
-        $title = wpua_detect_browser_version('IceDragon');
+        $title = 'IceDragon';
         $code = 'icedragon';
     }
@@ -624 +651 @@
     {
         $link = 'http://www.geticeweasel.org/';
-        $title = wpua_detect_browser_version('IceWeasel');
+        $title = 'IceWeasel';
         $code = 'iceweasel';
     }
@@ -630 +657 @@
     {
         $link = 'http://www.microsoft.com/windowsmobile/en-us/downloads/microsoft/internet-explorer-mobile.mspx';
-        $title = wpua_detect_browser_version('IEMobile');
+        $title = 'IEMobile';
         $code = 'msie-mobile';
     }
@@ -636 +663 @@
     {
         $link = 'http://alexanderjbeston.wordpress.com/';
-        $title = 'iNet '.wpua_detect_browser_version('Browser');
+        $title = 'iNet Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'null';
     }
@@ -642 +670 @@
     {
         $link = 'http://en.wikipedia.org/wiki/IRider';
-        $title = wpua_detect_browser_version('iRider');
+        $title = 'iRider';
         $code = 'irider';
     }
@@ -648 +676 @@
     {
         $link = 'http://www.srware.net/en/software_srware_iron.php';
-        $title = wpua_detect_browser_version('Iron');
+        $title = 'Iron';
         $code = 'iron';
     }
@@ -654 +682 @@
     {
         $link = 'http://inetsurfboard.sourceforge.net/';
-        $title = wpua_detect_browser_version('InternetSurfboard');
+        $title = 'InternetSurfboard';
         $code = 'internetsurfboard';
     }
@@ -660 +688 @@
     {
         $link = 'http://www.samsungmobile.com/';
-        $title = wpua_detect_browser_version('Jasmine');
+        $title = 'Jasmine';
         $code = 'samsung';
     }
@@ -666 +694 @@
     {
         $link = 'http://kmeleon.sourceforge.net/';
-        $title = wpua_detect_browser_version('K-Meleon');
+        $title = 'K-Meleon';
         $code = 'kmeleon';
     }
@@ -672 +700 @@
     {
         $link = 'http://k-ninja-samurai.en.softonic.com/';
-        $title = wpua_detect_browser_version('K-Ninja');
+        $title = 'K-Ninja';
         $code = 'kninja';
     }
@@ -678 +706 @@
     {
         $link = 'http://ufoxlab.googlepages.com/cooperation';
-        $title = wpua_detect_browser_version('Kapiko');
+        $title = 'Kapiko';
         $code = 'kapiko';
     }
@@ -684 +712 @@
     {
         $link = 'http://kazehakase.sourceforge.jp/';
-        $title = wpua_detect_browser_version('Kazehakase');
+        $title = 'Kazehakase';
         $code = 'kazehakase';
     }
@@ -690 +718 @@
     {
         $link = 'http://www.kinza.jp/';
-        $title = wpua_detect_browser_version('Kinza');
+        $title = 'Kinza';
         $code = 'kinza';
     }
@@ -696 +724 @@
     {
         $link = 'http://www.kirix.com/';
-        $title = 'Kirix '.wpua_detect_browser_version('Strata');
+        $title = 'Kirix Strata';
+        $version = wpua_detect_browser_version('Strata');
         $code = 'kirix-strata';
     }
@@ -702 +731 @@
     {
         $link = 'http://www.kkman.com.tw/';
-        $title = wpua_detect_browser_version('KKman');
+        $title = 'KKman';
         $code = 'kkman';
     }
@@ -708 +737 @@
     {
         $link = 'http://kontact.kde.org/kmail/';
-        $title = wpua_detect_browser_version('KMail');
+        $title = 'KMail';
         $code = 'kmail';
     }
@@ -714 +743 @@
     {
         $link = 'http://en.wikipedia.org/wiki/K-Meleon';
-        $title = wpua_detect_browser_version('KMLite');
+        $title = 'KMLite';
         $code = 'kmeleon';
     }
@@ -720 +749 @@
     {
         $link = 'http://konqueror.kde.org/';
-        $title = wpua_detect_browser_version('Konqueror');
+        $title = 'Konqueror';
         $code = 'konqueror';
     }
@@ -726 +755 @@
     {
         $link = 'http://kylo.tv/';
-        $title = wpua_detect_browser_version('Kylo');
+        $title = 'Kylo';
         $code = 'kylo';
     }
@@ -732 +761 @@
     {
         $link = 'http://wiki.freespire.org/index.php/Web_Browser';
-        $title = wpua_detect_browser_version('LBrowser');
+        $title = 'LBrowser';
         $code = 'lbrowser';
     }
@@ -738 +767 @@
     {
         $link = 'http://developer.lgappstv.com/TV_HELP/index.jsp?topic=%2Flge.tvsdk.developing.book%2Fhtml%2FDeveloping+Web+App%2FDeveloping+Web+App%2FWeb+Engine.htm';
-        $title = 'LG Web '.wpua_detect_browser_version('Browser');
+        $title = 'LG Web Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'lgbrowser';
     }
@@ -745 +775 @@
         $link = 'http://leechcraft.org/';
         $title = 'LeechCraft';
+        $version = '';
         $code = 'null';
     }
@@ -751 +782 @@
     {
         $link = 'http://links.sourceforge.net/';
-        $title = wpua_detect_browser_version('Links');
+        $version = wpua_detect_browser_version('Links \\(');
+        $title = 'Links';
         $code = 'links';
     }
@@ -757 +789 @@
     {
         $link = 'http://www.lobobrowser.org/';
-        $title = wpua_detect_browser_version('Lobo');
+        $title = 'Lobo';
         $code = 'lobo';
     }
@@ -763 +795 @@
     {
         $link = 'http://www.lolifox.com/';
-        $title = wpua_detect_browser_version('lolifox');
+        $title = 'lolifox';
         $code = 'lolifox';
     }
@@ -769 +801 @@
     {
         $link = 'http://news.softpedia.com/news/Firefox-Codenamed-Lorentz-Drops-in-March-2010-130855.shtml';
-        $title = wpua_detect_browser_version('Lorentz');
+        $title = 'Lorentz';
         $code = 'firefoxdevpre';
     }
@@ -776 +808 @@
         $link = 'http://luakit.org/';
         $title = 'luakit';
+        $version = '';
         $code = 'luakit';
     }
@@ -781 +814 @@
     {
         $link = 'http://www.lunascape.tv';
-        $title = wpua_detect_browser_version('Lunascape');
+        $title = 'Lunascape';
         $code = 'lunascape';
     }
@@ -787 +820 @@
     {
         $link = 'http://lynx.browser.org/';
-        $title = wpua_detect_browser_version('Lynx');
+        $title = 'Lynx';
         $code = 'lynx';
     }
@@ -793 +826 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Madfox';
-        $title = wpua_detect_browser_version('Madfox');
+        $title = 'Madfox';
         $code = 'madfox';
     }
@@ -799 +832 @@
     {
         $link = 'http://maemo.nokia.com/features/maemo-browser/';
-        $title = wpua_detect_browser_version('Maemo Browser');
+        $title = 'Maemo Browser';
         $code = 'maemo';
     }
@@ -805 +838 @@
     {
         $link = 'http://www.maxthon.com/';
-        $title = wpua_detect_browser_version('Maxthon');
+        $title = 'Maxthon';
         $code = 'maxthon';
     }
@@ -811 +844 @@
     {
         $link = 'http://www.motorola.com/content.jsp?globalObjectId=1827-4343';
-        $title = wpua_detect_browser_version('MIB');
+        $title = 'MIB';
         $code = 'mib';
     }
@@ -817 +850 @@
     {
         $link = 'http://browser.garage.maemo.org/';
-        $title = wpua_detect_browser_version('Tablet browser');
+        $title = 'MicroB';
+        $version = wpua_detect_browser_version('Tablet browser');
         $code = 'microb';
     }
@@ -823 +857 @@
     {
         $link = 'http://www.twotoasts.de/index.php?/pages/midori_summary.html';
-        $title = wpua_detect_browser_version('Midori');
+        $title = 'Midori';
         $code = 'midori';
     }
@@ -829 +863 @@
     {
         $link = 'http://www.mozilla.org/projects/minefield/';
-        $title = wpua_detect_browser_version('Minefield');
+        $title = 'Minefield';
         $code = 'minefield';
     }
@@ -835 +869 @@
     {
         $link = 'http://dmkho.tripod.com/';
-        $title = wpua_detect_browser_version('MiniBrowser');
+        $title = 'MiniBrowser';
         $code = 'minibrowser';
     }
@@ -841 +875 @@
     {
         $link = 'http://www-archive.mozilla.org/projects/minimo/';
-        $title = wpua_detect_browser_version('Minimo');
+        $title = 'Minimo';
         $code = 'minimo';
     }
@@ -847 +881 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Mosaic_(web_browser)';
-        $title = wpua_detect_browser_version('Mosaic');
+        $title = 'Mosaic';
         $code = 'mosaic';
     }
@@ -853 +887 @@
     {
         $link = 'http://www.mozilla.org/projects/devpreview/releasenotes/';
-        $title = wpua_detect_browser_version('MozillaDeveloperPreview');
+        $title = 'Mozilla Developer Preview';
+        $version = wpua_detect_browser_version('MozillaDeveloperPreview');
         $code = 'firefoxdevpre';
     }
@@ -860 +895 @@
         $link = 'http://browser.qq.com/';
         $title = 'QQbrowser';
+        $version = '';
         $code = 'qqbrowser';
     }
@@ -865 +901 @@
     {
         $link = 'http://www.multibrowser.de/';
-        $title = wpua_detect_browser_version('Multi-Browser');
+        $title = 'Multi-Browser XP';
+        $version = wpua_detect_browser_version('Multi-Browser');
         $code = 'multi-browserxp';
     }
@@ -871 +908 @@
     {
         $link = 'http://multizilla.mozdev.org/';
-        $title = wpua_detect_browser_version('MultiZilla');
+        $title = 'MultiZilla';
         $code = 'mozilla';
     }
@@ -877 +914 @@
     {
         $link = 'http://usa.maxthon.com/mxnitro/';
-        $title = wpua_detect_browser_version('MxNitro');
+        $title = 'MxNitro';
         $code = 'mxnitro';
     }
@@ -884 +921 @@
     {
         $link = 'http://myinternetbrowser.webove-stranky.org/';
-        $title = wpua_detect_browser_version('myibrow');
+        $title = 'myibrow';
         $code = 'my-internet-browser';
     }
@@ -890 +927 @@
     {
         $link = 'http://www.myie2.com/';
-        $title = wpua_detect_browser_version('MyIE2');
+        $title = 'MyIE2';
         $code = 'myie2';
     }
@@ -896 +933 @@
     {
         $link = 'https://wiki.mozilla.org/Firefox/Namoroka';
-        $title = wpua_detect_browser_version('Namoroka');
+        $title = 'Namoroka';
         $code = 'firefoxdevpre';
     }
@@ -902 +939 @@
     {
         $link = 'http://netscape.aol.com/';
-        $title = 'Netscape '.wpua_detect_browser_version('Navigator');
+        $title = 'Netscape Navigator';
+        $version = wpua_detect_browser_version('Navigator');
         $code = 'netscape';
     }
@@ -908 +946 @@
     {
         $link = 'http://www.netgem.com/';
-        $title = wpua_detect_browser_version('NetBox');
+        $title = 'NetBox';
         $code = 'netbox';
     }
@@ -914 +952 @@
     {
         $link = 'http://www.netcaptor.com/';
-        $title = wpua_detect_browser_version('NetCaptor');
+        $title = 'NetCaptor';
         $code = 'netcaptor';
     }
@@ -920 +958 @@
     {
         $link = 'http://gl.access-company.com/files/legacy/products/nflife/app_browser2.html';
-        $title = wpua_detect_browser_version('NetFrontLifeBrowser');
+        $title = 'NetFront Life';
+        $version = wpua_detect_browser_version('NetFrontLifeBrowser');
         $code = 'netfrontlife';
     }
@@ -926 +965 @@
     {
         $link = 'http://www.access-company.com/';
-        $title = wpua_detect_browser_version('NetFront');
+        $title = 'NetFront';
         $code = 'netfront';
     }
@@ -932 +971 @@
     {
         $link = 'http://www.newsgator.com/individuals/netnewswire/';
-        $title = wpua_detect_browser_version('NetNewsWire');
+        $title = 'NetNewsWire';
         $code = 'netnewswire';
     }
@@ -938 +977 @@
     {
         $link = 'http://en.wikipedia.org/wiki/NetPositive';
-        $title = wpua_detect_browser_version('NetPositive');
+        $title = 'NetPositive';
         $code = 'netpositive';
     }
@@ -944 +983 @@
     {
         $link = 'http://netscape.aol.com/';
-        $title = wpua_detect_browser_version('Netscape');
+        $title = 'Netscape';
         $code = 'netscape';
     }
@@ -950 +989 @@
     {
         $link = 'http://www.netsurf-browser.org/';
-        $title = wpua_detect_browser_version('NetSurf');
+        $title = 'NetSurf';
         $code = 'netsurf';
     }
@@ -956 +995 @@
     {
         $link = 'http://www.access-company.com/';
-        $title = wpua_detect_browser_version('NF-Browser');
+        $title = 'NetFront';
+        $version = wpua_detect_browser_version('NF-Browser');
         $code = 'netfront';
     }
@@ -962 +1002 @@
     {
         $link = 'http://ninesky.com/';
-        $title = wpua_detect_browser_version('Ninesky-android-mobile');
+        $title = 'Ninesky';
+        $version = wpua_detect_browser_version('Ninesky-android-mobile');
         $code = 'ninesky';
     }
@@ -969 +1010 @@
         $link = 'http://en.wikipedia.org/wiki/Internet_Browser_(Nintendo_3DS)';
         $title = 'Nintendo 3DS';
+        $version = '';
         $code = 'nintendo3dsbrowser';
     }
@@ -974 +1016 @@
     {
         $link = 'http://www.netsurf-browser.org/';
-        $title = 'Nintendo '.wpua_detect_browser_version('Browser');
+        $title = 'Nintendo Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'nintendobrowser';
     }
@@ -980 +1023 @@
     {
         $link = 'http://browser.nokia.com/';
-        $title = 'Nokia '.wpua_detect_browser_version('Browser');
+        $title = 'Nokia Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'nokia';
     }
@@ -986 +1030 @@
     {
         $link = 'http://www.novarra.com/';
-        $title = 'Novarra '.wpua_detect_browser_version('Vision');
+        $title = 'Novarra Vision';
+        $version = wpua_detect_browser_version('Vision');
         $code = 'novarra';
     }
@@ -992 +1037 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Obigo_Browser';
-        $title = wpua_detect_browser_version('Obigo');
+        $title = 'Obigo';
         $code = 'obigo';
     }
@@ -999 +1044 @@
         $link = 'http://www.offbyone.com/';
         $title = 'Off By One';
+        $version = '';
         $code = 'offbyone';
     }
@@ -1004 +1050 @@
     {
         $link = 'http://www.omnigroup.com/applications/omniweb/';
-        $title = wpua_detect_browser_version('OmniWeb');
+        $title = 'OmniWeb';
         $code = 'omniweb';
     }
@@ -1010 +1056 @@
     {
         $link = 'http://one-browser.com/';
-        $title = wpua_detect_browser_version('OneBrowser');
+        $title = 'OneBrowser';
         $code = 'onebrowser';
     }
@@ -1016 +1062 @@
     {
         $link = 'http://www.opera.com/mini/';
-        $title = wpua_detect_browser_version('Opera Mini');
+        $title = 'Opera Mini';
         $code = 'opera-2';
     }
@@ -1022 +1068 @@
     {
         $link = 'http://www.opera.com/mobile/';
-        $title = wpua_detect_browser_version('Opera Mobi');
+        if (preg_match('/Version/i', $useragent))
+        {
+            $version = wpua_detect_browser_version('Version');
+        }
+        else
+        {
+            $version = wpua_detect_browser_version('Opera Mobi');
+        }
+        $title = 'Opera Mobile';
         $code = 'opera-2';
     }
-    elseif (preg_match('/Opera Labs/i', $useragent)
-        || (preg_match('/Opera/i', $useragent)
-            && preg_match('/Edition Labs/i', $useragent)))
-    {
-        $link = 'http://labs.opera.com/';
-        $title = wpua_detect_browser_version('Opera Labs');
-        $code = 'opera-next';
-    }
-    elseif (preg_match('/Opera Next/i', $useragent)
-        || (preg_match('/Opera/i', $useragent)
-            && preg_match('/Edition Next/i', $useragent)))
-    {
-        $link = 'http://www.opera.com/support/kb/view/991/';
-        $title = wpua_detect_browser_version('Opera Next');
-        $code = 'opera-next';
-    }
-    elseif (preg_match('/Opera/i', $useragent))
+    elseif (preg_match('/Opera/i', $useragent)
+        || preg_match('/OPR/i', $useragent))
     {
         $link = 'http://www.opera.com/';
-        $title = wpua_detect_browser_version('Opera');
+        $title = 'Opera';
         $code = 'opera-1';
+
+        // How is version stored on this Opera ua?
         if (preg_match('/Version/i', $useragent))
+        {
             $code = 'opera-2';
-    }
-    elseif (preg_match('/OPR/i', $useragent))
-    {
-        $link = 'http://www.opera.com/';
-        if (preg_match('/(Edition Next)/i', $useragent))
-        {
-            $title = wpua_detect_browser_version('Opera Next');
-            $code = 'opera-next';
-        }
-        elseif (preg_match('/(Edition Developer)/i', $useragent))
-        {
-            $title = wpua_detect_browser_version('Opera Developer');
-            $code = 'opera-developer';
+            $version = wpua_detect_browser_version('Version');
+        }
+        elseif (preg_match('/OPR/i', $useragent))
+        {
+            $code = 'opera-2';
+            $version = wpua_detect_browser_version('OPR');
         }
         else
         {
-            $title = wpua_detect_browser_version('Opera');
-            $code = 'opera-1';
+            // Use Opera as fallback since full title may change (Next, Developer, etc.)
+            $version = wpua_detect_browser_version('Opera');
+        }
+
+        // Is this one with a known alternate icon?
+        if (preg_match('/Opera Labs/i', $useragent)
+            || preg_match('/Edition Labs/i', $useragent))
+        {
+            $code = 'opera-2-next';
+        }
+        elseif (preg_match('/Opera Next/i', $useragent)
+            || preg_match('/Edition Next/i', $useragent))
+        {
+            $code = 'opera-2-next';
+        }
+        elseif (preg_match('/Opera Developer/i', $useragent)
+            || preg_match('/Edition Developer/i', $useragent))
+        {
+            $code = 'opera-2-developer';
+        }
+
+        // Parse full edition name, ex: Opera/9.80 (X11; Linux x86_64; U; Edition Labs Camera and Pages; Ubuntu/11.10; en) Presto/2.9.220 Version/12.00
+        if (preg_match('/Edition ([\ ._0-9a-zA-Z]+)/i', $useragent, $regmatch))
+        {
+            $title .= ' '.$regmatch[1];
+        }
+        elseif (preg_match('/Opera ([\ ._0-9a-zA-Z]+)/i', $useragent, $regmatch))
+        {
+            $title .= ' '.$regmatch[1];
+        }
+
+        // Use the newest icon?
+        if (isset($version) && intval($version) > 13)
+        {
+            $code = 'opera-3';
         }
     }
@@ -1071 +1139 @@
     {
         $link = 'http://www.orcabrowser.com/';
-        $title = wpua_detect_browser_version('Orca');
+        $title = 'Orca';
         $code = 'orca';
     }
@@ -1077 +1145 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Oregano_(web_browser)';
-        $title = wpua_detect_browser_version('Oregano');
+        $title = 'Oregano';
         $code = 'oregano';
     }
@@ -1084 +1152 @@
         $link = 'http://www.sand-labs.org/owb';
         $title = 'Oregano Web Browser';
+        $version = '';
         $code = 'owb';
     }
@@ -1089 +1158 @@
     {
         $link = 'http://gtk-webcore.sourceforge.net/';
-        $title = wpua_detect_browser_version('osb-browser');
+        $version = wpua_detect_browser_version('osb-browser');
+        $title = 'Gtk+ WebCore';
         $code = 'null';
     }
@@ -1095 +1165 @@
     {
         $link = 'http://otter-browser.org/';
-        $title = wpua_detect_browser_version('Otter');
+        $title = 'Otter';
         $code = 'otter';
     }
@@ -1101 +1171 @@
     {
         $link = 'http://www.palm.com/us/products/phones/pre/index.html';
-        $title = 'Palm '.wpua_detect_browser_version('Pre');
+        if (preg_match('/Version/i', $useragent))
+        {
+            $version = wpua_detect_browser_version('Version');
+        }
+        else
+        {
+            $version = wpua_detect_browser_version('Pre');
+        }
+        $title = 'Palm';
         $code = 'palmpre';
     }
@@ -1107 +1185 @@
     {
         $link = 'http://www.hpwebos.com/us/support/handbooks/tungstent/webbrowser_hb.pdf';
-        $title = 'Palm '.wpua_detect_browser_version('WebPro');
+        $title = 'Palm WebPro';
+        $version = wpua_detect_browser_version('WebPro');
         $code = 'palmwebpro';
     }
@@ -1113 +1192 @@
     {
         $link = 'http://www.palemoon.org/';
-        $title = 'Pale '.wpua_detect_browser_version('Moon');
+        $title = 'Pale Moon';
+        $version = wpua_detect_browser_version('Moon');
         $code = 'palemoon';
     }
@@ -1119 +1199 @@
     {
         $link = 'http://madgroup.x10.mx/patriott1.php';
-        $title = 'Patriott '.wpua_detect_browser_version('Browser');
+        $title = 'Patriott Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'patriott';
     }
@@ -1125 +1206 @@
     {
         $link = 'http://www.perk.com/';
-        $title = wpua_detect_browser_version('Perk');
+        $title = 'Perk';
         $code = 'perk';
     }
@@ -1132 +1213 @@
         $link = 'http://www.phaseout.net/';
         $title = 'Phaseout';
+        $version = '';
         $code = 'phaseout';
     }
@@ -1137 +1219 @@
     {
         $link = 'http://www.mozilla.org/projects/phoenix/phoenix-release-notes.html';
-        $title = wpua_detect_browser_version('Phoenix');
+        $title = 'Phoenix';
         $code = 'phoenix';
     }
@@ -1144 +1226 @@
         $link = 'http://us.playstation.com/';
         $title = 'PS4 Web Browser';
+        $version = '';
         $code = 'webkit';
     }
@@ -1149 +1232 @@
     {
         $link = 'http://www.podkicker.com/';
-        $title = wpua_detect_browser_version('Podkicker');
+        $title = 'Podkicker';
         $code = 'podkicker';
     }
@@ -1155 +1238 @@
     {
         $link = 'http://www.podkicker.com/';
-        $title = wpua_detect_browser_version('Podkicker Pro');
+        $title = 'Podkicker Pro';
         $code = 'podkicker';
     }
@@ -1161 +1244 @@
     {
         $link = 'http://en.wikipedia.org/wiki/AT%26T_Pogo';
-        $title = wpua_detect_browser_version('Pogo');
+        $title = 'Pogo';
         $code = 'pogo';
     }
@@ -1167 +1250 @@
     {
         $link = 'http://www.infraware.co.kr/eng/01_product/product02.asp';
-        $title = wpua_detect_browser_version('Polaris');
+        $title = 'Polaris';
         $code = 'polaris';
     }
@@ -1173 +1256 @@
     {
         $link = 'http://polarityweb.webs.com/';
-        $title = wpua_detect_browser_version('Polarity');
+        $title = 'Polarity';
         $code = 'polarity';
     }
@@ -1179 +1262 @@
     {
         $link = 'http://prism.mozillalabs.com/';
-        $title = wpua_detect_browser_version('Prism');
+        $title = 'Prism';
         $code = 'prism';
     }
@@ -1185 +1268 @@
     {
         $link = 'http://www.puffinbrowser.com/';
-        $title = wpua_detect_browser_version('Puffin');
+        $title = 'Puffin';
         $code = 'puffin';
     }
@@ -1191 +1274 @@
     {
         $link = 'http://www.qtweb.net/';
-        $title = 'QtWeb Internet '.wpua_detect_browser_version('Browser');
+        $title = 'QtWeb Internet Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'qtwebinternetbrowser';
     }
@@ -1197 +1281 @@
     {
         $link = 'http://www.qupzilla.com/';
-        $title = wpua_detect_browser_version('QupZilla');
+        $title = 'QupZilla';
         $code = 'qupzilla';
     }
@@ -1203 +1287 @@
     {
         $link = 'http://soft.rambler.ru/browser/';
-        $title = wpua_detect_browser_version('Nichrome\/self');
+        $version = wpua_detect_browser_version('Nichrome\/self');
+        $title = 'Rambler browser';
         $code = 'ramblerbrowser';
     }
@@ -1210 +1295 @@
         $link = 'http://rekonq.sourceforge.net/';
         $title = 'rekonq';
+        $version = '';
         $code = 'rekonq';
     }
@@ -1215 +1301 @@
     {
         $link = 'http://retawq.sourceforge.net/';
-        $title = wpua_detect_browser_version('retawq');
+        $title = 'retawq';
         $code = 'terminal';
     }
@@ -1221 +1307 @@
     {
         $link = 'http://www.runecats.com/roccat.html';
-        $title = wpua_detect_browser_version('Roccat');
+        $title = 'Roccat';
         $code = 'roccatbrowser';
     }
@@ -1227 +1313 @@
     {
         $link = 'http://www.rockmelt.com/';
-        $title = wpua_detect_browser_version('RockMelt');
+        $title = 'RockMelt';
         $code = 'rockmelt';
     }
@@ -1233 +1319 @@
     {
         $link = 'http://sourceforge.net/projects/ryouko/';
-        $title = wpua_detect_browser_version('Ryouko');
+        $title = 'Ryouko';
         $code = 'ryouko';
     }
@@ -1240 +1326 @@
         $link = 'http://www.saayaa.com/';
         $title = 'SaaYaa Explorer';
+        $version = '';
         $code = 'saayaa';
     }
@@ -1245 +1332 @@
     {
         $link = 'http://www.seamonkey-project.org/';
-        $title = wpua_detect_browser_version('SeaMonkey');
+        $title = 'SeaMonkey';
         $code = 'seamonkey';
     }
@@ -1251 +1338 @@
     {
         $link = 'http://www.sonyericsson.com/';
-        $title = wpua_detect_browser_version('SEMC-Browser');
+        $title = 'SEMC Browser';
+        $version = wpua_detect_browser_version('SEMC-Browser');
         $code = 'semcbrowser';
     }
@@ -1257 +1345 @@
     {
         $link = 'http://www.sonyericsson.com/';
-        $title = wpua_detect_browser_version('SEMC-java');
+        $title = 'SEMC-java';
         $code = 'semcbrowser';
     }
@@ -1264 +1352 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Web_Browser_for_S60';
-        $title = 'Nokia '.wpua_detect_browser_version('Series60');
+        $title = 'Nokia Series60';
+        $version = wpua_detect_browser_version('Series60');
         $code = 's60';
     }
@@ -1271 +1360 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Web_Browser_for_S60';
-        $title = 'Nokia '.wpua_detect_browser_version('S60');
+        $title = 'Nokia S60';
+        $version = wpua_detect_browser_version('S60');
         $code = 's60';
     }
@@ -1279 +1369 @@
         $link = 'http://ie.sogou.com/';
         $title = 'Sogou Explorer';
+        $version = '';
         $code = 'sogou';
     }
@@ -1284 +1375 @@
     {
         $link = 'http://www.seznam.cz/prohlizec';
-        $title = 'Seznam.'.wpua_detect_browser_version('cz');
+        $title = 'Seznam.cz';
+        $version = wpua_detect_browser_version('cz');
         $code = 'seznam-cz';
     }
@@ -1290 +1382 @@
     {
         $link = 'http://www.shiira.jp/en.php';
-        $title = wpua_detect_browser_version('Shiira');
+        $title = 'Shiira';
         $code = 'shiira';
     }
@@ -1296 +1388 @@
     {
         $link = 'http://www.mozilla.org/';
-        $title = wpua_detect_browser_version('Shiretoko');
+        $title = 'Shiretoko';
         $code = 'firefoxdevpre';
     }
@@ -1303 +1395 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Amazon_Silk';
-        $title = 'Amazon '.wpua_detect_browser_version('Silk');
+        $title = 'Amazon Silk';
+        $version = wpua_detect_browser_version('Silk');
         $code = 'silk';
     }
@@ -1309 +1402 @@
     {
         $link = 'http://www.sitekiosk.com/SiteKiosk/Default.aspx';
-        $title = wpua_detect_browser_version('SiteKiosk');
+        $title = 'SiteKiosk';
         $code = 'sitekiosk';
     }
@@ -1315 +1408 @@
     {
         $link = 'http://www.muhri.net/skipstone/';
-        $title = wpua_detect_browser_version('SkipStone');
+        $title = 'SkipStone';
         $code = 'skipstone';
     }
@@ -1321 +1414 @@
     {
         $link = 'http://www.skyfire.com/';
-        $title = wpua_detect_browser_version('Skyfire');
+        $title = 'Skyfire';
         $code = 'skyfire';
     }
@@ -1327 +1420 @@
     {
         $link = 'http://www.fenrir-inc.com/other/sleipnir/';
-        $title = wpua_detect_browser_version('Sleipnir');
+        $title = 'Sleipnir';
         $code = 'sleipnir';
     }
@@ -1333 +1426 @@
     {
         $link = 'http://slimboat.com/';
-        $title = wpua_detect_browser_version('SlimBoat');
+        $title = 'SlimBoat';
         $code = 'slimboat';
     }
@@ -1339 +1432 @@
     {
         $link = 'http://www.flashpeak.com/sbrowser/';
-        $title = wpua_detect_browser_version('SlimBrowser');
+        $title = 'SlimBrowser';
         $code = 'slimbrowser';
     }
@@ -1345 +1438 @@
     {
         $link = 'http://www.freethetvchallenge.com/details/faq';
-        $title = wpua_detect_browser_version('SmartTV');
+        $title = 'Maple Browser';
+        $version = wpua_detect_browser_version('WebBrowser');
         $code = 'maplebrowser';
     }
@@ -1351 +1445 @@
     {
         $link = 'http://www.getsongbird.com/';
-        $title = wpua_detect_browser_version('Songbird');
+        $title = 'Songbird';
         $code = 'songbird';
     }
@@ -1357 +1451 @@
     {
         $link = 'http://www.stainlessapp.com/';
-        $title = wpua_detect_browser_version('Stainless');
+        $title = 'Stainless';
         $code = 'stainless';
     }
@@ -1363 +1457 @@
     {
         $link = 'http://itunes.apple.com/us/app/substream/id389906706?mt=8';
-        $title = wpua_detect_browser_version('SubStream');
+        $title = 'SubStream';
         $code = 'substream';
     }
@@ -1369 +1463 @@
     {
         $link = 'http://www.flock.com/';
-        $title = 'Flock '.wpua_detect_browser_version('Sulfur');
+        $title = 'Flock Sulfur';
+        $version = wpua_detect_browser_version('Sulfur');
         $code = 'flock';
     }
@@ -1375 +1470 @@
     {
         $link = 'http://digola.com/sundance.html';
-        $title = wpua_detect_browser_version('Sundance');
+        $title = 'Sundance';
         $code = 'sundance';
     }
@@ -1381 +1476 @@
     {
         $link = 'http://www.sundialbrowser.com/';
-        $title = wpua_detect_browser_version('Sundial');
+        $title = 'Sundial';
         $code = 'sundial';
     }
@@ -1387 +1482 @@
     {
         $link = 'http://www.sunrisebrowser.com/';
-        $title = wpua_detect_browser_version('Sunrise');
+        $title = 'Sunrise';
         $code = 'sunrise';
     }
@@ -1393 +1488 @@
     {
         $link = 'http://superbird.me/';
-        $title = wpua_detect_browser_version('Superbird');
+        $title = 'Superbird';
         $code = 'superbird';
     }
@@ -1399 +1494 @@
     {
         $link = 'http://surf.suckless.org/';
-        $title = wpua_detect_browser_version('Surf');
+        $title = 'Surf';
         $code = 'surf';
     }
@@ -1405 +1500 @@
     {
         $link = 'http://www.getswiftfox.com/';
-        $title = wpua_detect_browser_version('Swiftfox');
+        $title = 'Swiftfox';
         $code = 'swiftfox';
     }
@@ -1411 +1506 @@
     {
         $link = 'http://swiftweasel.tuxfamily.org/';
-        $title = wpua_detect_browser_version('Swiftweasel');
+        $title = 'Swiftweasel';
         $code = 'swiftweasel';
     }
@@ -1417 +1512 @@
     {
         $link = 'http://dombla.net/sylera/';
-        $title = wpua_detect_browser_version('Sylera');
+        $title = 'Sylera';
         $code = 'null';
     }
@@ -1424 +1519 @@
         $link = 'http://wiki.maemo.org/Tear';
         $title = 'Tear';
+        $version = '';
         $code = 'tear';
     }
@@ -1429 +1525 @@
     {
         $link = 'http://www.teashark.com/';
-        $title = wpua_detect_browser_version('TeaShark');
+        $title = 'TeaShark';
         $code = 'teashark';
     }
@@ -1435 +1531 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Obigo_Browser/';
-        $title = wpua_detect_browser_version(' Teleca');
+        $title = ' Teleca';
         $code = 'obigo';
     }
-    elseif (preg_match('/TencentTraveler/i', $useragent))
-    {
-        $link = 'http://www.tencent.com/en-us/index.shtml';
-        $title = 'Tencent '.wpua_detect_browser_version('Traveler');
-        $code = 'tencenttraveler';
-    }
     elseif (preg_match('/TenFourFox/i', $useragent))
     {
         $link = 'http://en.wikipedia.org/wiki/TenFourFox';
-        $title = wpua_detect_browser_version('TenFourFox');
+        $title = 'TenFourFox';
+        $version = wpua_detect_browser_version(' rv');
         $code = 'tenfourfox';
     }
@@ -1454 +1545 @@
         $link = 'http://www.teslamotors.com/';
         $title = 'Tesla Car Browser';
+        $version = '';
         $code = 'teslacarbrowser';
     }
@@ -1460 +1552 @@
         $link = 'http://www.ioage.com/';
         $title = 'TheWorld Browser';
+        $version = '';
         $code = 'theworld';
     }
@@ -1465 +1558 @@
     {
         $link = 'http://www.mozilla.com/thunderbird/';
-        $title = wpua_detect_browser_version('Thunderbird');
+        $title = 'Thunderbird';
         $code = 'thunderbird';
     }
@@ -1471 +1564 @@
     {
         $link = 'https://www.tizen.org/';
-        $title = wpua_detect_browser_version('Tizen');
+        $title = 'Tizen';
         $code = 'tizen';
     }
@@ -1477 +1570 @@
     {
         $link = 'http://www.tjusig.cz/';
-        $title = wpua_detect_browser_version('Tjusig');
+        $title = 'Tjusig';
         $code = 'tjusig';
     }
@@ -1483 +1576 @@
     {
         $link = 'http://tt.qq.com/';
-        $title = wpua_detect_browser_version('TencentTraveler');
+        $title = 'TT Explorer';
+        $version = wpua_detect_browser_version('TencentTraveler');
         $code = 'tt-explorer';
     }
@@ -1489 +1583 @@
     {
         $link = 'http://www.ubrowser.com/';
-        $title = wpua_detect_browser_version('uBrowser');
+        $title = 'uBrowser';
         $code = 'ubrowser';
     }
@@ -1497 +1591 @@
         $link = 'https://launchpad.net/webbrowser-app';
         $title = 'Ubuntu Web Browser';
+        $version = '';
         $code = 'ubuntuwebbrowser';
     }
@@ -1502 +1597 @@
     {
         $link = 'http://www.uc.cn/English/index.shtml';
-        $title = wpua_detect_browser_version('UC Browser');
+        $title = 'UC Browser';
+        $version = wpua_detect_browser_version('UC Browse');
         $code = 'ucbrowser';
     }
@@ -1508 +1604 @@
     {
         $link = 'http://www.ucweb.com/English/product.shtml';
-        $title = wpua_detect_browser_version('UCWEB');
+        $title = 'UC Browser';
+        $version = wpua_detect_browser_version('UCWEB');
         $code = 'ucweb';
     }
@@ -1514 +1611 @@
     {
         $link = 'http://www.ultrabrowser.com/';
-        $title = wpua_detect_browser_version('UltraBrowser');
+        $title = 'UltraBrowser';
         $code = 'ultrabrowser';
     }
@@ -1520 +1617 @@
     {
         $link = 'http://www.openwave.com/';
-        $title = wpua_detect_browser_version('UP.Browser');
+        $title = 'Openwave Mobile Browser';
+        $version = wpua_detect_browser_version('UP.Browser');
         $code = 'openwave';
     }
@@ -1526 +1624 @@
     {
         $link = 'http://www.openwave.com/';
-        $title = wpua_detect_browser_version('UP.Link');
+        $title = 'Openwave Mobile Browser';
+        $version = wpua_detect_browser_version('UP.Link');
         $code = 'openwave';
     }
@@ -1532 +1631 @@
     {
         $link = 'http://www.usejump.com/';
-        $title = wpua_detect_browser_version('Usejump');
+        $title = 'Usejump';
         $code = 'usejump';
     }
@@ -1538 +1637 @@
     {
         $link = 'http://en.wikipedia.org/wiki/UZard_Web';
-        $title = wpua_detect_browser_version('uZardWeb');
+        $title = 'uZardWeb';
         $code = 'uzardweb';
     }
@@ -1544 +1643 @@
     {
         $link = 'http://en.wikipedia.org/wiki/UZard_Web';
-        $title = wpua_detect_browser_version('uZard');
+        $title = 'uZard';
         $code = 'uzardweb';
     }
@@ -1556 +1655 @@
     {
         $link = 'http://vivaldi.com/';
-        $title = wpua_detect_browser_version('Vivaldi');
+        $title = 'Vivaldi';
         $code = 'vivaldi';
     }
@@ -1562 +1661 @@
     {
         $link = 'http://www.vimprobable.org/';
-        $title = wpua_detect_browser_version('Vimprobable');
+        $title = 'Vimprobable';
         $code = 'null';
     }
@@ -1568 +1667 @@
     {
         $link = 'http://zzo38computer.cjb.net/vonkeror/';
-        $title = wpua_detect_browser_version('Vonkeror');
+        $title = 'Vonkeror';
         $code = 'null';
     }
@@ -1574 +1673 @@
     {
         $link = 'http://w3m.sourceforge.net/';
-        $title = wpua_detect_browser_version('W3M');
+        $title = 'W3M';
         $code = 'w3m';
     }
@@ -1581 +1680 @@
     {
         $link = 'http://en.wikipedia.org/wiki/WebPositive';
-        $title = wpua_detect_browser_version('WebPositive');
+        $title = 'WebPositive';
         $code = 'webpositive';
     }
@@ -1589 +1688 @@
     {
         $link = 'http://developer.android.com/reference/android/webkit/package-summary.html';
-        $title = wpua_detect_browser_version('Android Webkit');
+        $title = 'Android Webkit';
+        $version = wpua_detect_browser_version('Version');
         $code = 'android-webkit';
     }
@@ -1595 +1695 @@
     {
         $link = 'http://www.waterfoxproject.org/';
-        $title = wpua_detect_browser_version('Waterfox');
+        $title = 'Waterfox';
         $code = 'waterfox';
     }
@@ -1601 +1701 @@
     {
         $link = 'http://webexplorerbrasil.com/';
-        $title = 'Web '.wpua_detect_browser_version('Explorer');
+        $title = 'Web Explorer';
+        $version = wpua_detect_browser_version('Explorer');
         $code = 'webexplorer';
     }
@@ -1607 +1708 @@
     {
         $link = 'http://webian.org/shell/';
-        $title = 'Webian '.wpua_detect_browser_version('Shell');
+        $title = 'Webian Shell';
+        $version = wpua_detect_browser_version('Shell');
         $code = 'webianshell';
     }
@@ -1614 +1716 @@
         $link = 'http://webrender.99k.org/';
         $title = 'Webrender';
+        $version = '';
         $code = 'webrender';
     }
@@ -1619 +1722 @@
     {
         $link = 'http://weltweitimnetz.de/software/Browser.en.page';
-        $title = 'Weltweitimnetz '.wpua_detect_browser_version('Browser');
+        $title = 'Weltweitimnetz Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'weltweitimnetzbrowser';
     }
@@ -1626 +1730 @@
         $link = 'http://www.app4mac.com/store/index.php?target=products&product_id=9';
         $title = 'wKiosk';
+        $version = '';
         $code = 'wkiosk';
     }
@@ -1631 +1736 @@
     {
         $link = 'http://www.w3.org/People/Berners-Lee/WorldWideWeb.html';
-        $title = wpua_detect_browser_version('WorldWideWeb');
+        $title = 'WorldWideWeb';
         $code = 'worldwideweb';
     }
@@ -1638 +1743 @@
     {
         $link = 'http://www.hp.com/';
-        $title = 'w'.wpua_detect_browser_version('OSBrowser');
+        $title = 'wOSBrowser';
+        $version = wpua_detect_browser_version('OSBrowser');
         $code = 'webos';
     }
@@ -1644 +1750 @@
     {
         $link = 'http://android.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-android');
+        $version = wpua_detect_browser_version('wp-android'); //TODO check into Android version being returned
+        $title = 'Wordpress App';
         $code = 'wordpress';
     }
@@ -1650 +1757 @@
     {
         $link = 'http://blackberry.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-blackberry');
+        $title = 'wp-blackberry';
         $code = 'wordpress';
     }
@@ -1656 +1763 @@
     {
         $link = 'http://ios.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-iphone');
+        $title = 'Wordpress App';
+        $version = wpua_detect_browser_version('wp-iphone');
         $code = 'wordpress';
     }
@@ -1662 +1770 @@
     {
         $link = 'http://nokia.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-nokia');
+        $title = 'wp-nokia';
         $code = 'wordpress';
     }
@@ -1668 +1776 @@
     {
         $link = 'http://webos.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-webos');
+        $title = 'wp-webos';
         $code = 'wordpress';
     }
@@ -1674 +1782 @@
     {
         $link = 'http://windowsphone.wordpress.org/';
-        $title = wpua_detect_browser_version('wp-windowsphone');
+        $title = 'wp-windowsphone';
         $code = 'wordpress';
     }
@@ -1680 +1788 @@
     {
         $link = 'http://www.wyzo.com/';
-        $title = wpua_detect_browser_version('Wyzo');
+        $title = 'Wyzo';
         $code = 'Wyzo';
     }
@@ -1686 +1794 @@
     {
         $link = 'http://www.xsmiles.org/';
-        $title = wpua_detect_browser_version('X-Smiles');
+        $title = 'X-Smiles';
         $code = 'x-smiles';
     }
@@ -1692 +1800 @@
     {
         $link = '#';
-        $title = wpua_detect_browser_version('Xiino');
+        $title = 'Xiino';
         $code = 'null';
     }
@@ -1698 +1806 @@
     {
         $link = 'http://browser.yandex.com/';
-        $title = 'Yandex '.wpua_detect_browser_version('Browser');
+        $title = 'Yandex Browser';
+        $version = wpua_detect_browser_version('Browser');
         $code = 'yandex';
     }
@@ -1704 +1813 @@
     {
         $link = 'http://weblink.justyrc.com/';
-        $title = 'YRC '.wpua_detect_browser_version('Weblink');
+        $title = 'YRC Weblink';
+        $version = wpua_detect_browser_version('Weblink');
         $code = 'yrcweblink';
     }
@@ -1710 +1820 @@
     {
         $link = 'http://sites.google.com/site/zeromusparadoxe01/zbrowser';
-        $title = wpua_detect_browser_version('zBrowser');
+        $title = 'zBrowser';
         $code = 'zbrowser';
     }
@@ -1716 +1826 @@
     {
         $link = 'http://www.zipzaphome.com/';
-        $title = wpua_detect_browser_version('ZipZap');
+        $title = 'ZipZap';
         $code = 'zipzap';
     }
@@ -1724 +1834 @@
     {
         $link = 'http://abrowse.sourceforge.net/';
-        $title = wpua_detect_browser_version('ABrowse');
+        $title = 'ABrowse';
         $code = 'abrowse';
     }
@@ -1732 +1842 @@
     {
         $link = 'http://en.wikipedia.org/wiki/Microsoft_Edge';
-        $title = 'Microsoft '.wpua_detect_browser_version('Edge');
+        $title = 'Microsoft Edge';
+        $version = wpua_detect_browser_version('Edge');
         $code = 'msedge12';
     }
@@ -1738 +1849 @@
     {
         $link = 'http://google.com/chrome/';
-        $title = 'Google '.wpua_detect_browser_version('Chrome');
+        $title = 'Google Chrome';
+        $version = wpua_detect_browser_version('Chrome');
         $code = 'chrome';
     }
@@ -1749 +1861 @@
         if (preg_match('/Version/i', $useragent))
         {
-            $title = wpua_detect_browser_version('Safari');
+            $version = wpua_detect_browser_version('Version');
         }
 
@@ -1763 +1875 @@
         $link = 'http://www.nokia.com/browser';
         $title = 'Nokia Web Browser';
+        $version = '';
         $code = 'maemo';
     }
@@ -1768 +1881 @@
     {
         $link = 'http://www.mozilla.org/';
-        $title = wpua_detect_browser_version('Firefox');
+        $title = 'Firefox';
         $code = 'firefox';
     }
@@ -1774 +1887 @@
     {
         $link = 'http://www.microsoft.com/windows/products/winfamily/ie/default.mspx';
-        $title = 'Internet Explorer'.wpua_detect_browser_version('MSIE');
-
-        if (preg_match('/MSIE[\ |\/]?([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
-        {
-            // We have IE10 or older
-        }
-        elseif (preg_match('/\ rv:([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
-        {
-            // We have IE11 or newer
-        }
-
-
-        if ($regmatch[1] >= 10)
+        $title = 'Internet Explorer';
+
+        if (preg_match('/\ rv:([.0-9a-zA-Z]+)/i', $useragent))
+        {
+            // IE11 or newer
+            $version = wpua_detect_browser_version(' rv');
+        }
+        else
+        {
+            // IE10 or older, regex: '/MSIE[\ |\/]?([.0-9a-zA-Z]+)/i'
+            $version = wpua_detect_browser_version('MSIE');
+        }
+
+        if (intval($version) >= 10)
         {
             $code = 'msie10';
         }
-        elseif ($regmatch[1] >= 9)
+        elseif (intval($version) >= 9)
         {
             $code = 'msie9';
         }
-        elseif ($regmatch[1] >= 7)
+        elseif (intval($version) >= 7)
         {
             // also ie8
             $code = 'msie7';
-        }
-        elseif ($regmatch[1] >= 6)
+
+            // Detect compatibility mode for IE
+            if ($version === '7.0' && preg_match('/Trident\/4.0/i', $useragent))
+            {
+                $version = '8.0 (Compatibility Mode)'; // Fix for IE8 quirky UA string with Compatibility Mode enabled
+            }
+        }
+        elseif (intval($version) >= 6)
         {
             $code = 'msie6';
         }
-        elseif ($regmatch[1] >= 4)
+        elseif (intval($version) >= 4)
         {
             // also ie5
             $code = 'msie4';
         }
-        elseif ($regmatch[1] >= 3)
+        elseif (intval($version) >= 3)
         {
             $code = 'msie3';
         }
-        elseif ($regmatch[1] >= 2)
+        elseif (intval($version) >= 2)
         {
             $code = 'msie2';
         }
-        elseif ($regmatch[1] >= 1)
+        elseif (intval($version) >= 1)
         {
             $code = 'msie1';
@@ -1828 +1948 @@
     {
         $link = 'http://www.mozilla.org/';
-        $title = 'Mozilla Compatible';
-
-        if (preg_match('/rv:([.0-9a-zA-Z]+)/i', $useragent, $regmatch))
-        {
-            $title = 'Mozilla '.$regmatch[1];
+        $title = 'Mozilla';
+        $version = wpua_detect_browser_version(' rv');
+
+        if (empty($version))
+        {
+            $title .= ' Compatible';
         }
 
@@ -1843 +1964 @@
         $link = '#';
         $title = 'Unknown';
+        $version = '';
         $code = 'null';
+    }
+
+    // Set version if it hasn't been parsed yet (generic structure)...
+    if (is_null($version))
+    {
+        $version = wpua_detect_browser_version($title);
+    }
+
+    // Append version to title (as long as show version isn't 'off')
+    if ($wpua_show_version !== 'false')
+    {
+        $title .= " $version";
     }
 

wp-useragent/trunk/wp-useragent-options.php

@@ -99 +99 @@
             $wpua_text_on          = get_option('wpua_text_on');
             $wpua_text_via         = get_option('wpua_text_via');
+            $wpua_show_version     = get_option('wpua_show_version');
             $wpua_text_links       = get_option('wpua_text_links');
             $wpua_show_full_ua     = get_option('wpua_show_full_ua');
@@ -155 +156 @@
                 delete_option('ua_output_location');
             }
+            // Add new feature option for showing version to db if it didn't previously exist
+            if (empty($wpua_show_version))
+            {
+                $wpua_show_version = 'full';
+                if ( ! add_option( 'wpua_show_version', $wpua_show_version, '', 'no' ) ) update_option( 'wpua_show_version', $wpua_show_version );
+            }
 
             // Set defaults
@@ -165 +172 @@
             if (empty($wpua_text_on) && is_null($wpua_text_on)) $wpua_text_on = '';
             if (empty($wpua_text_via) && is_null($wpua_text_via)) $wpua_text_via = '';
+            if (empty($wpua_show_version)) $wpua_show_version = 'full';
             if (empty($wpua_text_links)) $wpua_text_links = 'false';
             if (empty($wpua_show_full_ua)) $wpua_show_full_ua = 'true';
@@ -295 +303 @@
                                             <input type="text" id="wpua_text_via" name="wpua_text_via" value="<?php echo $wpua_text_via; ?>" />
                                             <p class="description"><?php _e('Displayed for Trackbacks and Pingbacks. Default value is empty.', 'wp-useragent'); ?></p>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <th><?php _e('Show version numbers', 'wp-useragent'); ?>:</th>
+                                        <td>
+                                            <select id="wpua_show_version" name="wpua_show_version">
+                                                <option value="full" <?php if ($wpua_show_version === 'full') echo 'selected="selected"'; ?>><?php _e('Full', 'wp-useragent'); ?></option>
+                                                <option value="simple" <?php if ($wpua_show_version === 'simple') echo 'selected="selected"'; ?>><?php _e('Simple', 'wp-useragent'); ?></option>
+                                                <option value="false" <?php if ($wpua_show_version === 'false') echo 'selected="selected"'; ?>><?php _e('No', 'wp-useragent'); ?></option>
+                                            </select>
                                         </td>
                                     </tr>
@@ -466 +484 @@
 
                     <input type="hidden" name="action" value="update" />
-                    <input type="hidden" name="page_options" value="wpua_doctype, wpua_icon_size, wpua_show_text_icons, wpua_icon_style, wpua_icon_style_input, wpua_text_using, wpua_text_on, wpua_text_via, wpua_text_links, wpua_show_full_ua, wpua_hide_unknown_ua, wpua_admin_only, wpua_output_location" />
+                    <input type="hidden" name="page_options" value="wpua_doctype, wpua_icon_size, wpua_show_text_icons, wpua_icon_style, wpua_icon_style_input, wpua_text_using, wpua_text_on, wpua_text_via, wpua_show_version, wpua_text_links, wpua_show_full_ua, wpua_hide_unknown_ua, wpua_admin_only, wpua_output_location" />
 
                     <input type="button" name="Reset" class="button-primary reset" value="<?php _e('Reset Defaults', 'wp-useragent'); ?>" />
@@ -501 +519 @@
                     $wpua_text_on = $wpua_useragent.find('#wpua_text_on'),
                     $wpua_text_via = $wpua_useragent.find('#wpua_text_via'),
+                    $wpua_show_version = $wpua_useragent.find('#wpua_show_version'),
                     $wpua_text_links = $wpua_useragent.find('#wpua_text_links'),
                     $wpua_show_full_ua = $wpua_useragent.find('#wpua_show_full_ua'),
@@ -516 +535 @@
 
                 // Element event groups
-                    $change = $wpua_useragent.find('#wpua_icon_size,#wpua_show_text_icons,#wpua_text_links,#wpua_show_full_ua,#wpua_hide_unknown_ua,#wpua_output_location'),
+                    $change = $wpua_useragent.find('#wpua_icon_size,#wpua_show_text_icons,#wpua_show_version,#wpua_text_links,#wpua_show_full_ua,#wpua_hide_unknown_ua,#wpua_output_location'),
                     $keyup = $wpua_useragent.find('#wpua_icon_style_input,#wpua_text_using,#wpua_text_on,#wpua_text_via');
 
@@ -525 +544 @@
                         wpua_text_using = ($wpua_show_text_icons.val() !== 'icons')  ? $wpua_text_using.val()+' ' : '',
                         wpua_text_on = ($wpua_show_text_icons.val() !== 'icons')  ? $wpua_text_on.val()+' ' : '',
-                        wpua_browser = ($wpua_show_text_icons.val() !== 'icons' && $wpua_text_links.val() !== 'false')  ? ' <a href="http://www.opera.com/" style="text-decoration:none">Opera 10.00</a> ' : ' Opera 10.00 ',
-                        wpua_system = ($wpua_show_text_icons.val() !== 'icons' && $wpua_text_links.val() !== 'false')  ? ' <a href="http://www.ubuntu.com/" style="text-decoration:none">Ubuntu 9.10</a>' : ' Ubuntu 9.10',
+                        wpua_browser_text = ($wpua_show_version.val() === 'false')  ? 'Opera' : (($wpua_show_version.val() === 'simple')  ? 'Opera 10' : 'Opera 10.52'),
+                        wpua_system_text = ($wpua_show_version.val() === 'false')  ? 'Ubuntu' : (($wpua_show_version.val() === 'simple')  ? 'Ubuntu 9' : 'Ubuntu 9.10'),
+                        wpua_browser = ($wpua_show_text_icons.val() !== 'icons' && $wpua_text_links.val() !== 'false')  ? ' <a href="http://www.opera.com/" style="text-decoration:none">'+wpua_browser_text+'</a> ' : ' '+wpua_browser_text+' ',
+                        wpua_system = ($wpua_show_text_icons.val() !== 'icons' && $wpua_text_links.val() !== 'false')  ? ' <a href="http://www.ubuntu.com/" style="text-decoration:none">'+wpua_system_text+'</a>' : ' '+wpua_system_text,
                         wpua_content = '';
 

wp-useragent/trunk/wp-useragent.php

@@ -8 +8 @@
  * Author URI: https://www.kyleabaker.com/
  * Text Domain: wp-useragent
+ * Domain Path: /languages/
  * //Author: Fernando Briano
  * //Author URI: http://picandocodigo.net
@@ -62 +63 @@
 $wpua_text_on          = get_option('wpua_text_on');
 $wpua_text_via         = get_option('wpua_text_via');
+$wpua_show_version     = get_option('wpua_show_version');
 $wpua_text_links       = get_option('wpua_text_links');
 $wpua_show_full_ua     = get_option('wpua_show_full_ua');
@@ -118 +120 @@
     delete_option('ua_output_location');
 }
+// Add new feature option for showing version to db if it didn't previously exist
+if (empty($wpua_show_version))
+{
+    $wpua_show_version = 'full';
+    if ( ! add_option( 'wpua_show_version', $wpua_show_version, '', 'no' ) ) update_option( 'wpua_show_version', $wpua_show_version );
+}
 
 // Set defaults
@@ -128 +136 @@
 if (empty($wpua_text_on) && is_null($wpua_text_on)) $wpua_text_on = '';
 if (empty($wpua_text_via) && is_null($wpua_text_via)) $wpua_text_via = '';
+if (empty($wpua_show_version)) $wpua_show_version = 'full';
 if (empty($wpua_text_links)) $wpua_text_links = 'false';
 if (empty($wpua_show_full_ua)) $wpua_show_full_ua = 'true';
@@ -391 +400 @@
     if ( ! add_option( 'wpua_text_on', '', '', 'no' ) ) update_option( 'wpua_text_on', '' );
     if ( ! add_option( 'wpua_text_via', '', '', 'no' ) ) update_option( 'wpua_text_via', '' );
+    if ( ! add_option( 'wpua_show_version', '', '', 'no' ) ) update_option( 'wpua_show_version', '' );
     if ( ! add_option( 'wpua_text_links', '', '', 'no' ) ) update_option( 'wpua_text_links', '' );
     if ( ! add_option( 'wpua_show_full_ua', '', '', 'no' ) ) update_option( 'wpua_show_full_ua', '' );