From cbc2b1d3bad14ad173335faa9222938922daa1a2 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 20 Jan 2015 00:07:24 +0100 Subject: visitors os information should contain full data set like browsers already do --- plugins/DevicesDetection/DevicesDetection.php | 4 +++- plugins/DevicesDetection/Visitor.php | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'plugins/DevicesDetection') diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 6b4e57fe65..8dde8e8e40 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -49,8 +49,10 @@ class DevicesDetection extends \Piwik\Plugin $visitor['deviceType'] = $instance->getDeviceType(); $visitor['operatingSystem'] = $instance->getOperatingSystem(); - $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemName'] = $instance->getOperatingSystemName(); $visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon(); + $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemVersion'] = $instance->getOperatingSystemVersion(); $visitor['browserFamily'] = $instance->getBrowserEngine(); $visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription(); $visitor['browser'] = $instance->getBrowser(); diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php index 63e67a53a4..25d7a5a89a 100644 --- a/plugins/DevicesDetection/Visitor.php +++ b/plugins/DevicesDetection/Visitor.php @@ -34,6 +34,16 @@ class Visitor return getOsFullName($this->details['config_os'] . ";" . $this->details['config_os_version']); } + public function getOperatingSystemName() + { + return getOsFullName($this->details['config_os']); + } + + public function getOperatingSystemVersion() + { + return $this->details['config_os_version']; + } + public function getOperatingSystemIcon() { return getOsLogo($this->details['config_os']); -- cgit v1.2.3