refs #4792 - added detection of vendor fragments

matomo-org · Jan 1, 2015 · b8803fb · b8803fb
1 parent 97f587b
commit b8803fb
Show file tree

Hide file tree

Showing 6 changed files with 1,021 additions and 77 deletions.
diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -14,6 +14,7 @@
 use DeviceDetector\Parser\OperatingSystem;
 use DeviceDetector\Parser\Client\ClientParserAbstract;
 use DeviceDetector\Parser\Device\DeviceParserAbstract;
+use DeviceDetector\Parser\VendorFragment;
 use \Spyc;
 
 class DeviceDetector
@@ -507,6 +508,14 @@ protected function parseDevice() {
             }
         }
 
+        /**
+         * If no brand has been assigned try to match by known vendor fragments
+         */
+        if (empty($this->brand)) {
+            $vendorParser = new VendorFragment($this->getUserAgent());
+            $this->brand = $vendorParser->parse();
+        }
+
         /**
          * Some user agents simply contain the fragment 'Android; Tablet;', so we assume those devices as tablets
          */

diff --git a/Parser/Device/DeviceParserAbstract.php b/Parser/Device/DeviceParserAbstract.php
@@ -87,6 +87,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'CM' => 'Crius Mea',
         'CR' => 'CreNova',
         'CT' => 'Capitel',
+        'CQ' => 'Compaq',
         'CO' => 'Coolpad',
         'CU' => 'Cube',
         'CY' => 'Coby Kyros',
@@ -108,6 +109,8 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'EV' => 'Evertek',
         'EZ' => 'Ezze',
         'FL' => 'Fly',
+        'FU' => 'Fujitsu',
+        'GA' => 'Gateway',
         'GD' => 'Gemini',
         'GI' => 'Gionee',
         'GG' => 'Gigabyte',
@@ -120,6 +123,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'HT' => 'HTC',
         'HU' => 'Huawei',
         'HX' => 'Humax',
+        'HY' => 'Hyrican',
         'IA' => 'Ikea',
         'IB' => 'iBall',
         'IY' => 'iBerry',
@@ -163,6 +167,7 @@ abstract class DeviceParserAbstract extends ParserAbstract
         'MM' => 'Mpman',
         'MR' => 'Motorola',
         'MS' => 'Microsoft',
+        'MZ' => 'MSI',
         'MU' => 'Memup',
         'MT' => 'Mitsubishi',
         'MY' => 'MyPhone',

diff --git a/Parser/VendorFragment.php b/Parser/VendorFragment.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Device Detector - The Universal Device Detection library for parsing User Agents
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
+ */
+namespace DeviceDetector\Parser;
+use DeviceDetector\Parser\Device\DeviceParserAbstract;
+
+/**
+ * Class VendorFragments
+ *
+ * Device parser for vendor fragment detection
+ *
+ * @package DeviceDetector\Parser\Device
+ */
+class VendorFragment extends ParserAbstract
+{
+    protected $fixtureFile = 'regexes/vendorfragments.yml';
+    protected $parserName  = 'vendorfragments';
+
+    public function parse()
+    {
+        foreach ($this->getRegexes() as $brand => $regexes) {
+            foreach($regexes AS $regex) {
+                if ($this->matchUserAgent($regex.'[^a-z0-9]+')) {
+                    return array_search($brand, DeviceParserAbstract::$deviceBrands);
+                }
+            }
+        }
+
+        return '';
+    }
+
+}