moved last stuff from browser type (UserSettings) to browser engine (DevicesDetection)

2 files changed, 38 insertions, 1 deletions

diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 6e018d7712..f144a449bf 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -14,7 +14,7 @@ use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugins\UserSettings\UserSettings;
-use Piwik\Plugins\UserSettings\Visitor;
+use Piwik\Plugins\DevicesDetection\Visitor;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
@@ -46,7 +46,11 @@ class DevicesDetection extends \Piwik\Plugin
 
     public function extendVisitorDetails(&$visitor, $details)
     {
+        $instance = new Visitor($details);
+
         $visitor['deviceType'] = getDeviceTypeLabel($details['config_device_type']);
+        $visitor['browserFamily']            = $instance->getBrowserFamily();
+        $visitor['browserFamilyDescription'] = $instance->getBrowserFamilyDescription();
 
         if (!PluginManager::getInstance()->isPluginActivated('UserSettings')) {
             $instance = new UserSettings();
diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php
new file mode 100644
index 0000000000..ad37cfe2ae
--- /dev/null
+++ b/plugins/DevicesDetection/Visitor.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicesDetection;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
+
+class Visitor
+{
+    const DELIMITER_PLUGIN_NAME = ", ";
+
+    private $details = array();
+
+    public function __construct($details)
+    {
+        $this->details = $details;
+    }
+
+    function getBrowserFamilyDescription()
+    {
+        return getBrowserEngineName($this->getBrowserFamily());
+    }
+
+    function getBrowserFamily()
+    {
+        return $this->details['config_browser_engine'];
+    }
+}
\ No newline at end of file