diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 555eaaf2bfdb55ec6b40f1a9c8898b07a471e345..b52ca59452125907e571c2c31952f8306e1aa162 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -5,13 +5,16 @@ tools:
config:
check_variables:
enabled: false
+ dependency_paths:
+ - libs/
filter:
+ paths:
+ - core/
+ - plugins/
excluded_paths:
- - 'tests/*'
- - 'libs/*'
- - 'misc/*'
- - 'lang/*'
+ - '*/tests/*'
+ - '*/Test/*'
build:
environment:
diff --git a/.travis.yml b/.travis.yml
index 54575ea7979b8983361fad3b11b1beb016c11e2e..ee3153ad650f5c5310c62b5807f1b14b753d963b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,8 +103,6 @@ before_script:
# configure mysql
- mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default
- # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6)
- - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'"
- mysql -e "SELECT @@sql_mode;"
- mysql -e "SHOW GLOBAL VARIABLES;"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0cd7aca1e524cd20ece14c33e6dce4c32b85d51..809780082da5bb344b626680e7cf58941cf3b8d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
### Breaking Changes
* Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin.
+* os and browser icons are now located in the DevicesDetection plugin. If you are not using the Reporting or Metadata API to get the icon locations please update your paths.
* API responses containing visitor information will now longer contain the fields `screenType` and `screenTypeIcon` as those reports have been completely removed
* The following events have been removed:
* `Log.formatFileMessage`
@@ -21,6 +22,8 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
* The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead
* The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead
* The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead
+* The API method `UserSettings.getResolution` is deprecated and will be removed from May 1st 2015. Use `Resolution.getResolution` instead
+* The API method `UserSettings.getConfiguration` is deprecated and will be removed from May 1st 2015. Use `Resolution.getConfiguration` instead
* The API method `UserSettings.getWideScreen` has been removed
* The API method `UserSettings.getWideScreen` is deprecated and will be removed from May 1st 2015. Use `UserSettings.getScreenType` instead
* The method `Piwik\Log::setLogLevel()` has been deprecated
diff --git a/composer.lock b/composer.lock
index 74774d1b5dbd652f5224a4d52660b3f4ef3753c0..fdddc728f8c39eacad888d88c7da51c704215cbe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "ed64c8df41ea550e2c0b78424573310e",
+ "hash": "92499fc432a629fefcd5c1b912e44d9c",
"packages": [
{
"name": "container-interop/container-interop",
@@ -269,12 +269,12 @@
"source": {
"type": "git",
"url": "https://github.com/mnapoli/PHP-DI.git",
- "reference": "a13db0a6742ce4e7e976fa0c7a303771a018f04f"
+ "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/a13db0a6742ce4e7e976fa0c7a303771a018f04f",
- "reference": "a13db0a6742ce4e7e976fa0c7a303771a018f04f",
+ "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169",
+ "reference": "d7f54f3c1b3523493eb5f4b5ca38bcfd74d96169",
"shasum": ""
},
"require": {
@@ -317,7 +317,7 @@
"dependency injection",
"di"
],
- "time": "2014-11-27 23:44:26"
+ "time": "2014-12-11 22:24:18"
},
{
"name": "mnapoli/phpdocreader",
@@ -354,78 +354,6 @@
],
"time": "2014-08-21 08:20:45"
},
- {
- "name": "monolog/monolog",
- "version": "1.11.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
- "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "psr/log": "~1.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0"
- },
- "require-dev": {
- "aws/aws-sdk-php": "~2.4, >2.4.8",
- "doctrine/couchdb": "~1.0@dev",
- "graylog2/gelf-php": "~1.0",
- "phpunit/phpunit": "~3.7.0",
- "raven/raven": "~0.5",
- "ruflin/elastica": "0.90.*",
- "videlalvaro/php-amqplib": "~2.4"
- },
- "suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-mongo": "Allow sending log messages to a MongoDB server",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "raven/raven": "Allow sending log messages to a Sentry server",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.11.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Monolog\\": "src/Monolog"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "http://github.com/Seldaek/monolog",
- "keywords": [
- "log",
- "logging",
- "psr-3"
- ],
- "time": "2014-09-30 13:30:58"
- },
{
"name": "mustangostang/spyc",
"version": "0.5.1",
@@ -618,57 +546,19 @@
],
"time": "2014-10-23 03:30:23"
},
- {
- "name": "psr/log",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
- "shasum": ""
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Psr\\Log\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
- "description": "Common interface for logging libraries",
- "keywords": [
- "log",
- "psr",
- "psr-3"
- ],
- "time": "2012-12-21 11:40:51"
- },
{
"name": "symfony/console",
- "version": "v2.6.0",
+ "version": "v2.5.6",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10"
+ "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/d3bac228fd7a2aac9193e241b239880b3ba39a10",
- "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
+ "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
"shasum": ""
},
"require": {
@@ -676,18 +566,16 @@
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/process": "~2.1"
+ "symfony/event-dispatcher": "~2.1"
},
"suggest": {
"psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/process": ""
+ "symfony/event-dispatcher": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -711,65 +599,7 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-11-20 13:24:23"
- },
- {
- "name": "symfony/monolog-bridge",
- "version": "v2.6.0",
- "target-dir": "Symfony/Bridge/Monolog",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/MonologBridge.git",
- "reference": "2ac99fc4a9846faf12152a61c3355f1041db881c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/MonologBridge/zipball/2ac99fc4a9846faf12152a61c3355f1041db881c",
- "reference": "2ac99fc4a9846faf12152a61c3355f1041db881c",
- "shasum": ""
- },
- "require": {
- "monolog/monolog": "~1.11",
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/console": "~2.3",
- "symfony/event-dispatcher": "~2.2",
- "symfony/http-kernel": "~2.2"
- },
- "suggest": {
- "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
- "symfony/event-dispatcher": "Needed when using log messages in console commands",
- "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel."
- },
- "type": "symfony-bridge",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Symfony\\Bridge\\Monolog\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony Monolog Bridge",
- "homepage": "http://symfony.com",
- "time": "2014-11-28 10:00:40"
+ "time": "2014-10-05 13:57:04"
},
{
"name": "tedivm/jshrink",
@@ -1115,16 +945,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "0.3.9",
+ "version": "0.3.8",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1"
+ "reference": "5085202f1f37769aae59f9711c423f28159c9b29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
- "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5085202f1f37769aae59f9711c423f28159c9b29",
+ "reference": "5085202f1f37769aae59f9711c423f28159c9b29",
"shasum": ""
},
"require": {
@@ -1209,7 +1039,7 @@
"x.509",
"x509"
],
- "time": "2014-11-10 03:08:59"
+ "time": "2014-09-13 02:42:45"
},
{
"name": "phpunit/php-code-coverage",
@@ -1460,16 +1290,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.3.5",
+ "version": "4.3.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1"
+ "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
- "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23e4e0310f037aae873cc81b8658dbbb82878f71",
+ "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71",
"shasum": ""
},
"require": {
@@ -1530,7 +1360,7 @@
"testing",
"xunit"
],
- "time": "2014-11-11 10:11:09"
+ "time": "2014-10-22 11:43:12"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -1855,17 +1685,17 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.6.0",
+ "version": "v2.5.6",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "697331d4ac78668cf6d21a2bb009b3faae92814f"
+ "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/697331d4ac78668cf6d21a2bb009b3faae92814f",
- "reference": "697331d4ac78668cf6d21a2bb009b3faae92814f",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/804eb28dbbfba9ffdab21fe2066744906cea2212",
+ "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212",
"shasum": ""
},
"require": {
@@ -1874,8 +1704,7 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0",
- "symfony/dependency-injection": "~2.6",
- "symfony/expression-language": "~2.6",
+ "symfony/dependency-injection": "~2.0,<2.6.0",
"symfony/stopwatch": "~2.2"
},
"suggest": {
@@ -1885,7 +1714,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -1909,21 +1738,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-11-28 10:00:40"
+ "time": "2014-10-01 15:43:05"
},
{
"name": "symfony/yaml",
- "version": "v2.6.0",
+ "version": "v2.5.6",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8"
+ "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
- "reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
+ "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
"shasum": ""
},
"require": {
@@ -1932,7 +1761,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -1956,7 +1785,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-11-20 13:24:23"
+ "time": "2014-10-01 05:50:18"
}
],
"aliases": [],
diff --git a/config/global.ini.php b/config/global.ini.php
index 4a319c7e8953aa342c94ff891200a49edb77c984..fd0f00031ea025c8215b4252202f8296ef1a4a1d 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -586,6 +586,16 @@ campaign_var_name = "pk_cpn,pk_campaign,piwik_campaign,utm_campaign,utm_source,u
; Includes by default the GA style campaign keyword parameter utm_term
campaign_keyword_var_name = "pk_kwd,pk_keyword,piwik_kwd,utm_term"
+; if set to 1, actions that contain different campaign information from the visitor's ongoing visit will
+; be treated as the start of a new visit. This will include situations when campaign information was absent before,
+; but is present now.
+create_new_visit_when_campaign_changes = 1
+
+; if set to 1, actions that contain different website referrer information from the visitor's ongoing visit
+; will be treatedas the start of a new visit. This will include situations when website referrer information was
+; absent before, but is present now.
+create_new_visit_when_website_referrer_changes = 0
+
; maximum length of a Page Title or a Page URL recorded in the log_action.name table
page_maximum_length = 1024;
@@ -717,6 +727,7 @@ Plugins[] = Morpheus
Plugins[] = Contents
Plugins[] = TestRunner
Plugins[] = BulkTracking
+Plugins[] = Resolution
[PluginsInstalled]
PluginsInstalled[] = Login
diff --git a/core/Container/IniConfigDefinitionSource.php b/core/Container/IniConfigDefinitionSource.php
index b84d33d94f6e3e0226d837229843b83d7c1b184a..5d4518196bd527828a8f15181a9b3cc1a4a37bcb 100644
--- a/core/Container/IniConfigDefinitionSource.php
+++ b/core/Container/IniConfigDefinitionSource.php
@@ -9,16 +9,14 @@
namespace Piwik\Container;
use DI\Definition\Exception\DefinitionException;
-use DI\Definition\MergeableDefinition;
use DI\Definition\Source\ChainableDefinitionSource;
-use DI\Definition\Source\DefinitionSource;
use DI\Definition\ValueDefinition;
use Piwik\Config;
/**
* Import the old INI config into PHP-DI.
*/
-class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinitionSource
+class IniConfigDefinitionSource extends ChainableDefinitionSource
{
/**
* @var Config
@@ -30,11 +28,6 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
*/
private $prefix;
- /**
- * @var DefinitionSource
- */
- private $chainedSource;
-
/**
* @param Config $config
* @param string $prefix Prefix for the container entries.
@@ -45,15 +38,10 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
$this->prefix = $prefix;
}
- public function getDefinition($name, MergeableDefinition $parentDefinition = null)
+ protected function findDefinition($name)
{
- // INI only contains values, so no definition merging here
- if ($parentDefinition) {
- return $this->notFound($name, $parentDefinition);
- }
-
if (strpos($name, $this->prefix) !== 0) {
- return $this->notFound($name, $parentDefinition);
+ return null;
}
list($sectionName, $configKey) = $this->parseEntryName($name);
@@ -65,17 +53,12 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
}
if (! array_key_exists($configKey, $section)) {
- return $this->notFound($name, $parentDefinition);
+ return null;
}
return new ValueDefinition($name, $section[$configKey]);
}
- public function chain(DefinitionSource $source)
- {
- $this->chainedSource = $source;
- }
-
private function parseEntryName($name)
{
$parts = explode('.', $name, 3);
@@ -102,13 +85,4 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
return $section;
}
-
- private function notFound($name, $parentDefinition)
- {
- if ($this->chainedSource) {
- return $this->chainedSource->getDefinition($name, $parentDefinition);
- }
-
- return null;
- }
}
diff --git a/core/CronArchive.php b/core/CronArchive.php
index 4977fa5324e14767c2c1cfc12775fb3cbf9de9c5..87b9e002822fe121bc61f76fcbbb8315412c1f7a 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -426,10 +426,10 @@ class CronArchive
if ($this->archiveAndRespectTTL) {
Option::clearCachedOption($this->lastRunKey($idSite, "periods"));
- $lastTimestampWebsiteProcessedPeriods = Option::get($this->lastRunKey($idSite, "periods"));
+ $lastTimestampWebsiteProcessedPeriods = $this->getPeriodLastProcessedTimestamp($idSite);
Option::clearCachedOption($this->lastRunKey($idSite, "day"));
- $lastTimestampWebsiteProcessedDay = Option::get($this->lastRunKey($idSite, "day"));
+ $lastTimestampWebsiteProcessedDay = $this->getDayLastProcessedTimestamp($idSite);
}
$this->updateIdSitesInvalidatedOldReports();
@@ -872,7 +872,7 @@ class CronArchive
{
$this->todayArchiveTimeToLive = Rules::getTodayArchiveTimeToLive();
$this->processPeriodsMaximumEverySeconds = $this->getDelayBetweenPeriodsArchives();
- $this->lastSuccessRunTimestamp = Option::get(self::OPTION_ARCHIVING_FINISHED_TS);
+ $this->lastSuccessRunTimestamp = $this->getLastSuccessRunTimestamp();
$this->shouldArchiveOnlySitesWithTrafficSince = $this->isShouldArchiveAllSitesWithTrafficSince();
$this->shouldArchiveOnlySpecificPeriods = $this->getPeriodsToProcess();
@@ -1363,4 +1363,39 @@ class CronArchive
return self::MAX_CONCURRENT_API_REQUESTS;
}
+
+ /**
+ * @param $idSite
+ * @return false|string
+ */
+ private function getPeriodLastProcessedTimestamp($idSite)
+ {
+ $timestamp = Option::get($this->lastRunKey($idSite, "periods"));
+ return $this->sanitiseTimestamp($timestamp);
+ }
+
+ /**
+ * @param $idSite
+ * @return false|string
+ */
+ private function getDayLastProcessedTimestamp($idSite)
+ {
+ $timestamp = Option::get($this->lastRunKey($idSite, "day"));
+ return $this->sanitiseTimestamp($timestamp);
+ }
+
+ /**
+ * @return false|string
+ */
+ private function getLastSuccessRunTimestamp()
+ {
+ $timestamp = Option::get(self::OPTION_ARCHIVING_FINISHED_TS);
+ return $this->sanitiseTimestamp($timestamp);
+ }
+
+ private function sanitiseTimestamp($timestamp)
+ {
+ $now = time();
+ return ($timestamp < $now) ? $timestamp : $now;
+ }
}
diff --git a/core/DataTable.php b/core/DataTable.php
index 61e8abb1eb29224b1903811b8e0b961aea780db0..895645af0fbcb0626a4c48d5e7f7ae9cf27c6b7b 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -356,10 +356,11 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
if ($this->enableRecursiveSort === true) {
foreach ($this->getRows() as $row) {
- if (($idSubtable = $row->getIdSubDataTable()) !== null) {
- $table = Manager::getInstance()->getTable($idSubtable);
- $table->enableRecursiveSort();
- $table->sort($functionCallback, $columnSortedBy);
+
+ $subTable = $row->getSubtable();
+ if ($subTable) {
+ $subTable->enableRecursiveSort();
+ $subTable->sort($functionCallback, $columnSortedBy);
}
}
}
@@ -868,8 +869,8 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
{
$totalCount = 0;
foreach ($this->rows as $row) {
- if (($idSubTable = $row->getIdSubDataTable()) !== null) {
- $subTable = Manager::getInstance()->getTable($idSubTable);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$count = $subTable->getRowsCountRecursive();
$totalCount += $count;
}
@@ -907,8 +908,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
$row->renameColumn($oldName, $newName);
if ($doRenameColumnsOfSubTables) {
- if (($idSubDataTable = $row->getIdSubDataTable()) !== null) {
- Manager::getInstance()->getTable($idSubDataTable)->renameColumn($oldName, $newName);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
+ $subTable->renameColumn($oldName, $newName);
}
}
}
@@ -929,8 +931,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
foreach ($names as $name) {
$row->deleteColumn($name);
}
- if (($idSubDataTable = $row->getIdSubDataTable()) !== null) {
- Manager::getInstance()->getTable($idSubDataTable)->deleteColumns($names, $deleteRecursiveInSubtables);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
+ $subTable->deleteColumns($names, $deleteRecursiveInSubtables);
}
}
if (!is_null($this->summaryRow)) {
@@ -1110,20 +1113,13 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
// but returns all serialized tables and subtable in an array of 1 dimension
$aSerializedDataTable = array();
foreach ($this->rows as $row) {
- if (($idSubTable = $row->getIdSubDataTable()) !== null) {
- $subTable = null;
- try {
- $subTable = Manager::getInstance()->getTable($idSubTable);
- } catch(TableNotFoundException $e) {
- // This occurs is an unknown & random data issue. Catch Exception and remove subtable from the row.
- $row->removeSubtable();
- // Go to next row
- continue;
- }
-
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$depth++;
$aSerializedDataTable = $aSerializedDataTable + $subTable->getSerialized($maximumRowsInSubDataTable, $maximumRowsInSubDataTable, $columnToSortByBeforeTruncation);
$depth--;
+ } else {
+ $row->removeSubtable();
}
}
// we load the current Id of the DataTable
@@ -1616,8 +1612,8 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
// we simply add it (cloning the subtable)
// if the row has the subtable already
// then we have to recursively sum the subtables
- if (($idSubTable = $row->getIdSubDataTable()) !== null) {
- $subTable = Manager::getInstance()->getTable($idSubTable);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$subTable->metadata[self::COLUMN_AGGREGATION_OPS_METADATA_NAME]
= $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME);
$rowFound->sumSubtable($subTable);
diff --git a/core/DataTable/BaseFilter.php b/core/DataTable/BaseFilter.php
index fb2dc009f9db209f26361e63b4051ae9c73737e6..dc4756d82ed438fc7957d1c96d94051e02b44461 100644
--- a/core/DataTable/BaseFilter.php
+++ b/core/DataTable/BaseFilter.php
@@ -73,8 +73,8 @@ abstract class BaseFilter
if (!$this->enableRecursive) {
return;
}
- if ($row->isSubtableLoaded()) {
- $subTable = Manager::getInstance()->getTable($row->getIdSubDataTable());
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$this->filter($subTable);
}
}
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 697403c2e340d3c6b6341a16780958b908e0a56e..f383a132609e427ed8dbb45930474606b365a97a 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -62,18 +62,15 @@ class PatternRecursive extends BaseFilter
// AND 2 - the label is not found in the children
$patternNotFoundInChildren = false;
- try {
- $idSubTable = $row->getIdSubDataTable();
- $subTable = Manager::getInstance()->getTable($idSubTable);
-
+ $subTable = $row->getSubtable();
+ if(!$subTable) {
+ $patternNotFoundInChildren = true;
+ } else {
// we delete the row if we couldn't find the pattern in any row in the
// children hierarchy
if ($this->filter($subTable) == 0) {
$patternNotFoundInChildren = true;
}
- } catch (Exception $e) {
- // there is no subtable loaded for example
- $patternNotFoundInChildren = true;
}
if ($patternNotFoundInChildren
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index 3c1e31e2d0cd9a99e22c0fc3c2fb4b55536ae887..1e550f6e3ff2185bd83b0fdcefb29664450967bd 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -65,8 +65,8 @@ class ReplaceSummaryRowLabel extends BaseFilter
// recurse
foreach ($rows as $row) {
- if ($row->isSubtableLoaded()) {
- $subTable = Manager::getInstance()->getTable($row->getIdSubDataTable());
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$this->filter($subTable);
}
}
diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php
index d225b8fb87a3ad6e3e0899ec4065ae39defc18aa..07e7bc01b2e70a5d4c991ad75d4a30bcd2488271 100644
--- a/core/DataTable/Manager.php
+++ b/core/DataTable/Manager.php
@@ -61,7 +61,7 @@ class Manager extends Singleton
public function getTable($idTable)
{
if (!isset($this->tables[$idTable])) {
- throw new TableNotFoundException(sprintf("This report has been reprocessed since your last click. To see this error less often, please increase the timeout value in seconds in Settings > General Settings. (error: id %s not found).", $idTable));
+ throw new TableNotFoundException(sprintf("Error: table id %s not found in memory. (If this error is causing you problems in production, please report it in Piwik issue tracker.)", $idTable));
}
return $this->tables[$idTable];
diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php
index 0e1c127fb140f3a6186f4ffb0fca9243d9882d98..a4fcbff0c5af2ef9aaff9e4b342f2de3fa91892c 100644
--- a/core/DataTable/Renderer/Console.php
+++ b/core/DataTable/Renderer/Console.php
@@ -120,14 +120,10 @@ class Console extends Renderer
. $row->getIdSubDataTable() . "]<br />\n";
if (!is_null($row->getIdSubDataTable())) {
- if ($row->isSubtableLoaded()) {
+ $subTable = $row->getSubtable();
+ if ($subTable) {
$depth++;
- $output .= $this->renderTable(
- Manager::getInstance()->getTable(
- $row->getIdSubDataTable()
- ),
- $prefix . ' '
- );
+ $output .= $this->renderTable($subTable, $prefix . ' ');
$depth--;
} else {
$output .= "-- Sub DataTable not loaded<br />\n";
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index 56360b939ca41b2b04739ac098100f246de2cfaa..eb6d32a3e3e8c8634146146d9dd6e1970a829c67 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -206,10 +206,11 @@ class Php extends Renderer
$newRow['issummaryrow'] = true;
}
+ $subTable = $row->getSubtable();
if ($this->isRenderSubtables()
- && $row->isSubtableLoaded()
+ && $subTable
) {
- $subTable = $this->renderTable(Manager::getInstance()->getTable($row->getIdSubDataTable()));
+ $subTable = $this->renderTable($subTable);
$newRow['subtable'] = $subTable;
if ($this->hideIdSubDatatable === false
&& isset($newRow['metadata']['idsubdatatable_in_db'])
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index c6c0d21e9f5041c814bab9539f62a24294d81f60..0e7d329d779b0f283356d90beeb6b4db9c795cb6 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -317,7 +317,11 @@ class Row implements \ArrayAccess, \IteratorAggregate
public function getSubtable()
{
if ($this->isSubtableLoaded()) {
- return Manager::getInstance()->getTable($this->getIdSubDataTable());
+ try {
+ return Manager::getInstance()->getTable($this->getIdSubDataTable());
+ } catch(TableNotFoundException $e) {
+ // edge case
+ }
}
return false;
}
diff --git a/core/DataTable/Row/DataTableSummaryRow.php b/core/DataTable/Row/DataTableSummaryRow.php
index 7d477a304cee1ef7737a45ffcbc9e5bc9d45049d..2c9eda5e8e0e782df461111c4ee08b2d5b9ff590 100644
--- a/core/DataTable/Row/DataTableSummaryRow.php
+++ b/core/DataTable/Row/DataTableSummaryRow.php
@@ -47,9 +47,8 @@ class DataTableSummaryRow extends Row
*/
public function recalculate()
{
- $id = $this->getIdSubDataTable();
- if ($id !== null) {
- $subTable = Manager::getInstance()->getTable($id);
+ $subTable = $this->getSubtable();
+ if ($subTable) {
$this->sumTable($subTable);
}
}
diff --git a/core/Plugin/Dimension/VisitDimension.php b/core/Plugin/Dimension/VisitDimension.php
index 09a58554c09d521d9b0c660763c655252d4b7d74..b9aa3a9b2aa4235afe5f04b8eeba99e0e4b7025a 100644
--- a/core/Plugin/Dimension/VisitDimension.php
+++ b/core/Plugin/Dimension/VisitDimension.php
@@ -269,6 +269,25 @@ abstract class VisitDimension extends Dimension
return false;
}
+ /**
+ * This hook is executed by the tracker when determining if an action is the start of a new visit
+ * or part of an existing one. Derived classes can use it to force new visits based on dimension
+ * data.
+ *
+ * For example, the Campaign dimension in the Referrers plugin will force a new visit if the
+ * campaign information for the current action is different from the last.
+ *
+ * @param Request $request The current tracker request information.
+ * @param Visitor $visitor The information for the currently recognized visitor.
+ * @param Action|null $action The current action information (if any).
+ * @return bool Return true to force a visit, false if otherwise.
+ * @api
+ */
+ public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+ {
+ return false;
+ }
+
/**
* Get all visit dimensions that are defined by all activated plugins.
* @return VisitDimension[]
diff --git a/core/Plugin/Segment.php b/core/Plugin/Segment.php
index 795d4da1579a3750f2142c757152eb681f5a35f3..f29f2080595798dc526da25e3ed850ec7661cab8 100644
--- a/core/Plugin/Segment.php
+++ b/core/Plugin/Segment.php
@@ -96,7 +96,7 @@ class Segment
/**
* Set (overwrite) the segment display name. This name will be visible in the API and the UI. It should be a
- * translation key such as 'Actions_ColumnEntryPageTitle' or 'UserSettings_ColumnResolution'.
+ * translation key such as 'Actions_ColumnEntryPageTitle' or 'Resolution_ColumnResolution'.
* @param string $name
* @api
*/
diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php
index ae55b48aac3169e8abd3bb72e9131fdfe2e45831..4174a3168fd862ff464a75938cf1ccc13e32b0e4 100644
--- a/core/Tracker/PageUrl.php
+++ b/core/Tracker/PageUrl.php
@@ -256,13 +256,18 @@ class PageUrl
*/
public static function reencodeParameters(&$queryParameters, $encoding = false)
{
- // if query params are encoded w/ non-utf8 characters (due to browser bug or whatever),
- // encode to UTF-8.
- if (false !== $encoding
- && 'utf-8' != strtolower($encoding)
- && function_exists('mb_check_encoding')
- ) {
- $queryParameters = PageUrl::reencodeParametersArray($queryParameters, $encoding);
+ if (function_exists('mb_check_encoding')) {
+ // if query params are encoded w/ non-utf8 characters (due to browser bug or whatever),
+ // encode to UTF-8.
+ if (strtolower($encoding) != 'utf-8'
+ && $encoding != false
+ ) {
+ Common::printDebug("Encoding page URL query parameters to $encoding.");
+
+ $queryParameters = PageUrl::reencodeParametersArray($queryParameters, $encoding);
+ }
+ } else {
+ Common::printDebug("Page charset supplied in tracking request, but mbstring extension is not available.");
}
return $queryParameters;
@@ -349,5 +354,15 @@ class PageUrl
return array();
}
-}
+ public static function urldecodeValidUtf8($value)
+ {
+ $value = urldecode($value);
+ if (function_exists('mb_check_encoding')
+ && !@mb_check_encoding($value, 'utf-8')
+ ) {
+ return urlencode($value);
+ }
+ return $value;
+ }
+}
\ No newline at end of file
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 4065ebe15cba87e849969045a36ee68e3f000e3f..4e108450b5dd81da0211cd2a38572f2a8b83cc81 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -152,11 +152,7 @@ class Visit implements VisitInterface
$this->visitorInfo = $visitor->getVisitorInfo();
- $isLastActionInTheSameVisit = $this->isLastActionInTheSameVisit($visitor);
-
- if (!$isLastActionInTheSameVisit) {
- Common::printDebug("Visitor detected, but last action was more than 30 minutes ago...");
- }
+ $isNewVisit = $this->isVisitNew($visitor, $action);
// Known visit when:
// ( - the visitor has the Piwik cookie with the idcookie ID used by Piwik to match the visitor
@@ -165,9 +161,7 @@ class Visit implements VisitInterface
// )
// AND
// - the last page view for this visitor was less than 30 minutes ago @see isLastActionInTheSameVisit()
- if ($visitor->isVisitorKnown()
- && $isLastActionInTheSameVisit
- ) {
+ if (!$isNewVisit) {
$idReferrerActionUrl = $this->visitorInfo['visit_exit_idaction_url'];
$idReferrerActionName = $this->visitorInfo['visit_exit_idaction_name'];
@@ -203,9 +197,7 @@ class Visit implements VisitInterface
// - the visitor has the Piwik cookie but the last action was performed more than 30 min ago @see isLastActionInTheSameVisit()
// - the visitor doesn't have the Piwik cookie, and couldn't be matched in @see recognizeTheVisitor()
// - the visitor does have the Piwik cookie but the idcookie and idvisit found in the cookie didn't match to any existing visit in the DB
- if (!$visitor->isVisitorKnown()
- || !$isLastActionInTheSameVisit
- ) {
+ if ($isNewVisit) {
$this->handleNewVisit($visitor, $action, $visitIsConverted);
if (!is_null($action)) {
$action->record($visitor, 0, 0);
@@ -550,6 +542,16 @@ class Visit implements VisitInterface
return $valuesToUpdate;
}
+ private function triggerPredicateHookOnDimensions($dimensions, $hook, Visitor $visitor, Action $action = null)
+ {
+ foreach ($dimensions as $dimension) {
+ if ($dimension->$hook($this->request, $visitor, $action)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected function getAllVisitDimensions()
{
$dimensions = VisitDimension::getAllDimensions();
@@ -598,4 +600,30 @@ class Visit implements VisitInterface
{
return $this->getModel()->createVisit($visit);
}
+
+ /**
+ * Determines if the tracker if the current action should be treated as the start of a new visit or
+ * an action in an existing visit.
+ *
+ * @param Visitor $visitor The current visit/visitor information.
+ * @param Action|null $action The current action being tracked.
+ * @return bool
+ */
+ public function isVisitNew(Visitor $visitor, Action $action = null)
+ {
+ $isLastActionInTheSameVisit = $this->isLastActionInTheSameVisit($visitor);
+
+ if (!$isLastActionInTheSameVisit) {
+ Common::printDebug("Visitor detected, but last action was more than 30 minutes ago...");
+
+ return true;
+ }
+
+ $shouldForceNewVisit = $this->triggerPredicateHookOnDimensions($this->getAllVisitDimensions(), 'shouldForceNewVisit', $visitor, $action);
+ if ($shouldForceNewVisit) {
+ return true;
+ }
+
+ return !$visitor->isVisitorKnown();
+ }
}
diff --git a/core/Updates/2.10.0-b7.php b/core/Updates/2.10.0-b7.php
new file mode 100644
index 0000000000000000000000000000000000000000..21a5e7b1af10ceb73d2f92ce4380dc1052086a03
--- /dev/null
+++ b/core/Updates/2.10.0-b7.php
@@ -0,0 +1,50 @@
+<?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\Updates;
+
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Updater;
+use Piwik\Updates;
+
+class Updates_2_10_0_b7 extends Updates
+{
+
+ static function getSql()
+ {
+ $sqls = array();
+
+ $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
+
+ $archiveBlobTables = array_filter($archiveTables, function($name) {
+ return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
+ });
+
+ foreach ($archiveBlobTables as $table) {
+
+ $sqls["UPDATE " . $table . " SET name = 'Resolution_resolution' WHERE name = 'UserSettings_resolution'"] = false;
+ $sqls["UPDATE " . $table . " SET name = 'Resolution_configuration' WHERE name = 'UserSettings_configuration'"] = false;
+ }
+
+ return $sqls;
+ }
+
+ static function update()
+ {
+ Updater::updateDatabase(__FILE__, self::getSql());
+
+ $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+ try {
+ $pluginManager->activatePlugin('Resolution');
+ } catch(\Exception $e) {
+ }
+ }
+
+}
diff --git a/core/Version.php b/core/Version.php
index 4c3de8b7df60b84cfeb43237ec57d2ee5d8ee5af..7b382341efa3cb2fbae111e22b38fdaa7525f110 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -20,5 +20,5 @@ final class Version
* The current Piwik version.
* @var string
*/
- const VERSION = '2.10.0-b5';
+ const VERSION = '2.10.0-b7';
}
diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php
index c998e1913dee40dd1031c880f561a9788c833a68..ffb57b619548188b110ee8c2f360a9029299c54f 100644
--- a/libs/PiwikTracker/PiwikTracker.php
+++ b/libs/PiwikTracker/PiwikTracker.php
@@ -160,22 +160,28 @@ class PiwikTracker
*/
function __construct($idSite, $apiUrl = '')
{
- $this->userAgent = false;
- $this->localHour = false;
- $this->localMinute = false;
- $this->localSecond = false;
- $this->hasCookies = false;
- $this->plugins = false;
- $this->pageCustomVar = false;
+ $this->ecommerceItems = array();
+ $this->attributionInfo = false;
$this->eventCustomVar = false;
- $this->customData = false;
$this->forcedDatetime = false;
$this->forcedNewVisit = false;
- $this->token_auth = false;
- $this->attributionInfo = false;
- $this->ecommerceLastOrderTimestamp = false;
- $this->ecommerceItems = array();
$this->generationTime = false;
+ $this->pageCustomVar = false;
+ $this->customData = false;
+ $this->hasCookies = false;
+ $this->token_auth = false;
+ $this->userAgent = false;
+ $this->country = false;
+ $this->region = false;
+ $this->city = false;
+ $this->lat = false;
+ $this->long = false;
+ $this->width = false;
+ $this->height = false;
+ $this->plugins = false;
+ $this->localHour = false;
+ $this->localMinute = false;
+ $this->localSecond = false;
$this->idSite = $idSite;
$this->urlReferrer = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : false;
@@ -212,7 +218,7 @@ class PiwikTracker
$this->visitCount = 0;
$this->currentVisitTs = false;
$this->lastVisitTs = false;
- $this->lastEcommerceOrderTs = false;
+ $this->ecommerceLastOrderTimestamp = false;
// Allow debug while blocking the request
$this->requestTimeout = 600;
@@ -529,6 +535,8 @@ class PiwikTracker
/**
* Get cookie name with prefix and domain hash
+ * @param string $cookieName
+ * @return string
*/
protected function getCookieName($cookieName) {
// NOTE: If the cookie name is changed, we must also update the method in piwik.js with the same name.
@@ -553,8 +561,8 @@ class PiwikTracker
*
* @param string $category The Event Category (Videos, Music, Games...)
* @param string $action The Event's Action (Play, Pause, Duration, Add Playlist, Downloaded, Clicked...)
- * @param string $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
- * @param float $value (optional) The Event's value
+ * @param string|bool $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
+ * @param float|bool $value (optional) The Event's value
* @return mixed Response string or true if using bulk requests.
*/
public function doTrackEvent($category, $action, $name = false, $value = false)
@@ -568,7 +576,7 @@ class PiwikTracker
*
* @param string $contentName The name of the content. For instance 'Ad Foo Bar'
* @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
- * @param string|false $contentTarget (optional) The target of the content. For instance the URL of a landing page.
+ * @param string|bool $contentTarget (optional) The target of the content. For instance the URL of a landing page.
* @return mixed Response string or true if using bulk requests.
*/
public function doTrackContentImpression($contentName, $contentPiece = 'Unknown', $contentTarget = false)
@@ -584,7 +592,7 @@ class PiwikTracker
* @param string $interaction The name of the interaction with the content. For instance a 'click'
* @param string $contentName The name of the content. For instance 'Ad Foo Bar'
* @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
- * @param string|false $contentTarget (optional) The target the content leading to when an interaction occurs. For instance the URL of a landing page.
+ * @param string|bool $contentTarget (optional) The target the content leading to when an interaction occurs. For instance the URL of a landing page.
* @return mixed Response string or true if using bulk requests.
*/
public function doTrackContentInteraction($interaction, $contentName, $contentPiece = 'Unknown', $contentTarget = false)
@@ -891,9 +899,10 @@ class PiwikTracker
* @see doTrackEvent()
* @param string $category The Event Category (Videos, Music, Games...)
* @param string $action The Event's Action (Play, Pause, Duration, Add Playlist, Downloaded, Clicked...)
- * @param string $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
- * @param float $value (optional) The Event's value
+ * @param string|bool $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
+ * @param float|bool $value (optional) The Event's value
* @return string URL to piwik.php with all parameters set to track the pageview
+ * @throws
*/
public function getUrlTrackEvent($category, $action, $name = false, $value = false)
{
@@ -1199,7 +1208,7 @@ class PiwikTracker
$this->currentVisitTs = $parts[3];
$this->lastVisitTs = $parts[4];
if(isset($parts[5])) {
- $this->lastEcommerceOrderTs = $parts[5];
+ $this->ecommerceLastOrderTimestamp = $parts[5];
}
return true;
}
@@ -1496,14 +1505,13 @@ class PiwikTracker
'&_idts=' . $this->createTs .
'&_idvc=' . $this->visitCount .
(!empty($this->lastVisitTs) ? '&_viewts=' . $this->lastVisitTs : '' ) .
- (!empty($this->lastEcommerceOrderTs) ? '&_ects=' . $this->lastEcommerceOrderTs : '' ) .
+ (!empty($this->ecommerceLastOrderTimestamp) ? '&_ects=' . urlencode($this->ecommerceLastOrderTimestamp) : '') .
// These parameters are set by the JS, but optional when using API
(!empty($this->plugins) ? $this->plugins : '') .
(($this->localHour !== false && $this->localMinute !== false && $this->localSecond !== false) ? '&h=' . $this->localHour . '&m=' . $this->localMinute . '&s=' . $this->localSecond : '') .
(!empty($this->width) && !empty($this->height) ? '&res=' . $this->width . 'x' . $this->height : '') .
(!empty($this->hasCookies) ? '&cookie=' . $this->hasCookies : '') .
- (!empty($this->ecommerceLastOrderTimestamp) ? '&_ects=' . urlencode($this->ecommerceLastOrderTimestamp) : '') .
// Various important attributes
(!empty($this->customData) ? '&data=' . $this->customData : '') .
@@ -1694,7 +1702,7 @@ class PiwikTracker
// Set the 'id' cookie
$visitCount = $this->visitCount + 1;
- $cookieValue = $this->getVisitorId() . '.' . $this->createTs . '.' . $visitCount . '.' . $this->currentTs . '.' . $this->lastVisitTs . '.' . $this->lastEcommerceOrderTs;
+ $cookieValue = $this->getVisitorId() . '.' . $this->createTs . '.' . $visitCount . '.' . $this->currentTs . '.' . $this->lastVisitTs . '.' . $this->ecommerceLastOrderTimestamp;
$this->setCookie('id', $cookieValue, $this->configVisitorCookieTimeout);
// Set the 'cvar' cookie
diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php
index 322ffd0455ea11c5959707c4c044c87b5c4748e4..903611c9705feb23d72ab2705329176b091b2b19 100644
--- a/libs/upgradephp/upgrade.php
+++ b/libs/upgradephp/upgrade.php
@@ -633,8 +633,8 @@ function _readfile($filename, $byteStart, $byteEnd, $useIncludePath = false, $co
for ($pos = $byteStart; $pos < $byteEnd && !feof($handle); $pos = ftell($handle)) {
echo fread($handle, min(8192, $byteEnd - $pos));
- ob_flush();
- flush();
+ @ob_flush();
+ @flush();
}
fclose($handle);
diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md
index a9d53d8dfc16910b3ba7113a39ac4b50c49b2721..d7eb5aff3a552dc623ea15c01148c6cacd3e2895 100644
--- a/misc/log-analytics/README.md
+++ b/misc/log-analytics/README.md
@@ -22,6 +22,12 @@ If you wish to track all requests the following command would be used:
python /path/to/piwik/misc/log-analytics/import_logs.py --url=http://mysite/piwik/ --idsite=1234 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots access.log
+### Format Specific Details
+
+* If you are importing Netscaler log files, make sure to specify the **--iis-time-taken-secs** option. Netscaler stores
+ the time-taken field in seconds while most other formats use milliseconds. Using this option will ensure that the
+ log importer interprets the field correctly.
+
## How to import your logs automatically every day?
You must first make sure your logs are automatically rotated every day. The most
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 7b46ea3e11b01d738b0ef5a9e229fe83336c1b39..9e57eeb4cb40a8fe7c62873fc77ac058cd78b141 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -187,48 +187,76 @@ class RegexFormat(BaseFormat):
def get_all(self,):
return self.matched.groupdict()
-class IisFormat(RegexFormat):
+class W3cExtendedFormat(RegexFormat):
+
+ FIELDS_LINE_PREFIX = '#Fields: '
+
+ fields = {
+ 'date': '(?P<date>^\d+[-\d+]+',
+ 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together not sure how to fix ATM.
+ 'cs-uri-stem': '(?P<path>/\S*)',
+ 'cs-uri-query': '(?P<query_string>\S*)',
+ 'c-ip': '"?(?P<ip>[\d*.]*)"?',
+ 'cs(User-Agent)': '(?P<user_agent>".*?"|\S+)',
+ 'cs(Referer)': '(?P<referrer>\S+)',
+ 'sc-status': '(?P<status>\d+)',
+ 'sc-bytes': '(?P<length>\S+)',
+ 'cs-host': '(?P<host>\S+)',
+ 'cs-username': '(?P<userid>\S+)',
+ 'time-taken': '(?P<generation_time_milli>\d+)'
+ }
def __init__(self):
- super(IisFormat, self).__init__('iis', None, '%Y-%m-%d %H:%M:%S')
+ super(W3cExtendedFormat, self).__init__('w3c_extended', None, '%Y-%m-%d %H:%M:%S')
def check_format(self, file):
- line = file.readline()
- if not line.startswith('#Software: Microsoft Internet Information Services '):
+ # collect all header lines and the first line of the logfile
+ header_lines = []
+ while True:
+ line = file.readline()
+
+ if line.startswith('#'):
+ header_lines.append(line)
+ else:
+ break
+ first_line = line
+ fields_line = next((line for line in header_lines if line.startswith(W3cExtendedFormat.FIELDS_LINE_PREFIX)), None)
+
+ if not header_lines or not fields_line:
file.seek(0)
return
- # Skip the next 2 lines.
- for i in xrange(2):
- file.readline()
- # Parse the 4th line (regex)
+
+ # Parse the 4th 'Fields: ' line to create the regex to use
full_regex = []
- line = file.readline()
- fields = {
- 'date': '(?P<date>^\d+[-\d+]+',
- 'time': '[\d+:]+)',
- 'cs-uri-stem': '(?P<path>/\S*)',
- 'cs-uri-query': '(?P<query_string>\S*)',
- 'c-ip': '(?P<ip>[\d*.]*)',
- 'cs(User-Agent)': '(?P<user_agent>\S+)',
- 'cs(Referer)': '(?P<referrer>\S+)',
- 'sc-status': '(?P<status>\d+)',
- 'sc-bytes': '(?P<length>\S+)',
- 'cs-host': '(?P<host>\S+)',
- }
+
+ expected_fields = W3cExtendedFormat.fields.copy() # turn custom field mapping into field => regex mapping
+ for mapped_field_name, field_name in config.options.custom_w3c_fields.iteritems():
+ expected_fields[mapped_field_name] = W3cExtendedFormat.fields[field_name]
+ del expected_fields[field_name]
+
+ # if the --w3c-time-taken-secs option is used, make sure the time-taken field is interpreted as seconds
+ if config.options.w3c_time_taken_in_secs:
+ expected_fields['time-taken'] = '(?P<generation_time_secs>\S+)'
+ else:
+ # check if we're importing netscaler logs and if so, issue a warning
+ if 'netscaler' in header_lines[1].lower():
+ logging.info("WARNING: netscaler log file being parsed without --w3c-time-taken-secs option. Netscaler"
+ " stores second values in the time-taken field. If your logfile does this, the aforementioned"
+ " option must be used in order to get accurate generation times.")
+
# Skip the 'Fields: ' prefix.
- line = line[9:]
- for field in line.split():
+ fields_line = fields_line[9:]
+ for field in fields_line.split():
try:
- regex = fields[field]
+ regex = expected_fields[field]
except KeyError:
regex = '\S+'
full_regex.append(regex)
self.regex = re.compile(' '.join(full_regex))
- start_pos = file.tell()
- nextline = file.readline()
+ start_pos = file.tell() - len(first_line)
file.seek(start_pos)
- return self.check_format_line(nextline)
+ return self.check_format_line(first_line)
_HOST_PREFIX = '(?P<host>[\w\-\.]*)(?::\d+)? '
_COMMON_LOG_FORMAT = (
@@ -252,7 +280,8 @@ FORMATS = {
'common_vhost': RegexFormat('common_vhost', _HOST_PREFIX + _COMMON_LOG_FORMAT),
'ncsa_extended': RegexFormat('ncsa_extended', _NCSA_EXTENDED_LOG_FORMAT),
'common_complete': RegexFormat('common_complete', _HOST_PREFIX + _NCSA_EXTENDED_LOG_FORMAT),
- 'iis': IisFormat(),
+ 'w3c_extended': W3cExtendedFormat(),
+ 'iis': W3cExtendedFormat(), # for backwards compatibility TODO test
's3': RegexFormat('s3', _S3_LOG_FORMAT),
'icecast2': RegexFormat('icecast2', _ICECAST2_LOG_FORMAT),
'nginx_json': JsonFormat('nginx_json'),
@@ -485,8 +514,37 @@ class Configuration(object):
'--download-extensions', dest='download_extensions', default=None,
help="By default Piwik tracks as Downloads the most popular file extensions. If you set this parameter (format: pdf,doc,...) then files with an extension found in the list will be imported as Downloads, other file extensions downloads will be skipped."
)
+ option_parser.add_option(
+ '--w3c-map-field', action='callback', callback=self._set_w3c_field_map, type='string',
+ help="Map a custom log entry field in your W3C log to a default one. Use this option to load custom log "
+ "files that use the W3C extended log format such as those from the Advanced Logging W3C module. Used "
+ "as, eg, --w3c-map-field my-date=date. Recognized default fields include: %s"
+ % (', '.join(W3cExtendedFormat.fields.keys()))
+ )
+ option_parser.add_option(
+ '--w3c-time-taken-secs', action='store_true', default=False, dest='w3c_time_taken_in_secs',
+ help="If set, interprets the time-taken W3C log field as a number of seconds. This must be set for importing"
+ " netscaler logs."
+ )
return option_parser
+ def _set_w3c_field_map(self, option, opt_str, value, parser):
+ parts = value.split('=')
+
+ if len(parts) != 2:
+ fatal_error("Invalid --w3c-map-field option: '%s'" % value)
+
+ custom_name, default_name = parts
+
+ if default_name not in W3cExtendedFormat.fields:
+ fatal_error("custom W3C field mapping error: don't know how to parse and use the '%' field" % default_name)
+ return
+
+ if not hasattr(parser.values, 'custom_w3c_fields'):
+ parser.values.custom_w3c_fields = {}
+
+ parser.values.custom_w3c_fields[custom_name] = default_name
+
def _parse_args(self, option_parser):
"""
Parse the command line args and create self.options and self.filenames.
@@ -500,6 +558,9 @@ class Configuration(object):
print(option_parser.format_help())
sys.exit(1)
+ if not hasattr(self.options, 'custom_w3c_fields'):
+ self.options.custom_w3c_fields = {}
+
# Configure logging before calling logging.{debug,info}.
logging.basicConfig(
format='%(asctime)s: [%(levelname)s] %(message)s',
@@ -1250,8 +1311,9 @@ class Recorder(object):
'cdt': self.date_to_piwik(hit.date),
'idsite': site_id,
'dp': '0' if config.options.reverse_dns else '1',
- 'ua': hit.user_agent.encode('utf8'),
+ 'ua': hit.user_agent.encode('utf8')
}
+
if config.options.replay_tracking:
# prevent request to be force recorded when option replay-tracking
args['rec'] = '0'
@@ -1499,7 +1561,7 @@ class Parser(object):
format = False
- # check the format using the file (for formats like the IIS one)
+ # check the format using the file (for formats like the W3cExtendedFormat one)
format = Parser.check_format(file)
# check the format using the first N lines (to avoid irregular ones)
@@ -1507,6 +1569,9 @@ class Parser(object):
limit = 100000
while not format and lineno < limit:
line = file.readline()
+ if not line: # if at eof, don't keep looping
+ break
+
lineno = lineno + 1
logging.debug("Detecting format against line %i" % lineno)
@@ -1610,7 +1675,7 @@ class Parser(object):
except BaseFormatException:
hit.path, _, hit.query_string = hit.full_path.partition(config.options.query_string_delimiter)
- # IIS detaults to - when there is no query string, but we want empty string
+ # W3cExtendedFormat detaults to - when there is no query string, but we want empty string
if hit.query_string == '-':
hit.query_string = ''
@@ -1625,6 +1690,11 @@ class Parser(object):
try:
hit.user_agent = format.get('user_agent')
+
+ # in case a format parser included enclosing quotes, remove them so they are not
+ # sent to Piwik
+ if hit.user_agent.startswith('"'):
+ hit.user_agent = hit.user_agent[1:-1]
except BaseFormatException:
hit.user_agent = ''
@@ -1632,7 +1702,7 @@ class Parser(object):
try:
hit.length = int(format.get('length'))
except (ValueError, BaseFormatException):
- # Some lines or formats don't have a length (e.g. 304 redirects, IIS logs)
+ # Some lines or formats don't have a length (e.g. 304 redirects, W3C logs)
hit.length = 0
try:
@@ -1641,7 +1711,10 @@ class Parser(object):
try:
hit.generation_time_milli = int(format.get('generation_time_micro')) / 1000
except BaseFormatException:
- hit.generation_time_milli = 0
+ try:
+ hit.generation_time_milli = int(format.get('generation_time_secs')) * 1000
+ except BaseFormatException:
+ hit.generation_time_milli = 0
if config.options.log_hostname:
hit.host = config.options.log_hostname
@@ -1652,6 +1725,16 @@ class Parser(object):
# Some formats have no host.
pass
+ # Add userid
+ try:
+ hit.userid = None
+
+ userid = format.get('userid')
+ if userid != '-':
+ hit.args['uid'] = userid
+ except:
+ pass
+
# Check if the hit must be excluded.
if not all((method(hit) for method in self.check_methods)):
continue
diff --git a/misc/log-analytics/tests/logs/iis_custom.log b/misc/log-analytics/tests/logs/iis_custom.log
new file mode 100644
index 0000000000000000000000000000000000000000..73797b64ddc641a07209dbb212d307bef0127e60
--- /dev/null
+++ b/misc/log-analytics/tests/logs/iis_custom.log
@@ -0,0 +1,7 @@
+#Software: IIS Advanced Logging Module
+#Version: 1.0
+#Start-Date: 2014-11-18 00:00:00.128
+#Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS
+2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 - "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109
+2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 - "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0
+2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359
diff --git a/misc/log-analytics/tests/logs/netscaler.log b/misc/log-analytics/tests/logs/netscaler.log
new file mode 100644
index 0000000000000000000000000000000000000000..380c09d2c449c25a3fb410758f676673749adfb4
--- /dev/null
+++ b/misc/log-analytics/tests/logs/netscaler.log
@@ -0,0 +1,5 @@
+#Version: 1.0
+#Software: Netscaler Web Logging(NSWL)
+#Date: 2014-02-18 11:55:13
+#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer)
+2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 1 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - -
diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py
index 37af5eee8f5ab9bf9dd3b8ae1eaf35d0cc8a1d03..73811a37176e32d60f566633e52956b2d3a02489 100644
--- a/misc/log-analytics/tests/tests.py
+++ b/misc/log-analytics/tests/tests.py
@@ -1,6 +1,7 @@
# vim: et sw=4 ts=4:
import functools
import os
+import datetime
import import_logs
@@ -23,19 +24,30 @@ def tearDownModule():
def test_format_detection():
def _test(format_name):
file = open('logs/%s.log' % format_name)
+ import_logs.config = Config()
format = import_logs.Parser.detect_format(file)
assert(format is not None)
- assert(format.name == format_name)
+ if format_name == 'iis':
+ assert(format.name == 'w3c_extended')
+ else:
+ assert(format.name == format_name)
def _test_junk(format_name):
tmp_path = add_junk_to_file('logs/%s.log' % format_name)
file = open(tmp_path)
+ import_logs.config = Config()
format = import_logs.Parser.detect_format(file)
assert(format is not None)
- assert(format.name == format_name)
+ if format_name == 'iis':
+ assert(format.name == 'w3c_extended')
+ else:
+ assert(format.name == format_name)
for format_name in import_logs.FORMATS.iterkeys():
+ if format_name == 'w3c_extended': # tested by iis and netscaler log files
+ continue
+
f = functools.partial(_test, format_name)
f.description = 'Testing autodetection of format ' + format_name
yield f
@@ -64,6 +76,8 @@ class Options(object):
included_paths = []
enable_http_errors = False
download_extensions = 'doc,pdf'
+ custom_w3c_fields = {}
+ w3c_time_taken_in_secs = False
class Config(object):
"""Mock configuration."""
@@ -183,6 +197,8 @@ def test_replay_tracking_arguments():
def parse_log_file_line(format_name, file_):
format = import_logs.FORMATS[format_name]
+ import_logs.config.options.custom_w3c_fields = {}
+
file = open(file_)
match = format.check_format(file)
file.close()
@@ -226,7 +242,8 @@ def check_iis_groups(groups):
assert groups['host'] == 'example.com'
expected_hit_properties = ['date', 'path', 'query_string', 'ip', 'referrer', 'user_agent',
- 'status', 'length', 'host']
+ 'status', 'length', 'host', 'userid', 'generation_time_milli']
+
for property_name in groups.keys():
assert property_name in expected_hit_properties
@@ -272,15 +289,135 @@ def test_format_parsing():
_test(format_name, tmp_path)
for format_name in import_logs.FORMATS.iterkeys():
+ if format_name == 'w3c_extended': # tested by IIS and netscaler logs
+ continue
+
f = functools.partial(_test, format_name, 'logs/' + format_name + '.log')
f.description = 'Testing parsing of format "%s"' % format_name
yield f
f = functools.partial(_test_with_junk, format_name, 'logs/' + format_name + '.log')
- f.description = 'Testing parsin of format "%s" with junk appended to path' % format_name
+ f.description = 'Testing parsing of format "%s" with junk appended to path' % format_name
yield f
f = functools.partial(_test, 'common', 'logs/ncsa_extended.log')
f.description = 'Testing parsing of format "common" with ncsa_extended log'
yield f
+
+def test_iis_custom_format():
+ """test IIS custom format name parsing."""
+
+ file_ = 'logs/iis_custom.log'
+
+ # have to override previous globals override for this test
+ import_logs.config.options.custom_w3c_fields = {
+ 'date-local': 'date',
+ 'time-local': 'time',
+ 'cs(Host)': 'cs-host',
+ 'TimeTakenMS': 'time-taken'
+ }
+ Recorder.recorders = []
+ import_logs.parser = import_logs.Parser()
+ import_logs.config.format = None
+ import_logs.config.options.enable_http_redirects = True
+ import_logs.config.options.enable_http_errors = True
+ import_logs.config.options.replay_tracking = False
+ import_logs.parser.parse(file_)
+
+ hits = [hit.__dict__ for hit in Recorder.recorders]
+
+ assert hits[0]['status'] == '200'
+ assert hits[0]['is_error'] == False
+ assert hits[0]['extension'] == u'/products/theproduct'
+ assert hits[0]['is_download'] == False
+ assert hits[0]['referrer'] == u'"http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en"'
+ assert hits[0]['args'] == {}
+ assert hits[0]['generation_time_milli'] == 109
+ assert hits[0]['host'] == 'foo'
+ assert hits[0]['filename'] == 'logs/iis_custom.log'
+ assert hits[0]['is_redirect'] == False
+ assert hits[0]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+ assert hits[0]['lineno'] == 4
+ assert hits[0]['ip'] == u'70.95.0.0'
+ assert hits[0]['query_string'] == ''
+ assert hits[0]['path'] == u'/Products/theProduct'
+ assert hits[0]['is_robot'] == False
+ assert hits[0]['full_path'] == u'/Products/theProduct'
+ assert hits[0]['user_agent'] == u'Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36'
+
+ assert hits[1]['status'] == u'301'
+ assert hits[1]['is_error'] == False
+ assert hits[1]['extension'] == u'/topic/hw43061'
+ assert hits[1]['is_download'] == False
+ assert hits[1]['referrer'] == ''
+ assert hits[1]['args'] == {}
+ assert hits[1]['generation_time_milli'] == 0
+ assert hits[1]['host'] == 'foo'
+ assert hits[1]['filename'] == 'logs/iis_custom.log'
+ assert hits[1]['is_redirect'] == True
+ assert hits[1]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+ assert hits[1]['lineno'] == 5
+ assert hits[1]['ip'] == '70.95.32.0'
+ assert hits[1]['query_string'] == ''
+ assert hits[1]['path'] == u'/Topic/hw43061'
+ assert hits[1]['is_robot'] == False
+ assert hits[1]['full_path'] == u'/Topic/hw43061'
+ assert hits[1]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36'
+
+ assert hits[2]['status'] == u'404'
+ assert hits[2]['is_error'] == True
+ assert hits[2]['extension'] == u'/hello/world/6,681965'
+ assert hits[2]['is_download'] == False
+ assert hits[2]['referrer'] == ''
+ assert hits[2]['args'] == {}
+ assert hits[2]['generation_time_milli'] == 359
+ assert hits[2]['host'] == 'foo'
+ assert hits[2]['filename'] == 'logs/iis_custom.log'
+ assert hits[2]['is_redirect'] == False
+ assert hits[2]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+ assert hits[2]['lineno'] == 6
+ assert hits[2]['ip'] == u'173.5.0.0'
+ assert hits[2]['query_string'] == ''
+ assert hits[2]['path'] == u'/hello/world/6,681965'
+ assert hits[2]['is_robot'] == False
+ assert hits[2]['full_path'] == u'/hello/world/6,681965'
+ assert hits[2]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36'
+
+def test_netscaler_parsing():
+ """test parsing of netscaler logs (which use extended W3C log format)"""
+
+ file_ = 'logs/netscaler.log'
+
+ # have to override previous globals override for this test
+ import_logs.config.options.custom_w3c_fields = {}
+ Recorder.recorders = []
+ import_logs.parser = import_logs.Parser()
+ import_logs.config.format = None
+ import_logs.config.options.enable_http_redirects = True
+ import_logs.config.options.enable_http_errors = True
+ import_logs.config.options.replay_tracking = False
+ import_logs.config.options.w3c_time_taken_in_secs = True
+ import_logs.parser.parse(file_)
+
+ hits = [hit.__dict__ for hit in Recorder.recorders]
+
+ assert hits[0]['status'] == u'302'
+ assert hits[0]['userid'] == None
+ assert hits[0]['is_error'] == False
+ assert hits[0]['extension'] == u'jsp'
+ assert hits[0]['is_download'] == False
+ assert hits[0]['referrer'] == ''
+ assert hits[0]['args'] == {}
+ assert hits[0]['generation_time_milli'] == 1000
+ assert hits[0]['host'] == 'foo'
+ assert hits[0]['filename'] == 'logs/netscaler.log'
+ assert hits[0]['is_redirect'] == True
+ assert hits[0]['date'] == datetime.datetime(2012, 8, 16, 11, 55, 13)
+ assert hits[0]['lineno'] == 4
+ assert hits[0]['ip'] == u'172.20.1.0'
+ assert hits[0]['query_string'] == ''
+ assert hits[0]['path'] == u'/Citrix/XenApp/Wan/auth/login.jsp'
+ assert hits[0]['is_robot'] == False
+ assert hits[0]['full_path'] == u'/Citrix/XenApp/Wan/auth/login.jsp'
+ assert hits[0]['user_agent'] == u'Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022)'
\ No newline at end of file
diff --git a/plugins/Actions/Actions/ActionSiteSearch.php b/plugins/Actions/Actions/ActionSiteSearch.php
index d19cfaa6fc71ac0942b926ed2e25c803d017e1ba..392e3777f8dc4a15675c9d74d0baac89125add9c 100644
--- a/plugins/Actions/Actions/ActionSiteSearch.php
+++ b/plugins/Actions/Actions/ActionSiteSearch.php
@@ -180,14 +180,19 @@ class ActionSiteSearch extends Action
if (is_array($actionName)) {
$actionName = reset($actionName);
}
- $actionName = trim(urldecode($actionName));
+
+ $actionName = PageUrl::urldecodeValidUtf8($actionName);
+ $actionName = trim($actionName);
if (empty($actionName)) {
return false;
}
+
if (is_array($categoryName)) {
$categoryName = reset($categoryName);
}
- $categoryName = trim(urldecode($categoryName));
+ $categoryName = PageUrl::urldecodeValidUtf8($categoryName);
+ $categoryName = trim($categoryName);
+
return array($url, $actionName, $categoryName, $count);
}
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index e168f5d742530d4075d4388d7262164944e83d81..34873eb194a164bd173cdbc3293efe493d8b2cc0 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -198,9 +198,9 @@ class ArchivingHelper
if (($idSubtable = $row->getIdSubDataTable()) !== null
|| $id === DataTable::ID_SUMMARY_ROW
) {
- if ($idSubtable !== null) {
- $subtable = Manager::getInstance()->getTable($idSubtable);
- self::deleteInvalidSummedColumnsFromDataTable($subtable);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
+ self::deleteInvalidSummedColumnsFromDataTable($subTable);
}
if ($row instanceof DataTableSummaryRow) {
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..61ceb20717340331a9a2bfd088f0d03a9e1020f4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -66,6 +66,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -77,7 +78,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -164,6 +164,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -175,7 +176,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..61ceb20717340331a9a2bfd088f0d03a9e1020f4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -66,6 +66,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -77,7 +78,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -164,6 +164,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -175,7 +176,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..61ceb20717340331a9a2bfd088f0d03a9e1020f4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -66,6 +66,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -77,7 +78,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -164,6 +164,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -175,7 +176,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..61ceb20717340331a9a2bfd088f0d03a9e1020f4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -66,6 +66,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -77,7 +78,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -164,6 +164,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -175,7 +176,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..61ceb20717340331a9a2bfd088f0d03a9e1020f4 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -66,6 +66,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -77,7 +78,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -164,6 +164,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -175,7 +176,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 8ad0ac8638c27a93cb4bef80ecdd29b56876430b..2f10c8b496252d1527a47864cf39d18b359b7ae3 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 8ad0ac8638c27a93cb4bef80ecdd29b56876430b
+Subproject commit 2f10c8b496252d1527a47864cf39d18b359b7ae3
diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
index da580cc910c8c2813c1da76dacb5d96ea3280535..eedf7e3f014d7763382f9e9d7039f13dbb62e514 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -119,12 +119,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -139,6 +139,7 @@
<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -150,7 +151,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index c8fe989045396c2cb502b2e8a2b415e0f4802a85..8ab0ffe9251ab7d7654f511be71cb47b71ce201d 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -80,7 +80,7 @@ function getBrowserName($label)
*/
function getBrowserLogo($short)
{
- $path = 'plugins/UserSettings/images/browsers/%s.gif';
+ $path = 'plugins/DevicesDetection/images/browsers/%s.gif';
// If name is given instead of short code, try to find matching shortcode
if (strlen($short) > 2) {
@@ -258,7 +258,7 @@ function _mapLegacyOsShortCodes($shortCode)
*/
function getOsLogo($short)
{
- $path = 'plugins/UserSettings/images/os/%s.gif';
+ $path = 'plugins/DevicesDetection/images/os/%s.gif';
$short = _mapLegacyOsShortCodes($short);
diff --git a/plugins/UserSettings/images/browsers/AA.gif b/plugins/DevicesDetection/images/browsers/AA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AA.gif
rename to plugins/DevicesDetection/images/browsers/AA.gif
diff --git a/plugins/UserSettings/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AB.gif
rename to plugins/DevicesDetection/images/browsers/AB.gif
diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AG.gif
rename to plugins/DevicesDetection/images/browsers/AG.gif
diff --git a/plugins/UserSettings/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AM.gif
rename to plugins/DevicesDetection/images/browsers/AM.gif
diff --git a/plugins/UserSettings/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AN.gif
rename to plugins/DevicesDetection/images/browsers/AN.gif
diff --git a/plugins/UserSettings/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AR.gif
rename to plugins/DevicesDetection/images/browsers/AR.gif
diff --git a/plugins/UserSettings/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AV.gif
rename to plugins/DevicesDetection/images/browsers/AV.gif
diff --git a/plugins/UserSettings/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AW.gif
rename to plugins/DevicesDetection/images/browsers/AW.gif
diff --git a/plugins/UserSettings/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/B2.gif
rename to plugins/DevicesDetection/images/browsers/B2.gif
diff --git a/plugins/UserSettings/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BB.gif
rename to plugins/DevicesDetection/images/browsers/BB.gif
diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BD.gif
rename to plugins/DevicesDetection/images/browsers/BD.gif
diff --git a/plugins/UserSettings/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BE.gif
rename to plugins/DevicesDetection/images/browsers/BE.gif
diff --git a/plugins/UserSettings/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BJ.gif
rename to plugins/DevicesDetection/images/browsers/BJ.gif
diff --git a/plugins/UserSettings/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BP.gif
rename to plugins/DevicesDetection/images/browsers/BP.gif
diff --git a/plugins/UserSettings/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BS.gif
rename to plugins/DevicesDetection/images/browsers/BS.gif
diff --git a/plugins/UserSettings/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BX.gif
rename to plugins/DevicesDetection/images/browsers/BX.gif
diff --git a/plugins/UserSettings/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CA.gif
rename to plugins/DevicesDetection/images/browsers/CA.gif
diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CD.gif
rename to plugins/DevicesDetection/images/browsers/CD.gif
diff --git a/plugins/UserSettings/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CF.gif
rename to plugins/DevicesDetection/images/browsers/CF.gif
diff --git a/plugins/UserSettings/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CH.gif
rename to plugins/DevicesDetection/images/browsers/CH.gif
diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CK.gif
rename to plugins/DevicesDetection/images/browsers/CK.gif
diff --git a/plugins/UserSettings/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CM.gif
rename to plugins/DevicesDetection/images/browsers/CM.gif
diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CN.gif
rename to plugins/DevicesDetection/images/browsers/CN.gif
diff --git a/plugins/UserSettings/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CO.gif
rename to plugins/DevicesDetection/images/browsers/CO.gif
diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CP.gif
rename to plugins/DevicesDetection/images/browsers/CP.gif
diff --git a/plugins/UserSettings/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CS.gif
rename to plugins/DevicesDetection/images/browsers/CS.gif
diff --git a/plugins/UserSettings/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/DF.gif
rename to plugins/DevicesDetection/images/browsers/DF.gif
diff --git a/plugins/UserSettings/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/DI.gif
rename to plugins/DevicesDetection/images/browsers/DI.gif
diff --git a/plugins/UserSettings/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/EL.gif
rename to plugins/DevicesDetection/images/browsers/EL.gif
diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/EP.gif
rename to plugins/DevicesDetection/images/browsers/EP.gif
diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ES.gif
rename to plugins/DevicesDetection/images/browsers/ES.gif
diff --git a/plugins/UserSettings/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FB.gif
rename to plugins/DevicesDetection/images/browsers/FB.gif
diff --git a/plugins/UserSettings/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FD.gif
rename to plugins/DevicesDetection/images/browsers/FD.gif
diff --git a/plugins/UserSettings/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FE.gif
rename to plugins/DevicesDetection/images/browsers/FE.gif
diff --git a/plugins/UserSettings/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FF.gif
rename to plugins/DevicesDetection/images/browsers/FF.gif
diff --git a/plugins/UserSettings/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FL.gif
rename to plugins/DevicesDetection/images/browsers/FL.gif
diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FN.gif
rename to plugins/DevicesDetection/images/browsers/FN.gif
diff --git a/plugins/UserSettings/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/GA.gif
rename to plugins/DevicesDetection/images/browsers/GA.gif
diff --git a/plugins/UserSettings/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/GE.gif
rename to plugins/DevicesDetection/images/browsers/GE.gif
diff --git a/plugins/UserSettings/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/HA.gif
rename to plugins/DevicesDetection/images/browsers/HA.gif
diff --git a/plugins/UserSettings/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/HJ.gif
rename to plugins/DevicesDetection/images/browsers/HJ.gif
diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IA.gif
rename to plugins/DevicesDetection/images/browsers/IA.gif
diff --git a/plugins/UserSettings/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IB.gif
rename to plugins/DevicesDetection/images/browsers/IB.gif
diff --git a/plugins/UserSettings/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IC.gif
rename to plugins/DevicesDetection/images/browsers/IC.gif
diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ID.gif
rename to plugins/DevicesDetection/images/browsers/ID.gif
diff --git a/plugins/UserSettings/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IE.gif
rename to plugins/DevicesDetection/images/browsers/IE.gif
diff --git a/plugins/UserSettings/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IM.gif
rename to plugins/DevicesDetection/images/browsers/IM.gif
diff --git a/plugins/UserSettings/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IR.gif
rename to plugins/DevicesDetection/images/browsers/IR.gif
diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IW.gif
rename to plugins/DevicesDetection/images/browsers/IW.gif
diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KI.gif
rename to plugins/DevicesDetection/images/browsers/KI.gif
diff --git a/plugins/UserSettings/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KM.gif
rename to plugins/DevicesDetection/images/browsers/KM.gif
diff --git a/plugins/UserSettings/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KO.gif
rename to plugins/DevicesDetection/images/browsers/KO.gif
diff --git a/plugins/UserSettings/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KP.gif
rename to plugins/DevicesDetection/images/browsers/KP.gif
diff --git a/plugins/UserSettings/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KZ.gif
rename to plugins/DevicesDetection/images/browsers/KZ.gif
diff --git a/plugins/UserSettings/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LB.gif
rename to plugins/DevicesDetection/images/browsers/LB.gif
diff --git a/plugins/UserSettings/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LG.gif
rename to plugins/DevicesDetection/images/browsers/LG.gif
diff --git a/plugins/UserSettings/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LI.gif
rename to plugins/DevicesDetection/images/browsers/LI.gif
diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LS.gif
rename to plugins/DevicesDetection/images/browsers/LS.gif
diff --git a/plugins/UserSettings/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LX.gif
rename to plugins/DevicesDetection/images/browsers/LX.gif
diff --git a/plugins/UserSettings/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MC.gif
rename to plugins/DevicesDetection/images/browsers/MC.gif
diff --git a/plugins/UserSettings/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MF.gif
rename to plugins/DevicesDetection/images/browsers/MF.gif
diff --git a/plugins/UserSettings/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MI.gif
rename to plugins/DevicesDetection/images/browsers/MI.gif
diff --git a/plugins/UserSettings/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MO.gif
rename to plugins/DevicesDetection/images/browsers/MO.gif
diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MS.gif
rename to plugins/DevicesDetection/images/browsers/MS.gif
diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MX.gif
rename to plugins/DevicesDetection/images/browsers/MX.gif
diff --git a/plugins/UserSettings/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NB.gif
rename to plugins/DevicesDetection/images/browsers/NB.gif
diff --git a/plugins/UserSettings/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NF.gif
rename to plugins/DevicesDetection/images/browsers/NF.gif
diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NL.gif
rename to plugins/DevicesDetection/images/browsers/NL.gif
diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NP.gif
rename to plugins/DevicesDetection/images/browsers/NP.gif
diff --git a/plugins/UserSettings/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NS.gif
rename to plugins/DevicesDetection/images/browsers/NS.gif
diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OB.gif
rename to plugins/DevicesDetection/images/browsers/OB.gif
diff --git a/plugins/UserSettings/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OI.gif
rename to plugins/DevicesDetection/images/browsers/OI.gif
diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ON.gif
rename to plugins/DevicesDetection/images/browsers/ON.gif
diff --git a/plugins/UserSettings/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OP.gif
rename to plugins/DevicesDetection/images/browsers/OP.gif
diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OR.gif
rename to plugins/DevicesDetection/images/browsers/OR.gif
diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OV.gif
rename to plugins/DevicesDetection/images/browsers/OV.gif
diff --git a/plugins/UserSettings/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OW.gif
rename to plugins/DevicesDetection/images/browsers/OW.gif
diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PL.gif
rename to plugins/DevicesDetection/images/browsers/PL.gif
diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PM.gif
rename to plugins/DevicesDetection/images/browsers/PM.gif
diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PO.gif
rename to plugins/DevicesDetection/images/browsers/PO.gif
diff --git a/plugins/UserSettings/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PU.gif
rename to plugins/DevicesDetection/images/browsers/PU.gif
diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PW.gif
rename to plugins/DevicesDetection/images/browsers/PW.gif
diff --git a/plugins/UserSettings/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PX.gif
rename to plugins/DevicesDetection/images/browsers/PX.gif
diff --git a/plugins/UserSettings/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/RK.gif
rename to plugins/DevicesDetection/images/browsers/RK.gif
diff --git a/plugins/UserSettings/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SA.gif
rename to plugins/DevicesDetection/images/browsers/SA.gif
diff --git a/plugins/UserSettings/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SE.gif
rename to plugins/DevicesDetection/images/browsers/SE.gif
diff --git a/plugins/UserSettings/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SF.gif
rename to plugins/DevicesDetection/images/browsers/SF.gif
diff --git a/plugins/UserSettings/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SH.gif
rename to plugins/DevicesDetection/images/browsers/SH.gif
diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SL.gif
rename to plugins/DevicesDetection/images/browsers/SL.gif
diff --git a/plugins/UserSettings/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SM.gif
rename to plugins/DevicesDetection/images/browsers/SM.gif
diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TB.gif
rename to plugins/DevicesDetection/images/browsers/TB.gif
diff --git a/plugins/UserSettings/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TI.gif
rename to plugins/DevicesDetection/images/browsers/TI.gif
diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TZ.gif
rename to plugins/DevicesDetection/images/browsers/TZ.gif
diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UC.gif
rename to plugins/DevicesDetection/images/browsers/UC.gif
diff --git a/plugins/UserSettings/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UN.gif
rename to plugins/DevicesDetection/images/browsers/UN.gif
diff --git a/plugins/UserSettings/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UNK.gif
rename to plugins/DevicesDetection/images/browsers/UNK.gif
diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WE.gif
rename to plugins/DevicesDetection/images/browsers/WE.gif
diff --git a/plugins/UserSettings/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WO.gif
rename to plugins/DevicesDetection/images/browsers/WO.gif
diff --git a/plugins/UserSettings/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WP.gif
rename to plugins/DevicesDetection/images/browsers/WP.gif
diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/YA.gif
rename to plugins/DevicesDetection/images/browsers/YA.gif
diff --git a/plugins/UserSettings/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/3DS.gif
rename to plugins/DevicesDetection/images/os/3DS.gif
diff --git a/plugins/UserSettings/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AIX.gif
rename to plugins/DevicesDetection/images/os/AIX.gif
diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AMG.gif
rename to plugins/DevicesDetection/images/os/AMG.gif
diff --git a/plugins/UserSettings/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AMI.gif
rename to plugins/DevicesDetection/images/os/AMI.gif
diff --git a/plugins/UserSettings/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AND.gif
rename to plugins/DevicesDetection/images/os/AND.gif
diff --git a/plugins/UserSettings/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif
similarity index 100%
rename from plugins/UserSettings/images/os/ARL.gif
rename to plugins/DevicesDetection/images/os/ARL.gif
diff --git a/plugins/UserSettings/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BBX.gif
rename to plugins/DevicesDetection/images/os/BBX.gif
diff --git a/plugins/UserSettings/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BEO.gif
rename to plugins/DevicesDetection/images/os/BEO.gif
diff --git a/plugins/UserSettings/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BLB.gif
rename to plugins/DevicesDetection/images/os/BLB.gif
diff --git a/plugins/UserSettings/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BSD.gif
rename to plugins/DevicesDetection/images/os/BSD.gif
diff --git a/plugins/UserSettings/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BTR.gif
rename to plugins/DevicesDetection/images/os/BTR.gif
diff --git a/plugins/UserSettings/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif
similarity index 100%
rename from plugins/UserSettings/images/os/CES.gif
rename to plugins/DevicesDetection/images/os/CES.gif
diff --git a/plugins/UserSettings/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/COS.gif
rename to plugins/DevicesDetection/images/os/COS.gif
diff --git a/plugins/UserSettings/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif
similarity index 100%
rename from plugins/UserSettings/images/os/DFB.gif
rename to plugins/DevicesDetection/images/os/DFB.gif
diff --git a/plugins/UserSettings/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/DSI.gif
rename to plugins/DevicesDetection/images/os/DSI.gif
diff --git a/plugins/UserSettings/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif
similarity index 100%
rename from plugins/UserSettings/images/os/FED.gif
rename to plugins/DevicesDetection/images/os/FED.gif
diff --git a/plugins/UserSettings/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/FOS.gif
rename to plugins/DevicesDetection/images/os/FOS.gif
diff --git a/plugins/UserSettings/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/GNT.gif
rename to plugins/DevicesDetection/images/os/GNT.gif
diff --git a/plugins/UserSettings/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif
similarity index 100%
rename from plugins/UserSettings/images/os/GTV.gif
rename to plugins/DevicesDetection/images/os/GTV.gif
diff --git a/plugins/UserSettings/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/HPX.gif
rename to plugins/DevicesDetection/images/os/HPX.gif
diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IOS.gif
rename to plugins/DevicesDetection/images/os/IOS.gif
diff --git a/plugins/UserSettings/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPA.gif
rename to plugins/DevicesDetection/images/os/IPA.gif
diff --git a/plugins/UserSettings/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPD.gif
rename to plugins/DevicesDetection/images/os/IPD.gif
diff --git a/plugins/UserSettings/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPH.gif
rename to plugins/DevicesDetection/images/os/IPH.gif
diff --git a/plugins/UserSettings/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IRI.gif
rename to plugins/DevicesDetection/images/os/IRI.gif
diff --git a/plugins/UserSettings/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/KBT.gif
rename to plugins/DevicesDetection/images/os/KBT.gif
diff --git a/plugins/UserSettings/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/KNO.gif
rename to plugins/DevicesDetection/images/os/KNO.gif
diff --git a/plugins/UserSettings/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/LBT.gif
rename to plugins/DevicesDetection/images/os/LBT.gif
diff --git a/plugins/UserSettings/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/LIN.gif
rename to plugins/DevicesDetection/images/os/LIN.gif
diff --git a/plugins/UserSettings/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MAC.gif
rename to plugins/DevicesDetection/images/os/MAC.gif
diff --git a/plugins/UserSettings/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MAE.gif
rename to plugins/DevicesDetection/images/os/MAE.gif
diff --git a/plugins/UserSettings/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MDR.gif
rename to plugins/DevicesDetection/images/os/MDR.gif
diff --git a/plugins/UserSettings/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MIN.gif
rename to plugins/DevicesDetection/images/os/MIN.gif
diff --git a/plugins/UserSettings/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/NBS.gif
rename to plugins/DevicesDetection/images/os/NBS.gif
diff --git a/plugins/UserSettings/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/NDS.gif
rename to plugins/DevicesDetection/images/os/NDS.gif
diff --git a/plugins/UserSettings/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/OBS.gif
rename to plugins/DevicesDetection/images/os/OBS.gif
diff --git a/plugins/UserSettings/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif
similarity index 100%
rename from plugins/UserSettings/images/os/OS2.gif
rename to plugins/DevicesDetection/images/os/OS2.gif
diff --git a/plugins/UserSettings/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/POS.gif
rename to plugins/DevicesDetection/images/os/POS.gif
diff --git a/plugins/UserSettings/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PPY.gif
rename to plugins/DevicesDetection/images/os/PPY.gif
diff --git a/plugins/UserSettings/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PS3.gif
rename to plugins/DevicesDetection/images/os/PS3.gif
diff --git a/plugins/UserSettings/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PSP.gif
rename to plugins/DevicesDetection/images/os/PSP.gif
diff --git a/plugins/UserSettings/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PSV.gif
rename to plugins/DevicesDetection/images/os/PSV.gif
diff --git a/plugins/UserSettings/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/QNX.gif
rename to plugins/DevicesDetection/images/os/QNX.gif
diff --git a/plugins/UserSettings/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/RHT.gif
rename to plugins/DevicesDetection/images/os/RHT.gif
diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/ROS.gif
rename to plugins/DevicesDetection/images/os/ROS.gif
diff --git a/plugins/UserSettings/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SAF.gif
rename to plugins/DevicesDetection/images/os/SAF.gif
diff --git a/plugins/UserSettings/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SBA.gif
rename to plugins/DevicesDetection/images/os/SBA.gif
diff --git a/plugins/UserSettings/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SLW.gif
rename to plugins/DevicesDetection/images/os/SLW.gif
diff --git a/plugins/UserSettings/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SOS.gif
rename to plugins/DevicesDetection/images/os/SOS.gif
diff --git a/plugins/UserSettings/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SSE.gif
rename to plugins/DevicesDetection/images/os/SSE.gif
diff --git a/plugins/UserSettings/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SYL.gif
rename to plugins/DevicesDetection/images/os/SYL.gif
diff --git a/plugins/UserSettings/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SYM.gif
rename to plugins/DevicesDetection/images/os/SYM.gif
diff --git a/plugins/UserSettings/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif
similarity index 100%
rename from plugins/UserSettings/images/os/T64.gif
rename to plugins/DevicesDetection/images/os/T64.gif
diff --git a/plugins/UserSettings/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif
similarity index 100%
rename from plugins/UserSettings/images/os/TIZ.gif
rename to plugins/DevicesDetection/images/os/TIZ.gif
diff --git a/plugins/UserSettings/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/UBT.gif
rename to plugins/DevicesDetection/images/os/UBT.gif
diff --git a/plugins/UserSettings/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif
similarity index 100%
rename from plugins/UserSettings/images/os/UNK.gif
rename to plugins/DevicesDetection/images/os/UNK.gif
diff --git a/plugins/UserSettings/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/VMS.gif
rename to plugins/DevicesDetection/images/os/VMS.gif
diff --git a/plugins/UserSettings/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W10.gif
rename to plugins/DevicesDetection/images/os/W10.gif
diff --git a/plugins/UserSettings/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W2K.gif
rename to plugins/DevicesDetection/images/os/W2K.gif
diff --git a/plugins/UserSettings/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W61.gif
rename to plugins/DevicesDetection/images/os/W61.gif
diff --git a/plugins/UserSettings/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W65.gif
rename to plugins/DevicesDetection/images/os/W65.gif
diff --git a/plugins/UserSettings/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W75.gif
rename to plugins/DevicesDetection/images/os/W75.gif
diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W81.gif
rename to plugins/DevicesDetection/images/os/W81.gif
diff --git a/plugins/UserSettings/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W95.gif
rename to plugins/DevicesDetection/images/os/W95.gif
diff --git a/plugins/UserSettings/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W98.gif
rename to plugins/DevicesDetection/images/os/W98.gif
diff --git a/plugins/UserSettings/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WCE.gif
rename to plugins/DevicesDetection/images/os/WCE.gif
diff --git a/plugins/UserSettings/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WI7.gif
rename to plugins/DevicesDetection/images/os/WI7.gif
diff --git a/plugins/UserSettings/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WI8.gif
rename to plugins/DevicesDetection/images/os/WI8.gif
diff --git a/plugins/UserSettings/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WII.gif
rename to plugins/DevicesDetection/images/os/WII.gif
diff --git a/plugins/UserSettings/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WIN.gif
rename to plugins/DevicesDetection/images/os/WIN.gif
diff --git a/plugins/UserSettings/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WIU.gif
rename to plugins/DevicesDetection/images/os/WIU.gif
diff --git a/plugins/UserSettings/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WME.gif
rename to plugins/DevicesDetection/images/os/WME.gif
diff --git a/plugins/UserSettings/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WMO.gif
rename to plugins/DevicesDetection/images/os/WMO.gif
diff --git a/plugins/UserSettings/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WNT.gif
rename to plugins/DevicesDetection/images/os/WNT.gif
diff --git a/plugins/UserSettings/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WOS.gif
rename to plugins/DevicesDetection/images/os/WOS.gif
diff --git a/plugins/UserSettings/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WP7.gif
rename to plugins/DevicesDetection/images/os/WP7.gif
diff --git a/plugins/UserSettings/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WPH.gif
rename to plugins/DevicesDetection/images/os/WPH.gif
diff --git a/plugins/UserSettings/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WRT.gif
rename to plugins/DevicesDetection/images/os/WRT.gif
diff --git a/plugins/UserSettings/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WS3.gif
rename to plugins/DevicesDetection/images/os/WS3.gif
diff --git a/plugins/UserSettings/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WVI.gif
rename to plugins/DevicesDetection/images/os/WVI.gif
diff --git a/plugins/UserSettings/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WXP.gif
rename to plugins/DevicesDetection/images/os/WXP.gif
diff --git a/plugins/UserSettings/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/XBT.gif
rename to plugins/DevicesDetection/images/os/XBT.gif
diff --git a/plugins/UserSettings/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/XBX.gif
rename to plugins/DevicesDetection/images/os/XBX.gif
diff --git a/plugins/UserSettings/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/YNS.gif
rename to plugins/DevicesDetection/images/os/YNS.gif
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index a0a0d997166645ca46f498aacae0bf8562b7033a..535fd2a1ce702774367baa433c0b47ada5f94b58 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -37,7 +37,7 @@
{% endif %}
{% if visitor.getColumn('operatingSystemIcon') %}
<img src="{{ visitor.getColumn('operatingSystemIcon') }}"
- title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }}"/>{% endif %}
+ title="{{ visitor.getColumn('operatingSystem') }}{% if visitor.getColumn('resolution') %}, {{ visitor.getColumn('resolution') }}{% endif %}"/>{% endif %}
{% if visitor.getColumn('visitorTypeIcon') %}
{% if visitor.getColumn('visitorTypeIcon') %} -
<img src="{{ visitor.getColumn('visitorTypeIcon') }}"
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 7b9f6a4d9dbff6b5c318ca1128f39b2ac1baed35..ce7af8e36dff0f7a700dc6dd6a3a029815fcb296 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -10,7 +10,7 @@
{{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
{% if visitor.countryFlag is defined %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %}
{% if visitor.browserIcon is defined %} <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/>{% endif %}
- {% if visitor.operatingSystemIcon is defined %} <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/>{% endif %}
+ {% if visitor.operatingSystemIcon is defined %} <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %}
{% if visitor.visitConverted %}
<span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.goalConversions) }}" class='visitorRank'>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
index 77f1c8f2bb427d48163cd46f90fc953475384bd6..a515b0dff6981601c5e636605a04b1eb09328dab 100644
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ b/plugins/Live/templates/getSingleVisitSummary.twig
@@ -34,7 +34,7 @@
{% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %}
</div>
</li>
- {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
+ {% if visitData.resolution is defined %}<li><span>{{ 'Resolution_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
{% if visitData.userId is not empty %}<li><span>{{ 'General_UserId'|translate }}</span><strong>{{ visitData.userId|raw }}</strong></li>{% endif %}
{% if visitReferralSummary is defined %}
{%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
diff --git a/plugins/MultiSites/angularjs/site/site.controller.js b/plugins/MultiSites/angularjs/site/site.controller.js
index 7488b8330297a18338131deece6cd1d9499e59b5..2815ed4a777f785dc4b343b945c6d63218c11c8d 100644
--- a/plugins/MultiSites/angularjs/site/site.controller.js
+++ b/plugins/MultiSites/angularjs/site/site.controller.js
@@ -26,7 +26,21 @@
append = '&token_auth=' + token_auth;
}
- return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' +$scope.metric + '&columns=' + $scope.metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors()));
+ var metric = $scope.metric;
+
+ switch ($scope.evolutionMetric) {
+ case 'visits_evolution':
+ metric = 'nb_visits';
+ break;
+ case 'pageviews_evolution':
+ metric = 'nb_pageviews';
+ break;
+ case 'revenue_evolution':
+ metric = 'revenue';
+ break;
+ }
+
+ return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' + metric + '&columns=' + metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors()));
}
}
})();
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index 657d46244b3b8345250f474e49a6af84f918a3de..b64788b4b7a6286d8c3bc612fabc8e38c9391c2d 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit 657d46244b3b8345250f474e49a6af84f918a3de
+Subproject commit b64788b4b7a6286d8c3bc612fabc8e38c9391c2d
diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php
index a69fcc54bfe3639fd3d4b6104cb476738d0ca2e6..5e8c186af8892402d0b1082ba09d865f194b253a 100644
--- a/plugins/Referrers/Columns/Base.php
+++ b/plugins/Referrers/Columns/Base.php
@@ -127,6 +127,14 @@ abstract class Base extends VisitDimension
return $referrerInformation;
}
+ protected function getReferrerInformationFromRequest(Request $request)
+ {
+ $referrerUrl = $request->getParam('urlref');
+ $currentUrl = $request->getParam('url');
+
+ return $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+ }
+
/**
* Search engine detection
* @return bool
@@ -399,4 +407,23 @@ abstract class Base extends VisitDimension
}
}
-}
+ protected function isReferrerInformationNew(Visitor $visitor, $information)
+ {
+ foreach (array('referer_keyword', 'referer_name', 'referer_type') as $infoName) {
+ if ($this->hasReferrerColumnChanged($visitor, $information, $infoName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected function hasReferrerColumnChanged(Visitor $visitor, $information, $infoName)
+ {
+ return Common::mb_strtolower($visitor->getVisitorColumn($infoName)) != $information[$infoName];
+ }
+
+ protected function doesLastActionHaveSameReferrer(Visitor $visitor, $referrerType)
+ {
+ return $visitor->getVisitorColumn('referer_type') == $referrerType;
+ }
+}
\ No newline at end of file
diff --git a/plugins/Referrers/Columns/Campaign.php b/plugins/Referrers/Columns/Campaign.php
index 4413cd702f65a9eb936d872f41c9790031cc227e..ff2d5c24012b20586be770a5a9172df7d874083a 100644
--- a/plugins/Referrers/Columns/Campaign.php
+++ b/plugins/Referrers/Columns/Campaign.php
@@ -8,13 +8,58 @@
*/
namespace Piwik\Plugins\Referrers\Columns;
-use Piwik\Columns\Dimension;
+use Piwik\Common;
use Piwik\Piwik;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+use Piwik\Tracker\Visitor;
-class Campaign extends Dimension
+class Campaign extends Base
{
+ /**
+ * Obtained from the `[Tracker] create_new_visit_when_campaign_changes` INI config option.
+ * If true, will create new visits when campaign name changes.
+ *
+ * @var bool
+ */
+ protected $createNewVisitWhenCampaignChanges;
+
+ public function __construct()
+ {
+ $this->createNewVisitWhenCampaignChanges = TrackerConfig::getConfigValue('create_new_visit_when_campaign_changes') == 1;
+ }
+
public function getName()
{
return Piwik::translate('Referrers_ColumnCampaign');
}
-}
+
+ /**
+ * If we should create a new visit when the campaign changes, check if the campaign info changed and if so
+ * force the tracker to create a new visit.
+ *
+ * @param Request $request
+ * @param Visitor $visitor
+ * @param Action|null $action
+ * @return bool
+ */
+ public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+ {
+ if (!$this->createNewVisitWhenCampaignChanges) {
+ return false;
+ }
+
+ $information = $this->getReferrerInformationFromRequest($request);
+
+ if ($information['referer_type'] == Common::REFERRER_TYPE_CAMPAIGN
+ && $this->isReferrerInformationNew($visitor, $information)
+ ) {
+ Common::printDebug("Existing visit detected, but creating new visit because campaign information is different than last action.");
+
+ return true;
+ }
+
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/plugins/Referrers/Columns/Keyword.php b/plugins/Referrers/Columns/Keyword.php
index a5025b63c21cc7b7696285ea7d9c3273b3091440..78605c9d94a4f742119e05be62870d9ee916165a 100644
--- a/plugins/Referrers/Columns/Keyword.php
+++ b/plugins/Referrers/Columns/Keyword.php
@@ -41,10 +41,7 @@ class Keyword extends Base
*/
public function onNewVisit(Request $request, Visitor $visitor, $action)
{
- $referrerUrl = $request->getParam('urlref');
- $currentUrl = $request->getParam('url');
-
- $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+ $information = $this->getReferrerInformationFromRequest($request);
if (!empty($information['referer_keyword'])) {
return substr($information['referer_keyword'], 0, 255);
diff --git a/plugins/Referrers/Columns/ReferrerName.php b/plugins/Referrers/Columns/ReferrerName.php
index fbd55219dccdc55bd696f578f161fb7fe8c4f308..7bdb0732a67d855ecefb9ccba21e753c564922a5 100644
--- a/plugins/Referrers/Columns/ReferrerName.php
+++ b/plugins/Referrers/Columns/ReferrerName.php
@@ -35,10 +35,7 @@ class ReferrerName extends Base
*/
public function onNewVisit(Request $request, Visitor $visitor, $action)
{
- $referrerUrl = $request->getParam('urlref');
- $currentUrl = $request->getParam('url');
-
- $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+ $information = $this->getReferrerInformationFromRequest($request);
if (!empty($information['referer_name'])) {
diff --git a/plugins/Referrers/Columns/ReferrerType.php b/plugins/Referrers/Columns/ReferrerType.php
index f4e688f60e05d5959bfb62f5c940214d32b68b42..5303a1c360f13ad194676b5df9b247e5bcc38387 100644
--- a/plugins/Referrers/Columns/ReferrerType.php
+++ b/plugins/Referrers/Columns/ReferrerType.php
@@ -42,10 +42,7 @@ class ReferrerType extends Base
*/
public function onNewVisit(Request $request, Visitor $visitor, $action)
{
- $referrerUrl = $request->getParam('urlref');
- $currentUrl = $request->getParam('url');
-
- $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+ $information = $this->getReferrerInformationFromRequest($request);
return $information['referer_type'];
}
diff --git a/plugins/Referrers/Columns/ReferrerUrl.php b/plugins/Referrers/Columns/ReferrerUrl.php
index 0404a132472c9fca1e8aaadca95b2e58dd43e260..21c5cd5bdcc281ab3fb758cfaa8f7e423eaf7039 100644
--- a/plugins/Referrers/Columns/ReferrerUrl.php
+++ b/plugins/Referrers/Columns/ReferrerUrl.php
@@ -35,10 +35,7 @@ class ReferrerUrl extends Base
*/
public function onNewVisit(Request $request, Visitor $visitor, $action)
{
- $referrerUrl = $request->getParam('urlref');
- $currentUrl = $request->getParam('url');
-
- $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+ $information = $this->getReferrerInformationFromRequest($request);
return $information['referer_url'];
}
diff --git a/plugins/Referrers/Columns/Website.php b/plugins/Referrers/Columns/Website.php
index 53b143d6933f1ae33956ef2d603347aedfb7bdc3..42d05068d60e72731ff1ce4079a9e793e2ca4295 100644
--- a/plugins/Referrers/Columns/Website.php
+++ b/plugins/Referrers/Columns/Website.php
@@ -8,13 +8,50 @@
*/
namespace Piwik\Plugins\Referrers\Columns;
-use Piwik\Columns\Dimension;
+use Piwik\Common;
use Piwik\Piwik;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+use Piwik\Tracker\Visitor;
-class Website extends Dimension
+class Website extends Base
{
+ /**
+ * Set using the `[Tracker] create_new_visit_when_website_referrer_changes` INI config option.
+ * If true, will force new visits if the referrer website changes.
+ *
+ * @var bool
+ */
+ protected $createNewVisitWhenWebsiteReferrerChanges;
+
+ public function __construct()
+ {
+ $this->createNewVisitWhenWebsiteReferrerChanges = TrackerConfig::getConfigValue('create_new_visit_when_website_referrer_changes') == 1;
+ }
+
public function getName()
{
return Piwik::translate('General_Website');
}
+
+ public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+ {
+ if (!$this->createNewVisitWhenWebsiteReferrerChanges) {
+ return false;
+ }
+
+ $information = $this->getReferrerInformationFromRequest($request);
+
+ if ($information['referer_type'] == Common::REFERRER_TYPE_WEBSITE
+ && $this->isReferrerInformationNew($visitor, $information)
+ ) {
+ Common::printDebug("Existing visit detected, but creating new visit because website referrer information is different than last action.");
+
+ return true;
+ }
+
+ return false;
+
+ }
}
\ No newline at end of file
diff --git a/plugins/Resolution/API.php b/plugins/Resolution/API.php
new file mode 100644
index 0000000000000000000000000000000000000000..8fc33efddbbc6befff0eb7a3d854ce1e5a47bd26
--- /dev/null
+++ b/plugins/Resolution/API.php
@@ -0,0 +1,49 @@
+<?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\Resolution;
+
+use Piwik\Archive;
+use Piwik\DataTable;
+use Piwik\Metrics;
+use Piwik\Piwik;
+
+/**
+ * @see plugins/Resolution/functions.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/plugins/Resolution/functions.php';
+
+/**
+ * @method static \Piwik\Plugins\Resolution\API getInstance()
+ */
+class API extends \Piwik\Plugin\API
+{
+ protected function getDataTable($name, $idSite, $period, $date, $segment)
+ {
+ Piwik::checkUserHasViewAccess($idSite);
+ $archive = Archive::build($idSite, $period, $date, $segment);
+ $dataTable = $archive->getDataTable($name);
+ $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
+ $dataTable->queueFilter('ReplaceColumnNames');
+ $dataTable->queueFilter('ReplaceSummaryRowLabel');
+ return $dataTable;
+ }
+
+ public function getResolution($idSite, $period, $date, $segment = false)
+ {
+ $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment);
+ return $dataTable;
+ }
+
+ public function getConfiguration($idSite, $period, $date, $segment = false)
+ {
+ $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment);
+ $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getConfigurationLabel'));
+ return $dataTable;
+ }
+}
diff --git a/plugins/Resolution/Archiver.php b/plugins/Resolution/Archiver.php
new file mode 100644
index 0000000000000000000000000000000000000000..f44d744c533ebb40a2db0c19d0d8a98355a0379d
--- /dev/null
+++ b/plugins/Resolution/Archiver.php
@@ -0,0 +1,68 @@
+<?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\Resolution;
+
+use Piwik\DataTable;
+use Piwik\Metrics;
+
+/**
+ * Archiver for Resolution Plugin
+ *
+ * @see PluginsArchiver
+ */
+class Archiver extends \Piwik\Plugin\Archiver
+{
+ const RESOLUTION_RECORD_NAME = 'Resolution_resolution';
+ const CONFIGURATION_RECORD_NAME = 'Resolution_configuration';
+ const RESOLUTION_DIMENSION = "log_visit.config_resolution";
+ const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)";
+
+ public function aggregateDayReport()
+ {
+ $this->aggregateByResolution();
+ $this->aggregateByConfiguration();
+ }
+
+ /**
+ * Period archiving: simply sums up daily archives
+ */
+ public function aggregateMultipleReports()
+ {
+ $dataTableRecords = array(
+ self::RESOLUTION_RECORD_NAME,
+ self::CONFIGURATION_RECORD_NAME,
+ );
+ $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
+ }
+
+ protected function aggregateByConfiguration()
+ {
+ $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable();
+ $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics);
+ }
+
+ protected function aggregateByResolution()
+ {
+ $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable();
+ $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) {
+ return strlen($value) <= 5;
+ }));
+ $this->insertTable(self::RESOLUTION_RECORD_NAME, $table);
+ return $table;
+ }
+
+ protected function insertTable($recordName, DataTable $table)
+ {
+ $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
+ return $this->getProcessor()->insertBlobRecord($recordName, $report);
+ }
+
+}
+
diff --git a/plugins/UserSettings/Columns/Configuration.php b/plugins/Resolution/Columns/Configuration.php
similarity index 71%
rename from plugins/UserSettings/Columns/Configuration.php
rename to plugins/Resolution/Columns/Configuration.php
index 7577c064953a9ca020f3ff8a0d631d626985ba56..6929457495014b6c80f83a9e6439b9552265fa34 100644
--- a/plugins/UserSettings/Columns/Configuration.php
+++ b/plugins/Resolution/Columns/Configuration.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\UserSettings\Columns;
+namespace Piwik\Plugins\Resolution\Columns;
use Piwik\Columns\Dimension;
use Piwik\Piwik;
@@ -15,6 +15,6 @@ class Configuration extends Dimension
{
public function getName()
{
- return Piwik::translate('UserSettings_ColumnConfiguration');
+ return Piwik::translate('Resolution_ColumnConfiguration');
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/Resolution.php b/plugins/Resolution/Columns/Resolution.php
similarity index 83%
rename from plugins/UserSettings/Columns/Resolution.php
rename to plugins/Resolution/Columns/Resolution.php
index 35aaf4a23e57e1407e668c24f4c5aca97440c8c0..3f1e357279334fa9c2cc0916eeef2870b9f0fb43 100644
--- a/plugins/UserSettings/Columns/Resolution.php
+++ b/plugins/Resolution/Columns/Resolution.php
@@ -6,11 +6,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\UserSettings\Columns;
+namespace Piwik\Plugins\Resolution\Columns;
use Piwik\Piwik;
use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Plugins\UserSettings\Segment;
+use Piwik\Plugins\Resolution\Segment;
use Piwik\Tracker\Action;
use Piwik\Tracker\Request;
use Piwik\Tracker\Visitor;
@@ -24,7 +24,7 @@ class Resolution extends VisitDimension
{
$segment = new Segment();
$segment->setSegment('resolution');
- $segment->setName('UserSettings_ColumnResolution');
+ $segment->setName('Resolution_ColumnResolution');
$segment->setAcceptedValues('1280x1024, 800x600, etc.');
$this->addSegment($segment);
}
@@ -48,6 +48,6 @@ class Resolution extends VisitDimension
public function getName()
{
- return Piwik::translate('UserSettings_ColumnResolution');
+ return Piwik::translate('Resolution_ColumnResolution');
}
}
\ No newline at end of file
diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b0e9a5a42d9de0c06f547e729da2d730f763a26
--- /dev/null
+++ b/plugins/Resolution/Reports/Base.php
@@ -0,0 +1,32 @@
+<?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\Resolution\Reports;
+
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+
+abstract class Base extends \Piwik\Plugin\Report
+{
+ protected function init()
+ {
+ $this->category = 'UserSettings_VisitorSettings';
+ }
+
+ protected function getBasicResolutionDisplayProperties(ViewDataTable $view)
+ {
+ $view->config->show_search = false;
+ $view->config->show_exclude_low_population = false;
+
+ $view->requestConfig->filter_limit = 5;
+
+ if ($view->isViewDataTableId(Graph::ID)) {
+ $view->config->max_graph_elements = 5;
+ }
+ }
+}
diff --git a/plugins/UserSettings/Reports/GetConfiguration.php b/plugins/Resolution/Reports/GetConfiguration.php
similarity index 58%
rename from plugins/UserSettings/Reports/GetConfiguration.php
rename to plugins/Resolution/Reports/GetConfiguration.php
index 67b00f8b7d9660458d94d269c8018d59ab15f94c..024efa844e56aa941a3a3f28c73ec70c8d409828 100644
--- a/plugins/UserSettings/Reports/GetConfiguration.php
+++ b/plugins/Resolution/Reports/GetConfiguration.php
@@ -6,11 +6,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\UserSettings\Reports;
+namespace Piwik\Plugins\Resolution\Reports;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Configuration;
+use Piwik\Plugins\Resolution\Columns\Configuration;
class GetConfiguration extends Base
{
@@ -18,15 +18,15 @@ class GetConfiguration extends Base
{
parent::init();
$this->dimension = new Configuration();
- $this->name = Piwik::translate('UserSettings_WidgetGlobalVisitors');
- $this->documentation = Piwik::translate('UserSettings_WidgetGlobalVisitorsDocumentation', '<br />');
+ $this->name = Piwik::translate('Resolution_WidgetGlobalVisitors');
+ $this->documentation = Piwik::translate('Resolution_WidgetGlobalVisitorsDocumentation', '<br />');
$this->order = 7;
- $this->widgetTitle = 'UserSettings_WidgetGlobalVisitors';
+ $this->widgetTitle = 'Resolution_WidgetGlobalVisitors';
}
public function configureView(ViewDataTable $view)
{
- $this->getBasicUserSettingsDisplayProperties($view);
+ $this->getBasicResolutionDisplayProperties($view);
$view->config->addTranslation('label', $this->dimension->getName());
diff --git a/plugins/UserSettings/Reports/GetResolution.php b/plugins/Resolution/Reports/GetResolution.php
similarity index 65%
rename from plugins/UserSettings/Reports/GetResolution.php
rename to plugins/Resolution/Reports/GetResolution.php
index 2c8012a8d10997202638ee2db6e19589ed240297..fbb78eb8788aea9ea69bd88ff0aa8ab8ce92cdd0 100644
--- a/plugins/UserSettings/Reports/GetResolution.php
+++ b/plugins/Resolution/Reports/GetResolution.php
@@ -6,11 +6,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\UserSettings\Reports;
+namespace Piwik\Plugins\Resolution\Reports;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Resolution;
+use Piwik\Plugins\Resolution\Columns\Resolution;
class GetResolution extends Base
{
@@ -18,15 +18,15 @@ class GetResolution extends Base
{
parent::init();
$this->dimension = new Resolution();
- $this->name = Piwik::translate('UserSettings_WidgetResolutions');
+ $this->name = Piwik::translate('Resolution_WidgetResolutions');
$this->documentation = ''; // TODO
$this->order = 0;
- $this->widgetTitle = 'UserSettings_WidgetResolutions';
+ $this->widgetTitle = 'Resolution_WidgetResolutions';
}
public function configureView(ViewDataTable $view)
{
- $this->getBasicUserSettingsDisplayProperties($view);
+ $this->getBasicResolutionDisplayProperties($view);
$view->config->addTranslation('label', $this->dimension->getName());
}
diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php
new file mode 100644
index 0000000000000000000000000000000000000000..49b2d3a9a62c7a745c909d54cc50b2ce0c190958
--- /dev/null
+++ b/plugins/Resolution/Resolution.php
@@ -0,0 +1,35 @@
+<?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\Resolution;
+
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+
+/**
+ *
+ */
+class Resolution extends \Piwik\Plugin
+{
+ /**
+ * @see Piwik\Plugin::getListHooksRegistered
+ */
+ public function getListHooksRegistered()
+ {
+ return array(
+ 'Live.getAllVisitorDetails' => 'extendVisitorDetails',
+ );
+ }
+
+ public function extendVisitorDetails(&$visitor, $details)
+ {
+ $instance = new Visitor($details);
+
+ $visitor['resolution'] = $instance->getResolution();
+ }
+}
diff --git a/plugins/Resolution/Segment.php b/plugins/Resolution/Segment.php
new file mode 100644
index 0000000000000000000000000000000000000000..e21a2973d724b02d19743db667605c15ee63096a
--- /dev/null
+++ b/plugins/Resolution/Segment.php
@@ -0,0 +1,21 @@
+<?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\Resolution;
+
+/**
+ * Resolution segment base class.
+ *
+ */
+class Segment extends \Piwik\Plugin\Segment
+{
+ protected function init()
+ {
+ $this->setCategory('General_Visit');
+ }
+}
diff --git a/plugins/Resolution/Visitor.php b/plugins/Resolution/Visitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..47fd33086849c18cc69d496aa9697097dd43c3c9
--- /dev/null
+++ b/plugins/Resolution/Visitor.php
@@ -0,0 +1,28 @@
+<?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\Resolution;
+
+class Visitor
+{
+ private $details = array();
+
+ public function __construct($details)
+ {
+ $this->details = $details;
+ }
+
+ function getResolution()
+ {
+ if (!array_key_exists('config_resolution', $this->details)) {
+ return null;
+ }
+
+ return $this->details['config_resolution'];
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/functions.php b/plugins/Resolution/functions.php
new file mode 100644
index 0000000000000000000000000000000000000000..e71aaa907a2b9299b383d9335f1d4d17ab3a90d6
--- /dev/null
+++ b/plugins/Resolution/functions.php
@@ -0,0 +1,29 @@
+<?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\Resolution;
+
+use Piwik\Piwik;
+
+function getConfigurationLabel($str)
+{
+ if (strpos($str, ';') === false) {
+ return $str;
+ }
+ $values = explode(";", $str);
+
+ $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]);
+ $name = $values[1];
+ $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name);
+ if ($browser === false) {
+ $browser = Piwik::translate('General_Unknown');
+ }
+ $resolution = $values[2];
+ return $os . " / " . $browser . " / " . $resolution;
+}
diff --git a/plugins/Resolution/lang/am.json b/plugins/Resolution/lang/am.json
new file mode 100644
index 0000000000000000000000000000000000000000..db863d489e9a84c6cb6b72390512602853b2605e
--- /dev/null
+++ b/plugins/Resolution/lang/am.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "á‹á‰…ረት",
+ "ColumnResolution": "ጥራት",
+ "Configurations": "á‹á‰…ረቶች",
+ "Resolutions": "ጥራቶች",
+ "WidgetGlobalVisitors": "የáˆáˆ‰áˆ ጎብኚዎች á‹á‰…ረት",
+ "WidgetResolutions": "የማያ ጥራቶች"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ar.json b/plugins/Resolution/lang/ar.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d9bfebc01390198f38f45598269c04873d64452
--- /dev/null
+++ b/plugins/Resolution/lang/ar.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "الإعداد",
+ "ColumnResolution": "الكثاÙØ© النقطية",
+ "Configurations": "الإعدادات",
+ "Resolutions": "الكثاÙات النقطية",
+ "WidgetGlobalVisitors": "الإعدادات العامة للزوار",
+ "WidgetResolutions": "كثاÙات الشاشة النقطية"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/be.json b/plugins/Resolution/lang/be.json
new file mode 100644
index 0000000000000000000000000000000000000000..d62451282c80eac783c0b8994937c059d357461a
--- /dev/null
+++ b/plugins/Resolution/lang/be.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "КанфігурацыÑ",
+ "ColumnResolution": "Дазвол",
+ "Configurations": "Па канфігурацыі",
+ "Resolutions": "Па дазволе манітораў",
+ "WidgetGlobalVisitors": "Ð“Ð»Ð°Ð±Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ",
+ "WidgetGlobalVisitorsDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае найбольш раÑпаўÑÑŽÐ´Ð¶Ð°Ð½Ñ‹Ñ Ð°Ð³ÑƒÐ»ÑŒÐ½Ñ‹Ñ ÐºÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ–, ÑÐºÑ–Ñ Ð¼ÐµÐ»Ñ– вашы наведвальнікі. ÐšÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ - гÑта ÑпалучÑнне аперацыйнай ÑÑ–ÑÑ‚Ñмы, тыпу браўзÑра Ñ– дазволу Ñкрана.",
+ "WidgetResolutions": "Дазвол манітораў"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/bg.json b/plugins/Resolution/lang/bg.json
new file mode 100644
index 0000000000000000000000000000000000000000..03e0d97f0b8c993713ee527d06e0dffdf4565e2e
--- /dev/null
+++ b/plugins/Resolution/lang/bg.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Обобщена конфигурациÑ",
+ "ColumnResolution": "Разделителна ÑпоÑобноÑÑ‚ на екрана",
+ "Configurations": "Конфигурации",
+ "Resolutions": "Разделителна ÑпоÑобноÑÑ‚",
+ "WidgetGlobalVisitors": "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½Ð° гло",
+ "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цÑлоÑтни конфигурации, които вашите поÑетители Ñа имали. ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ðµ комбинациÑта от операционна ÑиÑтема, тип на браузера и Ñ€ÐµÐ·Ð¾Ð»ÑŽÑ†Ð¸Ñ Ð½Ð° екрана.",
+ "WidgetResolutions": "Разделителна ÑпоÑобноÑÑ‚"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ca.json b/plugins/Resolution/lang/ca.json
new file mode 100644
index 0000000000000000000000000000000000000000..bda670af6569bc2b1f7e949728288fdd93eb5870
--- /dev/null
+++ b/plugins/Resolution/lang/ca.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuració",
+ "ColumnResolution": "Resolució",
+ "Configurations": "Configuracions",
+ "Resolutions": "Resolucions",
+ "WidgetGlobalVisitors": "Configuracions globals dels visitants",
+ "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.",
+ "WidgetResolutions": "Resolucions"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/cs.json b/plugins/Resolution/lang/cs.json
new file mode 100644
index 0000000000000000000000000000000000000000..9173a432a8e3b7957bad2046c2ba6af626dbccfe
--- /dev/null
+++ b/plugins/Resolution/lang/cs.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigurace",
+ "ColumnResolution": "RozliÅ¡enÃ",
+ "Configurations": "NastavenÃ",
+ "Resolutions": "RozliÅ¡enÃ",
+ "WidgetGlobalVisitors": "Hlavnà nastavenà návÅ¡tÄ›vnÃků",
+ "WidgetGlobalVisitorsDocumentation": "Toto hlášenà zobrazuje nejÄastÄ›jÅ¡Ã konfigurace, které vaÅ¡i návÅ¡tÄ›vnÃci mÄ›li. Konfigurace je kombinace operaÄnÃho systému, prohlÞeÄe a rozliÅ¡enÃ.",
+ "WidgetResolutions": "Rozlišenà obrazovky"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/da.json b/plugins/Resolution/lang/da.json
new file mode 100644
index 0000000000000000000000000000000000000000..cab3e107312c76d3e05a6efc7e8ff84785235bde
--- /dev/null
+++ b/plugins/Resolution/lang/da.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguration",
+ "ColumnResolution": "Opløsning",
+ "Configurations": "Indstillinger",
+ "Resolutions": "Opløsninger",
+ "WidgetGlobalVisitors": "Besøgendes konfiguration",
+ "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.",
+ "WidgetResolutions": "Skærmopløsninger"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/de.json b/plugins/Resolution/lang/de.json
new file mode 100644
index 0000000000000000000000000000000000000000..3581dd953d3d4cb79d5363f790f29a374d74b29b
--- /dev/null
+++ b/plugins/Resolution/lang/de.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguration",
+ "ColumnResolution": "Auflösung",
+ "Configurations": "Konfigurationen",
+ "Resolutions": "Auflösungen",
+ "WidgetGlobalVisitors": "Globale Besucherkonfiguration",
+ "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.",
+ "WidgetResolutions": "Bildschirmauflösungen"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/el.json b/plugins/Resolution/lang/el.json
new file mode 100644
index 0000000000000000000000000000000000000000..4eac9d0139ff563a14cfcd87dd7406aae2a1380c
--- /dev/null
+++ b/plugins/Resolution/lang/el.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "ΡÏθμιση",
+ "ColumnResolution": "Ανάλυση",
+ "Configurations": "Ρυθμίσεις",
+ "Resolutions": "ΑναλÏσεις οθόνης",
+ "WidgetGlobalVisitors": "ΓενικÎÏ‚ Ïυθμίσεις χÏηστών",
+ "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφοÏά δείχνει τις πιο συχνÎÏ‚ καθολικÎÏ‚ Ïυθμίσεις που Îχουν οι επισκÎπτες σας. Μια ÏÏθμιση είναι ο συνδυασμός του λειτουÏÎ³Î¹ÎºÎ¿Ï ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚, του Ï„Ïπου φυλλομετÏητή και της ανάλυσης οθόνης.",
+ "WidgetResolutions": "ΑναλÏσεις οθόνης"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/en.json b/plugins/Resolution/lang/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..90491dccaeb1da3ca4fbfc323ac8b9cc5995c7c9
--- /dev/null
+++ b/plugins/Resolution/lang/en.json
@@ -0,0 +1,12 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuration",
+ "ColumnResolution": "Resolution",
+ "Configurations": "Configurations",
+ "PluginDescription": "Reports visitors resolution",
+ "Resolutions": "Resolutions",
+ "WidgetGlobalVisitors": "Visitor Configuration",
+ "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.",
+ "WidgetResolutions": "Screen Resolution"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/es.json b/plugins/Resolution/lang/es.json
new file mode 100644
index 0000000000000000000000000000000000000000..dd606039e1d10b8d66dc96f471ed94deb0f230eb
--- /dev/null
+++ b/plugins/Resolution/lang/es.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuración",
+ "ColumnResolution": "Resoluciones",
+ "Configurations": "Configuración",
+ "Resolutions": "Resoluciones",
+ "WidgetGlobalVisitors": "Configuración global de visitantes",
+ "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.",
+ "WidgetResolutions": "Resoluciones de pantalla"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/et.json b/plugins/Resolution/lang/et.json
new file mode 100644
index 0000000000000000000000000000000000000000..30eccef1b5dd46fe856b0a233e5c920a75909a2d
--- /dev/null
+++ b/plugins/Resolution/lang/et.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguratsioon",
+ "ColumnResolution": "Resolutsioon",
+ "Configurations": "Konfiguratsioonid",
+ "Resolutions": "Ekraani resolutsioonid",
+ "WidgetGlobalVisitors": "Kohalike külastajate seaded",
+ "WidgetResolutions": "Ekraani resolutsioonid"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/eu.json b/plugins/Resolution/lang/eu.json
new file mode 100644
index 0000000000000000000000000000000000000000..b1b820a1c23e1f17a4ab8b9b8cf7bc54e9af3e0f
--- /dev/null
+++ b/plugins/Resolution/lang/eu.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigurazioa",
+ "ColumnResolution": "Bereizmena",
+ "Configurations": "Konfigurazioak",
+ "Resolutions": "Bereizmenak",
+ "WidgetGlobalVisitors": "Bisitarien konfigurazioa",
+ "WidgetResolutions": "Pantailaren bereizmenak"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fa.json b/plugins/Resolution/lang/fa.json
new file mode 100644
index 0000000000000000000000000000000000000000..cafca9deb7097723cb5d4b40419010a1362877ea
--- /dev/null
+++ b/plugins/Resolution/lang/fa.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "پیکربندی",
+ "ColumnResolution": "رزلوشن",
+ "Configurations": "پیکربندی",
+ "Resolutions": "رزلوشن",
+ "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی",
+ "WidgetGlobalVisitorsDocumentation": "این گزارش نشان Ù…ÛŒ دهد پیکربندی Ú©Ù„ÛŒ شایع ترین است Ú©Ù‡ بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر Ùˆ صÙØÙ‡ نمایش با ÙˆØ¶ÙˆØ Ø§Ø³Øª.",
+ "WidgetResolutions": "رزلوشن نمایشگر"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fi.json b/plugins/Resolution/lang/fi.json
new file mode 100644
index 0000000000000000000000000000000000000000..70b35a17f698e5c821fc5ec425e84e245ede37dd
--- /dev/null
+++ b/plugins/Resolution/lang/fi.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Asetukset",
+ "ColumnResolution": "Resoluutio",
+ "Configurations": "Asetukset",
+ "Resolutions": "Resoluutio",
+ "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset",
+ "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.",
+ "WidgetResolutions": "Näytön resoluutio"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fr.json b/plugins/Resolution/lang/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc933f2519a2fa491e252f1fdadfe0caf885cb2e
--- /dev/null
+++ b/plugins/Resolution/lang/fr.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuration",
+ "ColumnResolution": "Résolution",
+ "Configurations": "Configurations",
+ "Resolutions": "Résolutions",
+ "WidgetGlobalVisitors": "Configuration globale des visiteurs",
+ "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.",
+ "WidgetResolutions": "Résolutions d'écran"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/gl.json b/plugins/Resolution/lang/gl.json
new file mode 100644
index 0000000000000000000000000000000000000000..aaa796e7cabb914ba5971588e042c93dd6221bbb
--- /dev/null
+++ b/plugins/Resolution/lang/gl.json
@@ -0,0 +1,8 @@
+{
+ "Resolution": {
+ "Configurations": "Configuracións",
+ "Resolutions": "Resolucións",
+ "WidgetGlobalVisitors": "Configuración global de visitantes",
+ "WidgetResolutions": "Resolucións de pantalla"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/he.json b/plugins/Resolution/lang/he.json
new file mode 100644
index 0000000000000000000000000000000000000000..bd8365578777a402a2bacae34e1b9a89211c9ddc
--- /dev/null
+++ b/plugins/Resolution/lang/he.json
@@ -0,0 +1,5 @@
+{
+ "Resolution": {
+ "WidgetResolutions": "רזולוציית מסך"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hi.json b/plugins/Resolution/lang/hi.json
new file mode 100644
index 0000000000000000000000000000000000000000..5918da9c01f75a3c9aac87d694bb3ec994f962a3
--- /dev/null
+++ b/plugins/Resolution/lang/hi.json
@@ -0,0 +1,9 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "विनà¥à¤¯à¤¾à¤¸",
+ "ColumnResolution": "संकलà¥à¤ª",
+ "Configurations": "विनà¥à¤¯à¤¾à¤¸",
+ "Resolutions": "संकलà¥à¤ª",
+ "WidgetGlobalVisitors": "आगंतà¥à¤• विनà¥à¤¯à¤¾à¤¸"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hr.json b/plugins/Resolution/lang/hr.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1b2c845ef38774ef25bc4c6ce833e2a440811c2
--- /dev/null
+++ b/plugins/Resolution/lang/hr.json
@@ -0,0 +1,7 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "KOnfiguracija",
+ "ColumnResolution": "Rezolucija",
+ "Configurations": "Konfiguracija"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hu.json b/plugins/Resolution/lang/hu.json
new file mode 100644
index 0000000000000000000000000000000000000000..1be3f7ca3e1197ff9ef0a8e2fa64f5eabc7d374c
--- /dev/null
+++ b/plugins/Resolution/lang/hu.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguráció",
+ "ColumnResolution": "Felbontás",
+ "Configurations": "Konfigurációk",
+ "Resolutions": "Képernyőfelbontások",
+ "WidgetGlobalVisitors": "Globális látogatói beállÃtások",
+ "WidgetResolutions": "Képernyőfelbontások"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/id.json b/plugins/Resolution/lang/id.json
new file mode 100644
index 0000000000000000000000000000000000000000..e22456737966f2113779b26e8d812289e1b883fd
--- /dev/null
+++ b/plugins/Resolution/lang/id.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Pengaturan",
+ "ColumnResolution": "Resolusi",
+ "Configurations": "Pengaturan",
+ "Resolutions": "Resolusi",
+ "WidgetGlobalVisitors": "Pengaturan pengunjung umum",
+ "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.",
+ "WidgetResolutions": "Resolusi layar"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/is.json b/plugins/Resolution/lang/is.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3b2411f1536d64de585f05fc3b48943a6f2610a
--- /dev/null
+++ b/plugins/Resolution/lang/is.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Uppsetning",
+ "ColumnResolution": "Skjáupplausn",
+ "Configurations": "Uppsetningar",
+ "Resolutions": "Skjáupplausnir",
+ "WidgetGlobalVisitors": "Altæk gestastilling",
+ "WidgetResolutions": "Skjáupplausnir"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/it.json b/plugins/Resolution/lang/it.json
new file mode 100644
index 0000000000000000000000000000000000000000..d66edce256633f8a6a33d97a0751bddc28a9bba5
--- /dev/null
+++ b/plugins/Resolution/lang/it.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configurazione",
+ "ColumnResolution": "Risoluzione",
+ "Configurations": "Configurazioni",
+ "Resolutions": "Risoluzioni",
+ "WidgetGlobalVisitors": "Riepilogo configurazione visitatori",
+ "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.",
+ "WidgetResolutions": "Risoluzione schermo"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ja.json b/plugins/Resolution/lang/ja.json
new file mode 100644
index 0000000000000000000000000000000000000000..08594ca73d09eb181ef5f6070e1eb3860bf95495
--- /dev/null
+++ b/plugins/Resolution/lang/ja.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "環境è¨å®š",
+ "ColumnResolution": "解åƒåº¦",
+ "Configurations": "環境è¨å®š",
+ "Resolutions": "解åƒåº¦",
+ "WidgetGlobalVisitors": "ビジターã®å…¨èˆ¬çš„ãªç’°å¢ƒè¨å®š",
+ "WidgetGlobalVisitorsDocumentation": "ビジターã®æœ€ã‚‚一般的ãªåˆ©ç”¨ç’°å¢ƒã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚オペレーティングシステムã€ãƒ–ラウザã®ç¨®é¡žã¨ç”»é¢ã®è§£åƒåº¦ã®çµ„åˆã›ã§è¡¨ç¤ºã—ã¾ã™ã€‚",
+ "WidgetResolutions": "ç”»é¢è§£åƒåº¦"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ka.json b/plugins/Resolution/lang/ka.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ef05cca972a3e09e1b66370b0c03c70700e1ae9
--- /dev/null
+++ b/plugins/Resolution/lang/ka.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ",
+ "ColumnResolution": "რეზáƒáƒšáƒ£áƒªáƒ˜áƒ",
+ "Configurations": "გáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ”ბი",
+ "Resolutions": "რეზáƒáƒšáƒ£áƒªáƒ˜áƒ”ბი",
+ "WidgetGlobalVisitors": "ვიზიტáƒáƒ ების გლáƒáƒ‘áƒáƒšáƒ£áƒ ი კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ",
+ "WidgetResolutions": "ეკრáƒáƒœáƒ˜áƒ¡ რეზáƒáƒšáƒ£áƒ•áƒ˜áƒ”ბი"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ko.json b/plugins/Resolution/lang/ko.json
new file mode 100644
index 0000000000000000000000000000000000000000..d76113b7af88ff073dd7c9301833701ea6de2dba
--- /dev/null
+++ b/plugins/Resolution/lang/ko.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "구성",
+ "ColumnResolution": "í•´ìƒë„",
+ "Configurations": "구성",
+ "Resolutions": "í•´ìƒë„",
+ "WidgetGlobalVisitors": "글로벌 ë°©ë¬¸ìž êµ¬ì„±",
+ "WidgetGlobalVisitorsDocumentation": "방문ìžì˜ 가장 ì¼ë°˜ì ì¸ ì‚¬ìš© í™˜ê²½ì— ëŒ€í•œ ë³´ê³ ì„œìž…ë‹ˆë‹¤. ìš´ì˜ ì²´ì œ, 브ë¼ìš°ì € 종류와 화면 í•´ìƒë„ì˜ ì¡°í•©ìœ¼ë¡œ 표시합니다.",
+ "WidgetResolutions": "스í¬ë¦° í•´ìƒë„"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/lt.json b/plugins/Resolution/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..34d0e7299fe6ff90314708f080aacb78de641e33
--- /dev/null
+++ b/plugins/Resolution/lang/lt.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigūracija",
+ "ColumnResolution": "Ekrano raiška",
+ "Configurations": "Konfigūracijos",
+ "Resolutions": "Ekranų raiškos",
+ "WidgetGlobalVisitors": "Bendri lankytojų nustatymai",
+ "WidgetResolutions": "Ekrano raiška"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/lv.json b/plugins/Resolution/lang/lv.json
new file mode 100644
index 0000000000000000000000000000000000000000..4183c8b7ce56f6ecbbc5b22054e32ef6a9c443d1
--- /dev/null
+++ b/plugins/Resolution/lang/lv.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "KonfigurÄcija",
+ "ColumnResolution": "EkrÄna izÅ¡Ä·irtspÄ“ja",
+ "Configurations": "KonfigurÄcijas",
+ "Resolutions": "EkrÄna izÅ¡Ä·irtspÄ“jas",
+ "WidgetGlobalVisitors": "GlobÄlÄ apmeklÄ“tÄju konfigurÄcija",
+ "WidgetGlobalVisitorsDocumentation": "Å ajÄ atskaitÄ“ redzamas visbiežÄk izmantotÄs apmeklÄ“tÄju konfigurÄcijas. KonfigurÄcija ir operÄ“tÄjsistÄ“mas, pÄrlÅ«ka tipa un ekrÄna izÅ¡Ä·irtspÄ“jas kombinÄcija.",
+ "WidgetResolutions": "EkrÄna izÅ¡Ä·irtspÄ“jas"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nb.json b/plugins/Resolution/lang/nb.json
new file mode 100644
index 0000000000000000000000000000000000000000..add66843bb9e70c57e4192c30fb656e1b3208520
--- /dev/null
+++ b/plugins/Resolution/lang/nb.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigurasjon",
+ "ColumnResolution": "Oppløsning",
+ "Configurations": "Konfigurasjon",
+ "Resolutions": "Oppløsninger",
+ "WidgetGlobalVisitors": "Besøkendes konfigurasjon",
+ "WidgetResolutions": "Skjermoppløsninger"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nl.json b/plugins/Resolution/lang/nl.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9724ada1a996932202c55db68f9c86940e8cf61
--- /dev/null
+++ b/plugins/Resolution/lang/nl.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuratie",
+ "ColumnResolution": "Resolutie",
+ "Configurations": "Configuraties",
+ "Resolutions": "Schermresoluties",
+ "WidgetGlobalVisitors": "Algemene configuratie",
+ "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.",
+ "WidgetResolutions": "Schermresoluties"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nn.json b/plugins/Resolution/lang/nn.json
new file mode 100644
index 0000000000000000000000000000000000000000..0524f04c04c74fff378a7a2e18f9670896b28d87
--- /dev/null
+++ b/plugins/Resolution/lang/nn.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigurasjon",
+ "ColumnResolution": "Oppløysing",
+ "Configurations": "Konfigurasjonar",
+ "Resolutions": "Oppløysingar",
+ "WidgetGlobalVisitors": "Global vitjarkonfigurasjon",
+ "WidgetResolutions": "Skjermoppløysing"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pl.json b/plugins/Resolution/lang/pl.json
new file mode 100644
index 0000000000000000000000000000000000000000..00459e717b59d05d7b7f07b68861903f3e6f5441
--- /dev/null
+++ b/plugins/Resolution/lang/pl.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguracja",
+ "ColumnResolution": "Rozdzielczość",
+ "Configurations": "Konfiguracje",
+ "Resolutions": "Rozdzielczość",
+ "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających",
+ "WidgetResolutions": "Rozdzielczość ekranu"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pt-br.json b/plugins/Resolution/lang/pt-br.json
new file mode 100644
index 0000000000000000000000000000000000000000..aed2a71000ab79eddf2b059ac868e0debaf6e447
--- /dev/null
+++ b/plugins/Resolution/lang/pt-br.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuração",
+ "ColumnResolution": "Resolução",
+ "Configurations": "Configurações",
+ "Resolutions": "Resoluções",
+ "WidgetGlobalVisitors": "Configuração Global de Visitante",
+ "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.",
+ "WidgetResolutions": "Resoluções de Tela"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pt.json b/plugins/Resolution/lang/pt.json
new file mode 100644
index 0000000000000000000000000000000000000000..1dd610e67900508f00f9e3433bc4e9038e5a1d67
--- /dev/null
+++ b/plugins/Resolution/lang/pt.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuração",
+ "ColumnResolution": "Resolução",
+ "Configurations": "Configurações",
+ "Resolutions": "Resoluções",
+ "WidgetGlobalVisitors": "Configuração global dos visitantes",
+ "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.",
+ "WidgetResolutions": "Resoluções de Ecrã"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ro.json b/plugins/Resolution/lang/ro.json
new file mode 100644
index 0000000000000000000000000000000000000000..0ffc306ee53c851eaf6a37f19b56e1941abdcc20
--- /dev/null
+++ b/plugins/Resolution/lang/ro.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuraţia",
+ "ColumnResolution": "Rezoluţie ecran",
+ "Configurations": "Configurare",
+ "Resolutions": "Rezolutii",
+ "WidgetGlobalVisitors": "Configurare vizitatori globala",
+ "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.",
+ "WidgetResolutions": "Rezolutii ecran"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ru.json b/plugins/Resolution/lang/ru.json
new file mode 100644
index 0000000000000000000000000000000000000000..8581b68f31cc517094a204d1c63172e85f042a6c
--- /dev/null
+++ b/plugins/Resolution/lang/ru.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "КонфигурациÑ",
+ "ColumnResolution": "Разрешение",
+ "Configurations": "По конфигурации",
+ "Resolutions": "По разрешению мониторов",
+ "WidgetGlobalVisitors": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
+ "WidgetGlobalVisitorsDocumentation": "Ðтот отчет показывает общую информацию по наиболее популÑоным конфигурациÑм ÑиÑтемы ваших поÑетителей. ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ - Ñто ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¹ ÑиÑтемы, браузера и Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñкрана.",
+ "WidgetResolutions": "По разрешению мониторов"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sk.json b/plugins/Resolution/lang/sk.json
new file mode 100644
index 0000000000000000000000000000000000000000..e956c534396a609166dbeec4db9840606f0e8c57
--- /dev/null
+++ b/plugins/Resolution/lang/sk.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigurácia",
+ "ColumnResolution": "RozlÃÅ¡enie",
+ "Configurations": "Konfigurácia",
+ "Resolutions": "RozlÃÅ¡enie",
+ "WidgetGlobalVisitors": "Globálne konfigurácie návÅ¡tevnÃkov",
+ "WidgetResolutions": "RozlÃÅ¡enie obrazovky"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sl.json b/plugins/Resolution/lang/sl.json
new file mode 100644
index 0000000000000000000000000000000000000000..b2b1440a31a54023236c6b667c9fedaf36bdb51e
--- /dev/null
+++ b/plugins/Resolution/lang/sl.json
@@ -0,0 +1,9 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Nastavitev",
+ "ColumnResolution": "Resolucija",
+ "Configurations": "Nastavitve",
+ "Resolutions": "Resolucije",
+ "WidgetResolutions": "Resolucija zaslona"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sq.json b/plugins/Resolution/lang/sq.json
new file mode 100644
index 0000000000000000000000000000000000000000..15b9a9c3ab39c7063c13304b78ab05055037c5fe
--- /dev/null
+++ b/plugins/Resolution/lang/sq.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Formësim",
+ "ColumnResolution": "Qartësi",
+ "Configurations": "Formësime",
+ "Resolutions": "Qartësi",
+ "WidgetGlobalVisitors": "Formësime globale vizitorësh",
+ "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.",
+ "WidgetResolutions": "Qartësi ekrani"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sr.json b/plugins/Resolution/lang/sr.json
new file mode 100644
index 0000000000000000000000000000000000000000..56c82ccd4b09a88e08d41ea7339e0c4b2fb97961
--- /dev/null
+++ b/plugins/Resolution/lang/sr.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Podešavanja",
+ "ColumnResolution": "Rezolucija",
+ "Configurations": "Podešavanja",
+ "Resolutions": "Rezolucije",
+ "WidgetGlobalVisitors": "Globalna podešavanja posetilaca",
+ "WidgetGlobalVisitorsDocumentation": "Ovaj izveÅ¡taj prikazuje najÄešća podeÅ¡avanja vaÅ¡ih posetilaca. Pod podeÅ¡avanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.",
+ "WidgetResolutions": "Rezolucije ekrana"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sv.json b/plugins/Resolution/lang/sv.json
new file mode 100644
index 0000000000000000000000000000000000000000..232f7de8d3416e70bfa5a31e3734b132b0765ffa
--- /dev/null
+++ b/plugins/Resolution/lang/sv.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfiguration",
+ "ColumnResolution": "Skärmupplösning",
+ "Configurations": "Konfiguration",
+ "Resolutions": "Skärmupplösning",
+ "WidgetGlobalVisitors": "Global besökarkonfiguration",
+ "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.",
+ "WidgetResolutions": "Skärmupplösning"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/te.json b/plugins/Resolution/lang/te.json
new file mode 100644
index 0000000000000000000000000000000000000000..ee4af78da4ba954335f25b6672cb638ed0defb34
--- /dev/null
+++ b/plugins/Resolution/lang/te.json
@@ -0,0 +1,6 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "à°¸à±à°µà°°à±‚పణం",
+ "Configurations": "à°¸à±à°µà°°à±‚పణలà±"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/th.json b/plugins/Resolution/lang/th.json
new file mode 100644
index 0000000000000000000000000000000000000000..dcdc1ca7d194985e38d40e8d9c542a6eb99eb7ad
--- /dev/null
+++ b/plugins/Resolution/lang/th.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า",
+ "ColumnResolution": "ความละเà¸à¸µà¸¢à¸”",
+ "Configurations": "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่า",
+ "Resolutions": "ความละเà¸à¸µà¸¢à¸”",
+ "WidgetGlobalVisitors": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าผู้เข้าชมโดยรวม",
+ "WidgetResolutions": "ความละเà¸à¸µà¸¢à¸”จà¸à¸ าพ"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/tl.json b/plugins/Resolution/lang/tl.json
new file mode 100644
index 0000000000000000000000000000000000000000..5d126ac0f69f5094d7769b8e14b0cdeeea0d1de3
--- /dev/null
+++ b/plugins/Resolution/lang/tl.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Configuration",
+ "ColumnResolution": "Resolusyon",
+ "Configurations": "Configurations",
+ "Resolutions": "Mga Resolution",
+ "WidgetGlobalVisitors": "Configuration ng bisita",
+ "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.",
+ "WidgetResolutions": "Screen Resolution"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/tr.json b/plugins/Resolution/lang/tr.json
new file mode 100644
index 0000000000000000000000000000000000000000..91a8e73aa4359267ea64c96dec0710ec7e95b276
--- /dev/null
+++ b/plugins/Resolution/lang/tr.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Konfigürasyon",
+ "ColumnResolution": "Çözünürlük",
+ "Configurations": "Konfigürasyonları",
+ "Resolutions": "Çözünürlükler",
+ "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu",
+ "WidgetResolutions": "Ekran çözünürlükleri"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/uk.json b/plugins/Resolution/lang/uk.json
new file mode 100644
index 0000000000000000000000000000000000000000..546bbaec4795141e29ba7d4f4ac71e52cf6196de
--- /dev/null
+++ b/plugins/Resolution/lang/uk.json
@@ -0,0 +1,10 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "КонфігураціÑ",
+ "ColumnResolution": "Роздільна здатніÑÑ‚ÑŒ",
+ "Configurations": "Конфігурації",
+ "Resolutions": "Роздільні здатноÑÑ‚Ñ–",
+ "WidgetGlobalVisitors": "Загальна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ñ‡Ñ–Ð²",
+ "WidgetResolutions": "Роздільні здатноÑÑ‚Ñ–"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/vi.json b/plugins/Resolution/lang/vi.json
new file mode 100644
index 0000000000000000000000000000000000000000..600e5fe0ad6719eacb49721b0c1de31ebd7ab94e
--- /dev/null
+++ b/plugins/Resolution/lang/vi.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "Cấu hình",
+ "ColumnResolution": "Äá»™ phân giải",
+ "Configurations": "cấu hình",
+ "Resolutions": "Äá»™ phân giải",
+ "WidgetGlobalVisitors": "Cấu hình khách truy cáºp",
+ "WidgetGlobalVisitorsDocumentation": "Báo cáo nà y cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cáºp của bạn đã có. Má»™t cấu hình là sá»± kết hợp của má»™t hệ Ä‘iá»u hà nh, má»™t loại trình duyệt và độ phân giải mà n hình.",
+ "WidgetResolutions": "Äá»™ phân giải mà n hình"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/zh-cn.json b/plugins/Resolution/lang/zh-cn.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad8ae4895eca913f2e699626d54dd9ab031dec78
--- /dev/null
+++ b/plugins/Resolution/lang/zh-cn.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "客户端é…ç½®",
+ "ColumnResolution": "分辨率",
+ "Configurations": "客户端é…ç½®",
+ "Resolutions": "分辨率",
+ "WidgetGlobalVisitors": "访客设置",
+ "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统é…置。系统é…置是æ“作系统ã€æµè§ˆå™¨ç±»åž‹åŠæ˜¾ç¤ºå™¨åˆ†è¾¨çŽ‡çš„组åˆã€‚",
+ "WidgetResolutions": "ç”»é¢åˆ†è¾¨çŽ‡"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/zh-tw.json b/plugins/Resolution/lang/zh-tw.json
new file mode 100644
index 0000000000000000000000000000000000000000..6247b35720f6b205a44f2e830a3e90cb4d3a5fb8
--- /dev/null
+++ b/plugins/Resolution/lang/zh-tw.json
@@ -0,0 +1,11 @@
+{
+ "Resolution": {
+ "ColumnConfiguration": "客戶端é…ç½®",
+ "ColumnResolution": "解æžåº¦",
+ "Configurations": "客戶端é…ç½®",
+ "Resolutions": "解æžåº¦",
+ "WidgetGlobalVisitors": "全域訪客é…ç½®",
+ "WidgetGlobalVisitorsDocumentation": "æ¤å ±è¡¨åˆ—出貴站訪客最常見的è¨å®šé…置。è¨å®šé…置包å«ä½œæ¥ç³»çµ±ã€ç€è¦½å™¨ã€èž¢å¹•è§£æžåº¦ç‰è³‡è¨Šã€‚",
+ "WidgetResolutions": "ç•«é¢è§£æžåº¦"
+ }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/Commands/TestsRun.php b/plugins/TestRunner/Commands/TestsRun.php
index 0aaef900496921308b1e2836215843646c583cd4..e7b02512b39a094f04034b677efcbecb4078afa5 100644
--- a/plugins/TestRunner/Commands/TestsRun.php
+++ b/plugins/TestRunner/Commands/TestsRun.php
@@ -47,7 +47,11 @@ class TestsRun extends ConsoleCommand
$command = '../../vendor/phpunit/phpunit/phpunit';
if (!$this->isCoverageEnabled($options) && $this->isXdebugLoaded()) {
- $output->writeln('<comment>Did you know? You can run tests faster by disabling xdebug</comment>');
+ $message = 'Did you know? You can run tests faster by disabling xdebug';
+ if($this->isXdebugCodeCoverageEnabled()) {
+ $message .= ' (if you need xdebug, speed up tests by setting xdebug.coverage_enable=0)</comment>';
+ }
+ $output->writeln('<comment>' . $message .'</comment>');
}
// force xdebug usage for coverage options
@@ -255,6 +259,11 @@ class TestsRun extends ConsoleCommand
return extension_loaded('xdebug');
}
+ private function isXdebugCodeCoverageEnabled()
+ {
+ return (bool)ini_get('xdebug.coverage_enable');
+ }
+
private function fixPathToTestFileOrDirectory($testFile)
{
if ('/' !== substr($testFile, 0, 1)) {
diff --git a/plugins/TestRunner/templates/travis.yml.twig b/plugins/TestRunner/templates/travis.yml.twig
index 1972feb6c82eea7b6ba3e42dcf2dc76e47e6acef..c7faa74372508f64ee1cfd7525bf5bb893a2488b 100644
--- a/plugins/TestRunner/templates/travis.yml.twig
+++ b/plugins/TestRunner/templates/travis.yml.twig
@@ -146,8 +146,6 @@ before_script:
# configure mysql
- mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default
- # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6)
- - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'"
- mysql -e "SELECT @@sql_mode;"
- mysql -e "SHOW GLOBAL VARIABLES;"
{% if pluginName is empty %}
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 44a39fdcf52a03f28acc42a1f19e23fc470e48ea..7092fee8f89318e7701caadefb6a0c48ecee4335 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -523,8 +523,8 @@ class API extends \Piwik\Plugin\API
if ($visits) {
// load details (i.e. subtables)
$details = array();
- if ($idSubTable = $row->getIdSubDataTable()) {
- $subTable = Manager::getInstance()->getTable($idSubTable);
+ $subTable = $row->getSubtable();
+ if ($subTable) {
foreach ($subTable->getRows() as $subRow) {
$details[] = array(
'label' => $subRow->getColumn('label'),
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 1a80da3e9f84f9fba1d8bf65edf779eaeb591188..9f3649d3badc79735e85e7569fdbfe03b60a2f19 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -39,17 +39,20 @@ class API extends \Piwik\Plugin\API
return $dataTable;
}
+ /**
+ * @deprecated since 2.10.0 See {@link Piwik\Plugins\Resolution\API} for new implementation.
+ */
public function getResolution($idSite, $period, $date, $segment = false)
{
- $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment);
- return $dataTable;
+ return \Piwik\Plugins\Resolution\API::getInstance()->getResolution($idSite, $period, $date, $segment);
}
+ /**
+ * @deprecated since 2.10.0 See {@link Piwik\Plugins\Resolution\API} for new implementation.
+ */
public function getConfiguration($idSite, $period, $date, $segment = false)
{
- $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment);
- $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getConfigurationLabel'));
- return $dataTable;
+ return \Piwik\Plugins\Resolution\API::getInstance()->getConfiguration($idSite, $period, $date, $segment);
}
protected function getDevicesDetectorApi()
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index 740e5d4d94569aee38bb18ed2d0fb10c08e567c1..a9b67a135cd4926c08ffab7d21690f71bdbe1ff0 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -26,12 +26,8 @@ class Archiver extends \Piwik\Plugin\Archiver
{
const LANGUAGE_RECORD_NAME = 'UserSettings_language';
const PLUGIN_RECORD_NAME = 'UserSettings_plugin';
- const RESOLUTION_RECORD_NAME = 'UserSettings_resolution';
- const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration';
const LANGUAGE_DIMENSION = "log_visit.location_browser_lang";
- const RESOLUTION_DIMENSION = "log_visit.config_resolution";
- const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)";
/**
* Daily archive of User Settings report. Processes reports for Visits by Resolution,
@@ -39,8 +35,6 @@ class Archiver extends \Piwik\Plugin\Archiver
*/
public function aggregateDayReport()
{
- $this->aggregateByConfiguration();
- $this->aggregateByResolution();
$this->aggregateByPlugin();
$this->aggregateByLanguage();
}
@@ -51,30 +45,12 @@ class Archiver extends \Piwik\Plugin\Archiver
public function aggregateMultipleReports()
{
$dataTableRecords = array(
- self::CONFIGURATION_RECORD_NAME,
- self::RESOLUTION_RECORD_NAME,
self::PLUGIN_RECORD_NAME,
self::LANGUAGE_RECORD_NAME,
);
$this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
}
- protected function aggregateByConfiguration()
- {
- $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable();
- $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics);
- }
-
- protected function aggregateByResolution()
- {
- $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable();
- $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) {
- return strlen($value) <= 5;
- }));
- $this->insertTable(self::RESOLUTION_RECORD_NAME, $table);
- return $table;
- }
-
protected function aggregateByPlugin()
{
$selects = array(
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index a6154b5f29fa52eb900ef07635280afb98dbcea0..8c64ede3da689cc2fae0b20becca4a5273d9da79 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -8,10 +8,10 @@
*/
namespace Piwik\Plugins\UserSettings;
-use Piwik\Plugins\UserSettings\Reports\GetConfiguration;
+use Piwik\Plugins\Resolution\Reports\GetConfiguration;
use Piwik\Plugins\UserSettings\Reports\GetLanguage;
use Piwik\Plugins\UserSettings\Reports\GetPlugin;
-use Piwik\Plugins\UserSettings\Reports\GetResolution;
+use Piwik\Plugins\Resolution\Reports\GetResolution;
use Piwik\View;
/**
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index 81584705449c317ddd381d17acf02aae64217a49..f72269dedf46dca4dd3f779e606132c5e3520df3 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -45,20 +45,23 @@ class UserSettings extends \Piwik\Plugin
'getMobileVsDesktop' => 'getType',
'getOS' => 'getOsVersions',
'getOSFamily' => 'getOsFamilies',
- 'getBrowserType' => 'getBrowserEngines'
+ 'getBrowserType' => 'getBrowserEngines',
);
if ($module == 'UserSettings' && array_key_exists($action, $movedMethods)) {
$module = 'DevicesDetection';
$action = $movedMethods[$action];
}
+
+ if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
+ $module = 'Resolution';
+ }
}
public function extendVisitorDetails(&$visitor, $details)
{
$instance = new Visitor($details);
- $visitor['resolution'] = $instance->getResolution();
$visitor['plugins'] = $instance->getPlugins();
$visitor['pluginsIcons'] = $instance->getPluginIcons();
}
diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php
index 33f3528487be8af92b2ca7384108dda5ffae1ff2..e399cba3ac69e23647df0f22a0c6fa6664b6dd72 100644
--- a/plugins/UserSettings/Visitor.php
+++ b/plugins/UserSettings/Visitor.php
@@ -62,13 +62,4 @@ class Visitor
return null;
}
-
- function getResolution()
- {
- if (!array_key_exists('config_resolution', $this->details)) {
- return null;
- }
-
- return $this->details['config_resolution'];
- }
}
\ No newline at end of file
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index eaab5557c7c7f1325046539cacdf84d112a490a3..c50e84146ebcc848c9707d165e1be97e6b5f5f84 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -20,23 +20,6 @@ function getPluginsLogo($oldLabel)
return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif';
}
-function getConfigurationLabel($str)
-{
- if (strpos($str, ';') === false) {
- return $str;
- }
- $values = explode(";", $str);
-
- $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]);
- $name = $values[1];
- $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name);
- if ($browser === false) {
- $browser = Piwik::translate('General_Unknown');
- }
- $resolution = $values[2];
- return $os . " / " . $browser . " / " . $resolution;
-}
-
/**
* Returns the given language code to translated language name
*
diff --git a/plugins/UserSettings/images/screens/dual.gif b/plugins/UserSettings/images/screens/dual.gif
deleted file mode 100644
index a8cb8b2963161e15e2b303a568734d8aab4f5f52..0000000000000000000000000000000000000000
Binary files a/plugins/UserSettings/images/screens/dual.gif and /dev/null differ
diff --git a/plugins/UserSettings/images/screens/mobile.gif b/plugins/UserSettings/images/screens/mobile.gif
deleted file mode 100644
index 814642933fd6eaa9d27969b7f6a0ec117f86ffed..0000000000000000000000000000000000000000
Binary files a/plugins/UserSettings/images/screens/mobile.gif and /dev/null differ
diff --git a/plugins/UserSettings/images/screens/normal.gif b/plugins/UserSettings/images/screens/normal.gif
deleted file mode 100644
index afe97e9d9f27c9d441553d85acb415a3024e1d79..0000000000000000000000000000000000000000
Binary files a/plugins/UserSettings/images/screens/normal.gif and /dev/null differ
diff --git a/plugins/UserSettings/images/screens/unknown.gif b/plugins/UserSettings/images/screens/unknown.gif
deleted file mode 100644
index 2c44083422b7fbc300fa4a7486d805321244f7e5..0000000000000000000000000000000000000000
Binary files a/plugins/UserSettings/images/screens/unknown.gif and /dev/null differ
diff --git a/plugins/UserSettings/images/screens/wide.gif b/plugins/UserSettings/images/screens/wide.gif
deleted file mode 100644
index 1b09fc529b110e3e7cee16ff55a6ddc63bba909b..0000000000000000000000000000000000000000
Binary files a/plugins/UserSettings/images/screens/wide.gif and /dev/null differ
diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json
index 2897ffa61859cb466ab7cc09eb4e8c2c92aa0d4f..037b6c32494c1db073498bf1524e01dfdf20e63d 100644
--- a/plugins/UserSettings/lang/am.json
+++ b/plugins/UserSettings/lang/am.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "á‹á‰…ረት",
- "ColumnResolution": "ጥራት",
- "Configurations": "á‹á‰…ረቶች",
"Language_aa": "አá‹áˆáŠ›",
"Language_ab": "አብáˆá‹šáŠ›",
"Language_af": "አáሪካንስኛ",
@@ -158,10 +155,7 @@
"Language_zh": "ቻá‹áŠ•áŠ›",
"Language_zu": "ዙሉኛ",
"LanguageCode": "የቋንቋ ኮድ",
- "Resolutions": "ጥራቶች",
"VisitorSettings": "የጎበኚዎች ቅንብሮች",
- "WidgetGlobalVisitors": "የáˆáˆ‰áˆ ጎብኚዎች á‹á‰…ረት",
- "WidgetPlugins": "የተሰኪዎች á‹áˆá‹áˆ",
- "WidgetResolutions": "የማያ ጥራቶች"
+ "WidgetPlugins": "የተሰኪዎች á‹áˆá‹áˆ"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserSettings/lang/ar.json
index cd0a0568c2b15af713bc9e650bcab9affc98c783..3613ab75dfcec097dbdeae93c0729525029e8b54 100644
--- a/plugins/UserSettings/lang/ar.json
+++ b/plugins/UserSettings/lang/ar.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "الإعداد",
- "ColumnResolution": "الكثاÙØ© النقطية",
- "Configurations": "الإعدادات",
"Language_aa": "الأÙارية",
"Language_ab": "الأبخازية",
"Language_ae": "الأÙستية",
@@ -189,10 +186,7 @@
"LanguageCode": "كود اللغة",
"PluginDescription": "تقارير عن إعدادات المستخدمين المختلÙØ©: المتصÙØØŒ عائلة المتصÙØØŒ نظام التشغيل، الإضاÙات البرمجية، كثاÙØ© الشاشة النقطية، الإعدادات العامة.",
"PluginDetectionDoesNotWorkInIE": "ملاØظة: اكتشا٠الإضاÙات البرمجية لا تعمل ÙÙŠ متصÙØ Ø¥Ù†ØªØ±Ù†Øª إكسبلورر. هذه الخاصية ترتكز للمتصÙØات من العائلات الأخرى غير إنترنت إكسبلورر.",
- "Resolutions": "الكثاÙات النقطية",
"VisitorSettings": "إعدادات الزوار",
- "WidgetGlobalVisitors": "الإعدادات العامة للزوار",
- "WidgetPlugins": "قائمة الإضاÙات",
- "WidgetResolutions": "كثاÙات الشاشة النقطية"
+ "WidgetPlugins": "قائمة الإضاÙات"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserSettings/lang/be.json
index 7e0d6090ae0bbad611e0374967f1ee0d9e299d91..910b353116d0ff8880ee0ad438ac1b401ee46233 100644
--- a/plugins/UserSettings/lang/be.json
+++ b/plugins/UserSettings/lang/be.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "КанфігурацыÑ",
- "ColumnResolution": "Дазвол",
- "Configurations": "Па канфігурацыі",
"Language_ab": "абхазÑкаÑ",
"Language_af": "афрыкаанÑ",
"Language_am": "амхарÑкаÑ",
@@ -120,12 +117,8 @@
"LanguageCode": "Код мовы",
"PluginDescription": "Справаздачы наладак карыÑтальнікаў: БраўзÑÑ€, СÑмейÑтва БраўзÑÑ€ ÑÑм'Ñ–, ÐÐ¿ÐµÑ€Ð°Ñ†Ñ‹Ð¹Ð½Ð°Ñ ÑÑ–ÑÑ‚Ñма, Плагіны, Ð“Ð»Ð°Ð±Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹.",
"PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца Ñž Internet Explorer. ГÑта Ñправаздача заÑнавана на не-IE браўзарах.",
- "Resolutions": "Па дазволе манітораў",
"VisitorSettings": "Ðалады карыÑтача",
- "WidgetGlobalVisitors": "Ð“Ð»Ð°Ð±Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ",
- "WidgetGlobalVisitorsDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае найбольш раÑпаўÑÑŽÐ´Ð¶Ð°Ð½Ñ‹Ñ Ð°Ð³ÑƒÐ»ÑŒÐ½Ñ‹Ñ ÐºÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ–, ÑÐºÑ–Ñ Ð¼ÐµÐ»Ñ– вашы наведвальнікі. ÐšÐ°Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ‹Ñ - гÑта ÑпалучÑнне аперацыйнай ÑÑ–ÑÑ‚Ñмы, тыпу браўзÑра Ñ– дазволу Ñкрана.",
"WidgetPlugins": "Ð¡Ð¿Ñ–Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ð°Ñž",
- "WidgetPluginsDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ñ‹ были ўключаны Ñž браўзÑраў Вашых наведвальнікаў. ГÑÑ‚Ð°Ñ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð¼Ð¾Ð¶Ð° мець важнае значÑнне Ð´Ð»Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñƒ правільнага ÑпоÑабу даÑтаўкі кантÑнту.",
- "WidgetResolutions": "Дазвол манітораў"
+ "WidgetPluginsDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ñ‹ были ўключаны Ñž браўзÑраў Вашых наведвальнікаў. ГÑÑ‚Ð°Ñ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð¼Ð¾Ð¶Ð° мець важнае значÑнне Ð´Ð»Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñƒ правільнага ÑпоÑабу даÑтаўкі кантÑнту."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserSettings/lang/bg.json
index 857681dd6f5a2675b0a01561525f150c958d4892..15b03d0a3f0cc09ffb88485bbbc0f9f01427dd04 100644
--- a/plugins/UserSettings/lang/bg.json
+++ b/plugins/UserSettings/lang/bg.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Език на браузъра",
"BrowserWithNoPluginsEnabled": "%1$s без активни добавки",
"BrowserWithPluginsEnabled": "%1$s Ñ Ð´Ð¾Ð±Ð°Ð²ÐºÐ¸ %2$s активиран",
- "ColumnConfiguration": "Обобщена конфигурациÑ",
- "ColumnResolution": "Разделителна ÑпоÑобноÑÑ‚ на екрана",
- "Configurations": "Конфигурации",
"Language_aa": "афарÑки",
"Language_ab": "абхазки",
"Language_ae": "авеÑтийÑки",
@@ -193,12 +190,8 @@
"LanguageCode": "Код на езика",
"PluginDescription": "Докладът за различните потребителÑки наÑтройки: Браузър, Браузър СемейÑтво, операционна ÑиÑтема, модули, резолюциÑ, Глобални наÑтройки.",
"PluginDetectionDoesNotWorkInIE": "Забележка: ЗаÑичането на добавки не работи при Internet Explorer. Този доклад е базиран Ñамо на браузъри, различни от IE.",
- "Resolutions": "Разделителна ÑпоÑобноÑÑ‚",
"VisitorSettings": "ÐаÑтройки на поÑетителÑ",
- "WidgetGlobalVisitors": "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½Ð° гло",
- "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цÑлоÑтни конфигурации, които вашите поÑетители Ñа имали. ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ðµ комбинациÑта от операционна ÑиÑтема, тип на браузера и Ñ€ÐµÐ·Ð¾Ð»ÑŽÑ†Ð¸Ñ Ð½Ð° екрана.",
"WidgetPlugins": "Добавки",
- "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра Ñа използвали вашите поÑетители. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ðµ да е важна, за да изберете Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½ за доÑтавÑне на вашето Ñъдържание.",
- "WidgetResolutions": "Разделителна ÑпоÑобноÑÑ‚"
+ "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра Ñа използвали вашите поÑетители. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ðµ да е важна, за да изберете Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½ за доÑтавÑне на вашето Ñъдържание."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserSettings/lang/ca.json
index 9fedf7f751c4da8f27218fb8ee57a3340b130d75..ceb19d3255bb7349c55823f1442d739d8e253a1e 100644
--- a/plugins/UserSettings/lang/ca.json
+++ b/plugins/UserSettings/lang/ca.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Configuració",
- "ColumnResolution": "Resolució",
- "Configurations": "Configuracions",
"Language_aa": "Afar",
"Language_ab": "Abkhazian",
"Language_ae": "Avestan",
@@ -190,12 +187,8 @@
"LanguageCode": "Codi de l'idioma",
"PluginDescription": "Informe sobre les preferències del usuari: Navegador, FamÃlia del navegador, Sistema Operatiu, Extensions, Resolució, Preferències Globals",
"PluginDetectionDoesNotWorkInIE": "Nota: La detecció d'extensions no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer",
- "Resolutions": "Resolucions",
"VisitorSettings": "Configuració del visitant",
- "WidgetGlobalVisitors": "Configuracions globals dels visitants",
- "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.",
"WidgetPlugins": "Llistat de connectors",
- "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut.",
- "WidgetResolutions": "Resolucions"
+ "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserSettings/lang/cs.json
index 50fc94696581de64bfd3cf24397fa48c8437f023..4a78c685e1071535f950214ec18fecc28dc05c56 100644
--- a/plugins/UserSettings/lang/cs.json
+++ b/plugins/UserSettings/lang/cs.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Jazyk prohlÞeÄe",
"BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů",
"BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s",
- "ColumnConfiguration": "Konfigurace",
- "ColumnResolution": "RozliÅ¡enÃ",
- "Configurations": "NastavenÃ",
"Language_aa": "afarština",
"Language_ab": "abcházština",
"Language_ae": "avestánština",
@@ -193,12 +190,8 @@
"LanguageCode": "Jazykový kód",
"PluginDescription": "Zobrazà různá uživatelská nastavenÃ: prohlÞeÄ, rodinu prohlÞeÄů, operaÄnà systém, zásuvné moduly, rozliÅ¡enÃ, globálnà nastavenÃ.",
"PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlÞeÄi Interet Explorer. Toto hlášenà je založeno na ostatnÃch prohlÞeÄÃch",
- "Resolutions": "RozliÅ¡enÃ",
"VisitorSettings": "Nastavenà návÅ¡tÄ›vnÃků",
- "WidgetGlobalVisitors": "Hlavnà nastavenà návÅ¡tÄ›vnÃků",
- "WidgetGlobalVisitorsDocumentation": "Toto hlášenà zobrazuje nejÄastÄ›jÅ¡Ã konfigurace, které vaÅ¡i návÅ¡tÄ›vnÃci mÄ›li. Konfigurace je kombinace operaÄnÃho systému, prohlÞeÄe a rozliÅ¡enÃ.",
"WidgetPlugins": "Seznam zásuvných modulů",
- "WidgetPluginsDocumentation": "Toto hlášenà zobrazuje zásuvné moduly, které mÄ›li vaÅ¡i návÅ¡tÄ›vnÃci povoleny. Tato informace může být důležitá pÅ™i rozhodovánà o tom, jakým způsobem prezentovat obsah.",
- "WidgetResolutions": "Rozlišenà obrazovky"
+ "WidgetPluginsDocumentation": "Toto hlášenà zobrazuje zásuvné moduly, které mÄ›li vaÅ¡i návÅ¡tÄ›vnÃci povoleny. Tato informace může být důležitá pÅ™i rozhodovánà o tom, jakým způsobem prezentovat obsah."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserSettings/lang/da.json
index a03164022513431ff305a302f42acc010e7de9e9..e15b7576316560d692ae3e26eb9c1080f0f82a63 100644
--- a/plugins/UserSettings/lang/da.json
+++ b/plugins/UserSettings/lang/da.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Browser sprog",
"BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
"BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
- "ColumnConfiguration": "Konfiguration",
- "ColumnResolution": "Opløsning",
- "Configurations": "Indstillinger",
"Language_aa": "Afar",
"Language_ab": "Abkhasisk",
"Language_ae": "Avestisk",
@@ -193,12 +190,8 @@
"LanguageCode": "Sprogkode",
"PluginDescription": "Rapporter brugerindstillinger: browser, browsertype, operativsystem, udvidelsesmoduler, opløsning, globale indstillinger.",
"PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.",
- "Resolutions": "Opløsninger",
"VisitorSettings": "Besøgendes indstillinger",
- "WidgetGlobalVisitors": "Besøgendes konfiguration",
- "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.",
"WidgetPlugins": "Udvidelsesmoduler",
- "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på.",
- "WidgetResolutions": "Skærmopløsninger"
+ "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserSettings/lang/de.json
index 0b2cf46081b05a40612b28c16762652ddd03f941..465ae682d510782271d1e10eb28720eefdbc92e6 100644
--- a/plugins/UserSettings/lang/de.json
+++ b/plugins/UserSettings/lang/de.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Browsersprache",
"BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
"BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
- "ColumnConfiguration": "Konfiguration",
- "ColumnResolution": "Auflösung",
- "Configurations": "Konfigurationen",
"Language_aa": "Afar",
"Language_ab": "Abchasisch",
"Language_ae": "Avestisch",
@@ -193,12 +190,8 @@
"LanguageCode": "Sprach-Code",
"PluginDescription": "Bericht über verschiedene Benutzereinstellungen: Browser, Browserfamilie, Betriebssystem, Plugins, Auflösung, Allgemeine Einstellungen.",
"PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.",
- "Resolutions": "Auflösungen",
"VisitorSettings": "Besuchereinstellungen",
- "WidgetGlobalVisitors": "Globale Besucherkonfiguration",
- "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.",
"WidgetPlugins": "Liste der Plugins",
- "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern.",
- "WidgetResolutions": "Bildschirmauflösungen"
+ "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserSettings/lang/el.json
index 9b7f7395f68e0533659c11ebe9210ae71bbb1f64..3fff7c6576e23cd266a69fd6d9e4cc0833b319a8 100644
--- a/plugins/UserSettings/lang/el.json
+++ b/plugins/UserSettings/lang/el.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Γλώσσα φυλλομετÏητή",
"BrowserWithNoPluginsEnabled": "%1$s με ανενεÏγά Ï€Ïόσθετα",
"BrowserWithPluginsEnabled": "%1$s με %2$s Ï€Ïόσθετα ενεÏγά",
- "ColumnConfiguration": "ΡÏθμιση",
- "ColumnResolution": "Ανάλυση",
- "Configurations": "Ρυθμίσεις",
"Language_aa": "ΑφαÏικά",
"Language_ab": "Αμπχαζικά",
"Language_ae": "Αβεστανικά",
@@ -193,12 +190,8 @@
"LanguageCode": "Κωδικός γλώσσας",
"PluginDescription": "ΑναφÎÏει διάφοÏες Ρυθμίσεις ΧÏήστη: ΦυλλομετÏητής, Ομάδα ΦυλλομετÏητών, ΛειτουÏγικό ΣÏστημα, Î Ïόσθετα, Ανάλυση, ΓενικÎÏ‚ Ρυθμίσεις.",
"PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Î ÏοσθÎτων δεν λειτουÏγεί στον Internet Explorer. Αυτή η αναφοÏά βασίζεται μόνο σε μη IE φυλλομετÏητÎÏ‚.",
- "Resolutions": "ΑναλÏσεις οθόνης",
"VisitorSettings": "Ρυθμίσεις επισκÎπτη",
- "WidgetGlobalVisitors": "ΓενικÎÏ‚ Ïυθμίσεις χÏηστών",
- "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφοÏά δείχνει τις πιο συχνÎÏ‚ καθολικÎÏ‚ Ïυθμίσεις που Îχουν οι επισκÎπτες σας. Μια ÏÏθμιση είναι ο συνδυασμός του λειτουÏÎ³Î¹ÎºÎ¿Ï ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚, του Ï„Ïπου φυλλομετÏητή και της ανάλυσης οθόνης.",
"WidgetPlugins": "Λίστα Ï€ÏοσθÎτων",
- "WidgetPluginsDocumentation": "Αυτή η αναφοÏά δείχνει ποια Ï€Ïόσθετα φυλλομετÏητή Îχουν ενεÏγά οι επισκÎπτες σας. Αυτή η πληÏοφοÏία ίσως είναι σημαντική για την επιλογή του πιο ÏƒÏ‰ÏƒÏ„Î¿Ï Ï„Ïόπου απόδοσης του πεÏιεχομÎνου σας.",
- "WidgetResolutions": "ΑναλÏσεις οθόνης"
+ "WidgetPluginsDocumentation": "Αυτή η αναφοÏά δείχνει ποια Ï€Ïόσθετα φυλλομετÏητή Îχουν ενεÏγά οι επισκÎπτες σας. Αυτή η πληÏοφοÏία ίσως είναι σημαντική για την επιλογή του πιο ÏƒÏ‰ÏƒÏ„Î¿Ï Ï„Ïόπου απόδοσης του πεÏιεχομÎνου σας."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json
index c692af975cbb9c1bead67532537613ac2f746ed6..f5240dc9e25ff7b5992e3597be4f130d4c00ae34 100644
--- a/plugins/UserSettings/lang/en.json
+++ b/plugins/UserSettings/lang/en.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Browser language",
"BrowserWithNoPluginsEnabled": "%1$s with no plugins enabled",
"BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled",
- "ColumnConfiguration": "Configuration",
- "ColumnResolution": "Resolution",
- "Configurations": "Configurations",
"Language_aa": "Afar",
"Language_ab": "Abkhazian",
"Language_ae": "Avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Language code",
"PluginDescription": "Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.",
"PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.",
- "Resolutions": "Resolutions",
"VisitorSettings": "Visitor Settings",
- "WidgetGlobalVisitors": "Visitor Configuration",
- "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.",
"WidgetPlugins": "Browser Plugins",
- "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.",
- "WidgetResolutions": "Screen Resolution"
+ "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserSettings/lang/es.json
index 5a9898f09cafd44ec9eac4007a3b56be98865c76..5b068ba608f3b21301f32e51c9dfefeabcafef5f 100644
--- a/plugins/UserSettings/lang/es.json
+++ b/plugins/UserSettings/lang/es.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Idioma de Navegador",
"BrowserWithNoPluginsEnabled": "%1$s sin complementos habilitados",
"BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados",
- "ColumnConfiguration": "Configuración",
- "ColumnResolution": "Resoluciones",
- "Configurations": "Configuración",
"Language_aa": "Lejos",
"Language_ab": "Abjasia",
"Language_ae": "Avéstico",
@@ -193,12 +190,8 @@
"LanguageCode": "Código de idioma",
"PluginDescription": "Reporta varias configuraciones de usuario: Navegador, Familia del Navegador, Sistema Operativo, Plugins, Resolución, Configuración General.",
"PluginDetectionDoesNotWorkInIE": "Nota: la detección de Plugins no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.",
- "Resolutions": "Resoluciones",
"VisitorSettings": "Configuración de visitantes",
- "WidgetGlobalVisitors": "Configuración global de visitantes",
- "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.",
"WidgetPlugins": "Lista de Plugins",
- "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido.",
- "WidgetResolutions": "Resoluciones de pantalla"
+ "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserSettings/lang/et.json
index 4905768aca1a5e7cbe44ba3d9d11e3bbcdae875f..f88b9cef5de786ae37751553486f087710f333a1 100644
--- a/plugins/UserSettings/lang/et.json
+++ b/plugins/UserSettings/lang/et.json
@@ -1,9 +1,6 @@
{
"UserSettings": {
"BrowserLanguage": "Veebisirvija keel",
- "ColumnConfiguration": "Konfiguratsioon",
- "ColumnResolution": "Resolutsioon",
- "Configurations": "Konfiguratsioonid",
"Language_aa": "afari",
"Language_ab": "abhaasi",
"Language_ae": "avesta",
@@ -190,10 +187,7 @@
"Language_zu": "suulu",
"LanguageCode": "Keele kood",
"PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.",
- "Resolutions": "Ekraani resolutsioonid",
"VisitorSettings": "Külastajate seaded",
- "WidgetGlobalVisitors": "Kohalike külastajate seaded",
- "WidgetPlugins": "Sirviku lisatarkvarad",
- "WidgetResolutions": "Ekraani resolutsioonid"
+ "WidgetPlugins": "Sirviku lisatarkvarad"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserSettings/lang/eu.json
index 902a023d2e5d2cd61da71c478a64eb39bc2c3ce4..ad33730e0888e6b1e7d268beec73de35a6eecdf0 100644
--- a/plugins/UserSettings/lang/eu.json
+++ b/plugins/UserSettings/lang/eu.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigurazioa",
- "ColumnResolution": "Bereizmena",
- "Configurations": "Konfigurazioak",
"Language_ab": "abkhazera",
"Language_af": "afrikaans",
"Language_ak": "Akanera",
@@ -149,10 +146,7 @@
"Language_zh": "txinera",
"Language_zu": "zuluera",
"LanguageCode": "Hizkuntza-kodea",
- "Resolutions": "Bereizmenak",
"VisitorSettings": "Bisitariaren ezarpenak",
- "WidgetGlobalVisitors": "Bisitarien konfigurazioa",
- "WidgetPlugins": "Pluginen zerrenda",
- "WidgetResolutions": "Pantailaren bereizmenak"
+ "WidgetPlugins": "Pluginen zerrenda"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserSettings/lang/fa.json
index eb38d32cb50ffc013b40f05337d31de0a3984c85..fac25a4b88b094da90e5bbd70c9943d05f096be0 100644
--- a/plugins/UserSettings/lang/fa.json
+++ b/plugins/UserSettings/lang/fa.json
@@ -2,9 +2,6 @@
"UserSettings": {
"BrowserLanguage": "زبان مرورگر",
"BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را Ùعال کنید",
- "ColumnConfiguration": "پیکربندی",
- "ColumnResolution": "رزلوشن",
- "Configurations": "پیکربندی",
"Language_aa": "Ø¢Ùاری",
"Language_ab": "آبخازیایی",
"Language_ae": "اوستایی",
@@ -192,12 +189,8 @@
"LanguageCode": "کد زبان",
"PluginDescription": "گزارش تنظیمات کاربر های مختلÙ: مرورگر، Family (خانواده) مرورگر، سیستم عامل، پلاگین، سایز تصویر، تنظیمات جهانی است.",
"PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.",
- "Resolutions": "رزلوشن",
"VisitorSettings": "تنظیمات بازدید کننده",
- "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی",
- "WidgetGlobalVisitorsDocumentation": "این گزارش نشان Ù…ÛŒ دهد پیکربندی Ú©Ù„ÛŒ شایع ترین است Ú©Ù‡ بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر Ùˆ صÙØÙ‡ نمایش با ÙˆØ¶ÙˆØ Ø§Ø³Øª.",
"WidgetPlugins": "لیست اÙزونه ها",
- "WidgetPluginsDocumentation": "این گزارش نشان Ù…ÛŒ دهد Ú©Ù‡ پلاگین مرورگر بازدید کننده خود را Ùعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه Ù…Øتوای خود را.",
- "WidgetResolutions": "رزلوشن نمایشگر"
+ "WidgetPluginsDocumentation": "این گزارش نشان Ù…ÛŒ دهد Ú©Ù‡ پلاگین مرورگر بازدید کننده خود را Ùعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه Ù…Øتوای خود را."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserSettings/lang/fi.json
index f6bb711136ef2620dec0b962f493c483a4379554..938a7f518375c52cff3d76ccb0539550cde61f13 100644
--- a/plugins/UserSettings/lang/fi.json
+++ b/plugins/UserSettings/lang/fi.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Selaimen kieli",
"BrowserWithNoPluginsEnabled": "%1$s ilman liitännäisiä aktivoitu",
"BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu",
- "ColumnConfiguration": "Asetukset",
- "ColumnResolution": "Resoluutio",
- "Configurations": "Asetukset",
"Language_aa": "afar",
"Language_ab": "abkhazian",
"Language_ae": "avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Kielikoodi",
"PluginDescription": "Raportit käyttäjien asetuksista: selain, selaimen perhe, käyttöjärjestelmä, lisäosat, resoluutio, yleiset asetukset.",
"PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.",
- "Resolutions": "Resoluutio",
"VisitorSettings": "Kävijöiden asetukset",
- "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset",
- "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.",
"WidgetPlugins": "Lista lisäosista",
- "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille.",
- "WidgetResolutions": "Näytön resoluutio"
+ "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserSettings/lang/fr.json
index cb009e289c1bdd2ae6b126138257b4bc50b78d39..82ac789d1075a5aefc3208384a78786f089d141d 100644
--- a/plugins/UserSettings/lang/fr.json
+++ b/plugins/UserSettings/lang/fr.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Langage du navigateur",
"BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
"BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
- "ColumnConfiguration": "Configuration",
- "ColumnResolution": "Résolution",
- "Configurations": "Configurations",
"Language_aa": "Afar",
"Language_ab": "Abkhaze",
"Language_ae": "Avestique",
@@ -193,12 +190,8 @@
"LanguageCode": "Code langue",
"PluginDescription": "Effectue des rapports variés sur les paramètres utilisateurs: navigateur, famille du navigateur, système d'exploitation, plugins, résolution, paramètres généraux.",
"PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.",
- "Resolutions": "Résolutions",
"VisitorSettings": "Paramètres visiteur",
- "WidgetGlobalVisitors": "Configuration globale des visiteurs",
- "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.",
"WidgetPlugins": "Liste de Plugins",
- "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu.",
- "WidgetResolutions": "Résolutions d'écran"
+ "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserSettings/lang/gl.json
index e461b383d8c42a1d3e4d7aa30c325b161e0102eb..e18820cb79d934ae6a571d8226fe4161c5bef98e 100644
--- a/plugins/UserSettings/lang/gl.json
+++ b/plugins/UserSettings/lang/gl.json
@@ -1,6 +1,5 @@
{
"UserSettings": {
- "Configurations": "Configuracións",
"Language_ab": "abkhazo",
"Language_af": "Afrikaans",
"Language_ak": "Akán",
@@ -148,9 +147,6 @@
"Language_zh": "Chinés",
"Language_zu": "Zulú",
"LanguageCode": "Código de idioma",
- "Resolutions": "Resolucións",
- "WidgetGlobalVisitors": "Configuración global de visitantes",
- "WidgetPlugins": "Lista de plugins",
- "WidgetResolutions": "Resolucións de pantalla"
+ "WidgetPlugins": "Lista de plugins"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/he.json b/plugins/UserSettings/lang/he.json
index b6d08a31e71607eaab8042249f114f3609144d9a..5a31eaa865c572ad43ad8ac896582efbaea292c1 100644
--- a/plugins/UserSettings/lang/he.json
+++ b/plugins/UserSettings/lang/he.json
@@ -184,7 +184,6 @@
"Language_za": "×–'ו×× ×’",
"Language_zh": "×¡×™× ×™×ª",
"Language_zu": "זולו",
- "LanguageCode": "קוד שפה",
- "WidgetResolutions": "רזולוציית מסך"
+ "LanguageCode": "קוד שפה"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hi.json b/plugins/UserSettings/lang/hi.json
index d6963d29e52c4e0c8e26575c44e3085db1b2e3e3..e8b314eb2ec24aa47aa15fdf13ce50a55da18794 100644
--- a/plugins/UserSettings/lang/hi.json
+++ b/plugins/UserSettings/lang/hi.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° की à¤à¤¾à¤·à¤¾",
"BrowserWithNoPluginsEnabled": "%1$s के साथ पà¥à¤²à¤—इन सकà¥à¤°à¤¿à¤¯ नहीं",
"BrowserWithPluginsEnabled": "पà¥à¤²à¤—िन %2$s से %1$s सकà¥à¤·à¤®",
- "ColumnConfiguration": "विनà¥à¤¯à¤¾à¤¸",
- "ColumnResolution": "संकलà¥à¤ª",
- "Configurations": "विनà¥à¤¯à¤¾à¤¸",
"Language_aa": "अफ़ार",
"Language_ab": "अबà¥à¤–ाज़ियनà¥",
"Language_ae": "अवेसà¥à¤¤à¤¨",
@@ -193,8 +190,6 @@
"LanguageCode": "à¤à¤¾à¤·à¤¾ कोड",
"PluginDescription": "विà¤à¤¿à¤¨à¥à¤¨ उपयोगकरà¥à¤¤à¤¾ सेटिंगà¥à¤¸ की रिपोरà¥à¤Ÿ: बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°, बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° परिवार, आपरेटिंग सिसà¥à¤Ÿà¤®, पà¥à¤²à¤—इनà¥à¤¸, संकलà¥à¤ª, वैशà¥à¤µà¤¿à¤• सेटिंगà¥à¤¸.",
"PluginDetectionDoesNotWorkInIE": "नोट: पà¥à¤²à¤—इनà¥à¤¸ का पता लगाने इंटरनेट à¤à¤•à¥à¤¸à¤ªà¥à¤²à¥‹à¤°à¤° में काम नहीं करता है. यह रिपोरà¥à¤Ÿ केवल गैर आईई बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°à¥‹à¤‚ पर आधारित है.",
- "Resolutions": "संकलà¥à¤ª",
- "VisitorSettings": "आगंतà¥à¤• सेटिंगà¥à¤¸",
- "WidgetGlobalVisitors": "आगंतà¥à¤• विनà¥à¤¯à¤¾à¤¸"
+ "VisitorSettings": "आगंतà¥à¤• सेटिंगà¥à¤¸"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hr.json b/plugins/UserSettings/lang/hr.json
index 91cfd9bc1c9faa9ccabdde4e3ce38ecfae837c34..533587f029269b5e2a1c0d0938b510f7b85b32c4 100644
--- a/plugins/UserSettings/lang/hr.json
+++ b/plugins/UserSettings/lang/hr.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "KOnfiguracija",
- "ColumnResolution": "Rezolucija",
- "Configurations": "Konfiguracija",
"Language_aa": "afarski",
"Language_ab": "abhaski",
"Language_ae": "avestan",
diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserSettings/lang/hu.json
index 2bdabbf3c4fa60019afab0d18815f3c5b3c95d77..d42c8f4cb317d2fd82d64ece9ef52bd2fa35fc80 100644
--- a/plugins/UserSettings/lang/hu.json
+++ b/plugins/UserSettings/lang/hu.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfiguráció",
- "ColumnResolution": "Felbontás",
- "Configurations": "Konfigurációk",
"Language_aa": "afar",
"Language_ab": "abház",
"Language_ae": "avesztán",
@@ -190,10 +187,7 @@
"LanguageCode": "Nyelvi kód",
"PluginDescription": "Jelentéseket készÃt a látogatóknál észlelt beállÃtásokról és rendszerkörnyezetrÅ‘l mint például: böngészÅ‘ tÃpusa, böngészÅ‘családok, operációs rendszer, böngészÅ‘ bÅ‘vÃtmények, képernyÅ‘felbontás, globális beállÃtások.",
"PluginDetectionDoesNotWorkInIE": "A böngészÅ‘k bÅ‘vÃtményeinek detektálása nem működik az Internet Exlporernél, Ãgy ez a jelentés csak a nem Internet Explorert használó látogatók adatait jelenÃti meg.",
- "Resolutions": "Képernyőfelbontások",
"VisitorSettings": "Látogatók adatai",
- "WidgetGlobalVisitors": "Globális látogatói beállÃtások",
- "WidgetPlugins": "BÅ‘vÃtmények listája",
- "WidgetResolutions": "Képernyőfelbontások"
+ "WidgetPlugins": "BÅ‘vÃtmények listája"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserSettings/lang/id.json
index 990dbd67b13123498a919aef8e77e49f742a6364..cd7d7677e61684f03174dece9c101ffc1005b0b1 100644
--- a/plugins/UserSettings/lang/id.json
+++ b/plugins/UserSettings/lang/id.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Bahasa Peramban",
"BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
"BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
- "ColumnConfiguration": "Pengaturan",
- "ColumnResolution": "Resolusi",
- "Configurations": "Pengaturan",
"Language_aa": "Afar",
"Language_ab": "Abkhaz",
"Language_ae": "Avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Kode Bahasa",
"PluginDescription": "Laporan Pengaturan Pengguna: Peramban, Keluarga Peramban, Sistem Operasi, Pengaya, Resolusi Layar, Pengaturan Umum.",
"PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.",
- "Resolutions": "Resolusi",
"VisitorSettings": "Pengaturan Pengunjung",
- "WidgetGlobalVisitors": "Pengaturan pengunjung umum",
- "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.",
"WidgetPlugins": "Daftar Pengaya",
- "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda.",
- "WidgetResolutions": "Resolusi layar"
+ "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserSettings/lang/is.json
index ff81439a866f98c2dec73dd0fd5b51d482826c08..a962d9452ed09d473e8b3ae83456e6320beaed50 100644
--- a/plugins/UserSettings/lang/is.json
+++ b/plugins/UserSettings/lang/is.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Uppsetning",
- "ColumnResolution": "Skjáupplausn",
- "Configurations": "Uppsetningar",
"Language_aa": "afár",
"Language_ab": "abkasÃska",
"Language_ae": "avestÃska",
@@ -190,10 +187,7 @@
"LanguageCode": "Kóði tungumáls",
"PluginDescription": "Gefur skýrslu um ýmsar stillingar gesta:Vafra, Vafrafjölskyldu, Stýrikerfi, Ãbætur, Skjáupplausn, altækar stillingar.",
"PluginDetectionDoesNotWorkInIE": "Ath: uppgötvun á Ãbótum virkar ekki með Internet Explorer. Þessi skýrsla er aðeins unnin út frá öðrum vöfrum en IE.",
- "Resolutions": "Skjáupplausnir",
"VisitorSettings": "Stillingar gesta",
- "WidgetGlobalVisitors": "Altæk gestastilling",
- "WidgetPlugins": "Listi yfir Ãbætur",
- "WidgetResolutions": "Skjáupplausnir"
+ "WidgetPlugins": "Listi yfir Ãbætur"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserSettings/lang/it.json
index 981f75a30610cef76dbda6b2308b2f9c83abf205..0100bd079745208c044d6b2d11a67915b6ece60b 100644
--- a/plugins/UserSettings/lang/it.json
+++ b/plugins/UserSettings/lang/it.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Lingua Browser",
"BrowserWithNoPluginsEnabled": "%1$s con nessun plugin abilitato",
"BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati",
- "ColumnConfiguration": "Configurazione",
- "ColumnResolution": "Risoluzione",
- "Configurations": "Configurazioni",
"Language_aa": "afar",
"Language_ab": "abkhazian",
"Language_ae": "avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Codice della lingua",
"PluginDescription": "Mostra le varie impostazioni per gli utenti: Browser, Famiglia del Browser, Sistema Operativo, Plugin, Risoluzione, Impostazioni Globali.",
"PluginDetectionDoesNotWorkInIE": "N.B.: Questo plugin non funziona su Internet Explorer. Questo report è basato solamente sugli utenti di altri browser.",
- "Resolutions": "Risoluzioni",
"VisitorSettings": "Impostazioni visitatori",
- "WidgetGlobalVisitors": "Riepilogo configurazione visitatori",
- "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.",
"WidgetPlugins": "Lista dei Plugin",
- "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti.",
- "WidgetResolutions": "Risoluzione schermo"
+ "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserSettings/lang/ja.json
index 7e409d6a05e012fa18f387d3bc778bf118338777..7d1b353ac1af903555c948bcce12a3a0240e09e7 100644
--- a/plugins/UserSettings/lang/ja.json
+++ b/plugins/UserSettings/lang/ja.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "ブラウザã®è¨€èªž",
"BrowserWithNoPluginsEnabled": "%1$s ã®ãƒ—ラグインãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"BrowserWithPluginsEnabled": "%1$s ã®ãƒ—ラグイン %2$s ã¯æœ‰åŠ¹",
- "ColumnConfiguration": "環境è¨å®š",
- "ColumnResolution": "解åƒåº¦",
- "Configurations": "環境è¨å®š",
"Language_aa": "アファル語",
"Language_ab": "アブãƒã‚ºèªž",
"Language_ae": "アヴェスタ語",
@@ -193,12 +190,8 @@
"LanguageCode": "言語コード",
"PluginDescription": "å„種ユーザーè¨å®šï¼ˆãƒ–ラウザã€ãƒ–ラウザファミリーã€ã‚ªãƒšãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã‚·ã‚¹ãƒ†ãƒ ã€ãƒ—ラグインã€è§£åƒåº¦ã€å…¨èˆ¬è¨å®šï¼‰ã‚’リãƒãƒ¼ãƒˆã—ã¾ã™ã€‚",
"PluginDetectionDoesNotWorkInIE": "注æ„： Internet Explorer ã§ã¯ãƒ—ラグインã®æ¤œå‡ºãŒå‹•ä½œã—ã¾ã›ã‚“。 ã“ã®ãƒªãƒãƒ¼ãƒˆã¯ã€éž IE ブラウザã®ã¿ã«åŸºã¥ãã¾ã™ã€‚",
- "Resolutions": "解åƒåº¦",
"VisitorSettings": "ビジターã®ç’°å¢ƒ",
- "WidgetGlobalVisitors": "ビジターã®å…¨èˆ¬çš„ãªç’°å¢ƒè¨å®š",
- "WidgetGlobalVisitorsDocumentation": "ビジターã®æœ€ã‚‚一般的ãªåˆ©ç”¨ç’°å¢ƒã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚オペレーティングシステムã€ãƒ–ラウザã®ç¨®é¡žã¨ç”»é¢ã®è§£åƒåº¦ã®çµ„åˆã›ã§è¡¨ç¤ºã—ã¾ã™ã€‚",
"WidgetPlugins": "プラグイン一覧",
- "WidgetPluginsDocumentation": "ビジターãŒåˆ©ç”¨ã—ã¦ã„るブラウザã®ãƒ—ラグインã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚コンテンツã®æœ€é©ãªè¡¨ç¤ºæ–¹æ³•ã‚’é¸æŠžã™ã‚‹ãŸã‚ã«é‡è¦ãªæƒ…å ±ã§ã™ã€‚",
- "WidgetResolutions": "ç”»é¢è§£åƒåº¦"
+ "WidgetPluginsDocumentation": "ビジターãŒåˆ©ç”¨ã—ã¦ã„るブラウザã®ãƒ—ラグインã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚コンテンツã®æœ€é©ãªè¡¨ç¤ºæ–¹æ³•ã‚’é¸æŠžã™ã‚‹ãŸã‚ã«é‡è¦ãªæƒ…å ±ã§ã™ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserSettings/lang/ka.json
index 7dab7a6d2308c9a2e3ad435d1daa4b9bbb44700a..66d3b0aa4390ae1c44e884d000ed69fa23715101 100644
--- a/plugins/UserSettings/lang/ka.json
+++ b/plugins/UserSettings/lang/ka.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ",
- "ColumnResolution": "რეზáƒáƒšáƒ£áƒªáƒ˜áƒ",
- "Configurations": "გáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ”ბი",
"Language_aa": "áƒáƒ¤áƒáƒ ი",
"Language_ab": "áƒáƒ¤áƒ®áƒáƒ–ური",
"Language_ae": "áƒáƒ•áƒ”სტáƒ",
@@ -163,10 +160,7 @@
"LanguageCode": "ენის კáƒáƒ“ი",
"PluginDescription": "იძლევრáƒáƒœáƒ’áƒáƒ იშს მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სხვáƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ პáƒáƒ áƒáƒ›áƒ”ტრებზე: ბრáƒáƒ£áƒ–ერები, ბრáƒáƒ£áƒ–ერის áƒáƒ¯áƒáƒ®áƒ˜, áƒáƒžáƒ”რáƒáƒªáƒ˜áƒ£áƒšáƒ˜ სისტემáƒ, პლáƒáƒ’ინები, რეზáƒáƒšáƒ£áƒªáƒ˜áƒ, გლáƒáƒ‘áƒáƒšáƒ£áƒ ი პáƒáƒ áƒáƒ›áƒ”ტრები.",
"PluginDetectionDoesNotWorkInIE": "შენიშვნáƒ: პლáƒáƒ’ინების áƒáƒ›áƒáƒªáƒœáƒáƒ‘რáƒáƒ ხდებრინტერნეტ ექსპლáƒáƒ ერში. ეს რეპáƒáƒ ტი მუშáƒáƒáƒáƒ‘ს მხáƒáƒšáƒáƒ“ áƒáƒ áƒâ€“IE ბრáƒáƒ£áƒ–ერებზე.",
- "Resolutions": "რეზáƒáƒšáƒ£áƒªáƒ˜áƒ”ბი",
"VisitorSettings": "ვიზიტáƒáƒ ის პáƒáƒ áƒáƒ›áƒ”ტრები",
- "WidgetGlobalVisitors": "ვიზიტáƒáƒ ების გლáƒáƒ‘áƒáƒšáƒ£áƒ ი კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ",
- "WidgetPlugins": "პლáƒáƒ’ინების სიáƒ",
- "WidgetResolutions": "ეკრáƒáƒœáƒ˜áƒ¡ რეზáƒáƒšáƒ£áƒ•áƒ˜áƒ”ბი"
+ "WidgetPlugins": "პლáƒáƒ’ინების სიáƒ"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserSettings/lang/ko.json
index 25a2077b83ab941bfc233754af426cfe30ebc017..e0ebf9c47b764bc1d30d7a1cbbf6f417ae03dc92 100644
--- a/plugins/UserSettings/lang/ko.json
+++ b/plugins/UserSettings/lang/ko.json
@@ -1,9 +1,6 @@
{
"UserSettings": {
"BrowserLanguage": "브ë¼ìš°ì € 언어",
- "ColumnConfiguration": "구성",
- "ColumnResolution": "í•´ìƒë„",
- "Configurations": "구성",
"Language_aa": "아파르어",
"Language_ab": "압하스어",
"Language_ae": "ì•„ë² ìŠ¤íƒ€ì–´",
@@ -191,12 +188,8 @@
"LanguageCode": "언어 코드",
"PluginDescription": "ê°ì¢… ì‚¬ìš©ìž ì„¤ì • (브ë¼ìš°ì €, 브ë¼ìš°ì € 페밀리, ìš´ì˜ ì‹œìŠ¤í…œ, 플러그ì¸, í•´ìƒë„, ì¼ë°˜ ì„¤ì •)를 ë³´ê³ í•©ë‹ˆë‹¤.",
"PluginDetectionDoesNotWorkInIE": "ì°¸ê³ : Internet Explorerì—서는 í”ŒëŸ¬ê·¸ì¸ ê²€ìƒ‰ì´ ìž‘ë™í•˜ì§€ 않습니다. ì´ ë³´ê³ ì„œëŠ” IE 브ë¼ìš°ì €ê°€ ì•„ë‹Œê²ƒì— ê¸°ë°˜í•©ë‹ˆë‹¤.",
- "Resolutions": "í•´ìƒë„",
"VisitorSettings": "ë°©ë¬¸ìž ì„¤ì •",
- "WidgetGlobalVisitors": "글로벌 ë°©ë¬¸ìž êµ¬ì„±",
- "WidgetGlobalVisitorsDocumentation": "방문ìžì˜ 가장 ì¼ë°˜ì ì¸ ì‚¬ìš© í™˜ê²½ì— ëŒ€í•œ ë³´ê³ ì„œìž…ë‹ˆë‹¤. ìš´ì˜ ì²´ì œ, 브ë¼ìš°ì € 종류와 화면 í•´ìƒë„ì˜ ì¡°í•©ìœ¼ë¡œ 표시합니다.",
"WidgetPlugins": "í”ŒëŸ¬ê·¸ì¸ ëª©ë¡",
- "WidgetPluginsDocumentation": "방문ìžê°€ 사용하는 브ë¼ìš°ì €ì˜ 플러그ì¸ì— 대한 ë³´ê³ ì„œìž…ë‹ˆë‹¤. 컨í…ì¸ ì— ëŒ€í•œ 최ì ì˜ í‘œì‹œ ë°©ë²•ì„ ì„ íƒí•˜ëŠ” ë° ì¤‘ìš”í•œ ì •ë³´ìž…ë‹ˆë‹¤.",
- "WidgetResolutions": "스í¬ë¦° í•´ìƒë„"
+ "WidgetPluginsDocumentation": "방문ìžê°€ 사용하는 브ë¼ìš°ì €ì˜ 플러그ì¸ì— 대한 ë³´ê³ ì„œìž…ë‹ˆë‹¤. 컨í…ì¸ ì— ëŒ€í•œ 최ì ì˜ í‘œì‹œ ë°©ë²•ì„ ì„ íƒí•˜ëŠ” ë° ì¤‘ìš”í•œ ì •ë³´ìž…ë‹ˆë‹¤."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserSettings/lang/lt.json
index 321b8e40671b722cd20ebd826cce668930b256d1..84ab811625d6f792b82cdf967843d668cb57882f 100644
--- a/plugins/UserSettings/lang/lt.json
+++ b/plugins/UserSettings/lang/lt.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigūracija",
- "ColumnResolution": "Ekrano raiška",
- "Configurations": "Konfigūracijos",
"Language_aa": "afarų",
"Language_ab": "abchazų",
"Language_ae": "avestų",
@@ -190,10 +187,7 @@
"LanguageCode": "Kalbos kodas",
"PluginDescription": "Parodo įvairius lankytojo nustatymus: naršyklę, naršyklės šeimą, operacinę sistemą, papildinius, ekrano raišką, skiriamąją gebą, globalius nustatymus.",
"PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.",
- "Resolutions": "Ekranų raiškos",
"VisitorSettings": "Lankytojų nustatymai",
- "WidgetGlobalVisitors": "Bendri lankytojų nustatymai",
- "WidgetPlugins": "Papildinių sąrašas",
- "WidgetResolutions": "Ekrano raiška"
+ "WidgetPlugins": "Papildinių sąrašas"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserSettings/lang/lv.json
index 30db11418850b9f39be1ed3d78ea3a3e6a21d943..15f82b1f937499a9fa2132d63d2c8af7cc1c4399 100644
--- a/plugins/UserSettings/lang/lv.json
+++ b/plugins/UserSettings/lang/lv.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "KonfigurÄcija",
- "ColumnResolution": "EkrÄna izÅ¡Ä·irtspÄ“ja",
- "Configurations": "KonfigurÄcijas",
"Language_aa": "afÄru",
"Language_ab": "abhÄzu",
"Language_ae": "avesta",
@@ -190,12 +187,8 @@
"LanguageCode": "Valodas kods",
"PluginDescription": "Apskata dažÄdus lietotÄju iestatÄ«jumus: pÄrlÅ«ku, pÄrlÅ«ku Ä£imeni, operÄ“tÄjsistÄ“mu, spraudņus, ekrÄna izÅ¡Ä·irtspÄ“ju, globÄlos iestatÄ«jumus.",
"PluginDetectionDoesNotWorkInIE": "PiezÄ«me: spraudņu noteikÅ¡ana nedarbojas Internet Explorer pÄrlÅ«kÄ. Å Ä« atskaite ir bÄzÄ“ta tikai uz ne-IE pÄrlÅ«kiem.",
- "Resolutions": "EkrÄna izÅ¡Ä·irtspÄ“jas",
"VisitorSettings": "ApmeklÄ“tÄju iestatÄ«jumi",
- "WidgetGlobalVisitors": "GlobÄlÄ apmeklÄ“tÄju konfigurÄcija",
- "WidgetGlobalVisitorsDocumentation": "Å ajÄ atskaitÄ“ redzamas visbiežÄk izmantotÄs apmeklÄ“tÄju konfigurÄcijas. KonfigurÄcija ir operÄ“tÄjsistÄ“mas, pÄrlÅ«ka tipa un ekrÄna izÅ¡Ä·irtspÄ“jas kombinÄcija.",
"WidgetPlugins": "Spraudņu saraksts",
- "WidgetPluginsDocumentation": "Å ajÄ atskaitÄ“ ir redzami pÄrlÅ«ku spraudņi, kuri bija ieslÄ“gti apmeklÄ“tÄju pÄrlÅ«kos. Å Ä« informÄcija ir svarÄ«ga, lai izvÄ“lÄ“tos vislabÄko veidu kÄ piegÄdÄt saturu apmeklÄ“tÄjiem.",
- "WidgetResolutions": "EkrÄna izÅ¡Ä·irtspÄ“jas"
+ "WidgetPluginsDocumentation": "Å ajÄ atskaitÄ“ ir redzami pÄrlÅ«ku spraudņi, kuri bija ieslÄ“gti apmeklÄ“tÄju pÄrlÅ«kos. Å Ä« informÄcija ir svarÄ«ga, lai izvÄ“lÄ“tos vislabÄko veidu kÄ piegÄdÄt saturu apmeklÄ“tÄjiem."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserSettings/lang/nb.json
index 3950648d83e7f38bd229e0a6e93a5fae8691f6c1..9c25cc141e511663d08a899ffb503722e87a2aed 100644
--- a/plugins/UserSettings/lang/nb.json
+++ b/plugins/UserSettings/lang/nb.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigurasjon",
- "ColumnResolution": "Oppløsning",
- "Configurations": "Konfigurasjon",
"Language_aa": "afar",
"Language_ab": "abkhasisk",
"Language_ae": "avestisk",
@@ -189,10 +186,7 @@
"Language_zu": "zulu",
"LanguageCode": "Språkkode",
"PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.",
- "Resolutions": "Oppløsninger",
"VisitorSettings": "Besøkendes innstillinger",
- "WidgetGlobalVisitors": "Besøkendes konfigurasjon",
- "WidgetPlugins": "Liste over tillegg",
- "WidgetResolutions": "Skjermoppløsninger"
+ "WidgetPlugins": "Liste over tillegg"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserSettings/lang/nl.json
index 1f90affe5ab35cbea8743237577c791405e3673d..481c3f259eddfbf53d68132dcff4f876f602dbb8 100644
--- a/plugins/UserSettings/lang/nl.json
+++ b/plugins/UserSettings/lang/nl.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Browsertaal",
"BrowserWithNoPluginsEnabled": "%1$s zonder plugins ingeschakeld",
"BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld",
- "ColumnConfiguration": "Configuratie",
- "ColumnResolution": "Resolutie",
- "Configurations": "Configuraties",
"Language_aa": "Afar",
"Language_ab": "Abchazisch",
"Language_ae": "Avestisch",
@@ -193,12 +190,8 @@
"LanguageCode": "Taal code",
"PluginDescription": "Rapporteert verschillende gebruikers instellingen: Browser, Browser familie, Besturingssysteem, Plugins, Resolutie, Globale Instellingen.",
"PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE",
- "Resolutions": "Schermresoluties",
"VisitorSettings": "Bezoekers Instellingen",
- "WidgetGlobalVisitors": "Algemene configuratie",
- "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.",
"WidgetPlugins": "Geïnstalleerde plugins",
- "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden.",
- "WidgetResolutions": "Schermresoluties"
+ "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserSettings/lang/nn.json
index aa24a3f364ed86dc9457df0b59ef8ecfc90237d1..bbab7b45ce14bb40893b66e6c2cf12d2a45abd9c 100644
--- a/plugins/UserSettings/lang/nn.json
+++ b/plugins/UserSettings/lang/nn.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigurasjon",
- "ColumnResolution": "Oppløysing",
- "Configurations": "Konfigurasjonar",
"Language_aa": "afar",
"Language_ab": "abkhasisk",
"Language_ae": "avestisk",
@@ -190,10 +187,7 @@
"LanguageCode": "Språkkode",
"PluginDescription": "Rapporter diverse vitjarinnstillingar: Nettlesar, Nettlesarfamilie, operativsystem, oppløysing og globale innstillingar.",
"PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.",
- "Resolutions": "Oppløysingar",
"VisitorSettings": "Vitjarinnstillingar",
- "WidgetGlobalVisitors": "Global vitjarkonfigurasjon",
- "WidgetPlugins": "Liste over innstikk",
- "WidgetResolutions": "Skjermoppløysing"
+ "WidgetPlugins": "Liste over innstikk"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserSettings/lang/pl.json
index 69bc0e0122d20d454a299ca91f62645207c84f00..c8dce6a4bca51a66709903ebd3cdfe18b0520c37 100644
--- a/plugins/UserSettings/lang/pl.json
+++ b/plugins/UserSettings/lang/pl.json
@@ -1,9 +1,6 @@
{
"UserSettings": {
"BrowserLanguage": "Język przeglądarki",
- "ColumnConfiguration": "Konfiguracja",
- "ColumnResolution": "Rozdzielczość",
- "Configurations": "Konfiguracje",
"Language_aa": "afar",
"Language_ab": "abchaski",
"Language_ae": "awestyjski",
@@ -191,10 +188,7 @@
"LanguageCode": "Kod języka",
"PluginDescription": "Raporty rozmaitych konfiguracji użytkownika: przeglądarki, rodziny przeglądarek, systemów operacyjnych, wtyczek, rozdzielczości, ogólnej konfiguracji.",
"PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.",
- "Resolutions": "Rozdzielczość",
"VisitorSettings": "Konfiguracje użytkownika",
- "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających",
- "WidgetPlugins": "Lista wtyczek",
- "WidgetResolutions": "Rozdzielczość ekranu"
+ "WidgetPlugins": "Lista wtyczek"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserSettings/lang/pt-br.json
index 079ad711b436018e76031e016088496c59ae7ce7..3a4ea45b6d210e908c7128205e8076f018520333 100644
--- a/plugins/UserSettings/lang/pt-br.json
+++ b/plugins/UserSettings/lang/pt-br.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Idioma do navegador",
"BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
"BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
- "ColumnConfiguration": "Configuração",
- "ColumnResolution": "Resolução",
- "Configurations": "Configurações",
"Language_aa": "afar",
"Language_ab": "abcázio",
"Language_ae": "avéstico",
@@ -193,12 +190,8 @@
"LanguageCode": "Código do Idioma",
"PluginDescription": "Relatórios diversas configurações de usuário: navegador, navegador famÃlia, sistema operacional, plugins, resolução, configurações globais.",
"PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.",
- "Resolutions": "Resoluções",
"VisitorSettings": "Configurações dos visitantes",
- "WidgetGlobalVisitors": "Configuração Global de Visitante",
- "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.",
"WidgetPlugins": "Lista de Plugins",
- "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo.",
- "WidgetResolutions": "Resoluções de Tela"
+ "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserSettings/lang/pt.json
index a5017d4a16cc3b044b271951d522e9064f649ebc..cadd238f27b5942fbbba42fa15981114f0d85975 100644
--- a/plugins/UserSettings/lang/pt.json
+++ b/plugins/UserSettings/lang/pt.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Configuração",
- "ColumnResolution": "Resolução",
- "Configurations": "Configurações",
"Language_aa": "afar",
"Language_ab": "abcázio",
"Language_ae": "avéstico",
@@ -190,12 +187,8 @@
"LanguageCode": "Código do idioma",
"PluginDescription": "Relata várias Definições de Utilizador: Navegador, FamÃlia de Navegadores, Sistema Operativo, Plugins, Resolução, Definições Globais",
"PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.",
- "Resolutions": "Resoluções",
"VisitorSettings": "Definições do Visitante",
- "WidgetGlobalVisitors": "Configuração global dos visitantes",
- "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.",
"WidgetPlugins": "Lista de Plugins",
- "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo.",
- "WidgetResolutions": "Resoluções de Ecrã"
+ "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserSettings/lang/ro.json
index e39b81caffaa8b6cdf49b7a3b28d3ec4e7992d2d..ce0a61ab5aa3b3584dd026d09b17a29010cde94c 100644
--- a/plugins/UserSettings/lang/ro.json
+++ b/plugins/UserSettings/lang/ro.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Limba browser-ului",
"BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
"BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
- "ColumnConfiguration": "Configuraţia",
- "ColumnResolution": "Rezoluţie ecran",
- "Configurations": "Configurare",
"Language_aa": "Afar",
"Language_ab": "abhază",
"Language_ae": "avestană",
@@ -193,12 +190,8 @@
"LanguageCode": "Cod limbă",
"PluginDescription": "Rapoarte difera la setări utilizator: Browser, Browser de familie, sistemul de operare, plugins, Rezolutie, Global Setări.",
"PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.",
- "Resolutions": "Rezolutii",
"VisitorSettings": "Setări vizitatori",
- "WidgetGlobalVisitors": "Configurare vizitatori globala",
- "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.",
"WidgetPlugins": "Lista pluginurilor",
- "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut.",
- "WidgetResolutions": "Rezolutii ecran"
+ "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserSettings/lang/ru.json
index a55776ea0c406204dee0e1580ad480b87c7dcf73..dc4738a5de5fe212f763fdf954806ae6a25d5e4f 100644
--- a/plugins/UserSettings/lang/ru.json
+++ b/plugins/UserSettings/lang/ru.json
@@ -1,9 +1,6 @@
{
"UserSettings": {
"BrowserLanguage": "Язык браузера",
- "ColumnConfiguration": "КонфигурациÑ",
- "ColumnResolution": "Разрешение",
- "Configurations": "По конфигурации",
"Language_aa": "афар",
"Language_ab": "абхазÑкий",
"Language_ae": "авеÑтийÑкий",
@@ -191,12 +188,8 @@
"LanguageCode": "Код Ñзыка",
"PluginDescription": "Ведет учет различных наÑтроек пользователÑ: браузер, ÑемейÑтво браузера, Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑиÑтема, плагины, разрешение Ñкрана, а также глобальные наÑтройки.",
"PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Ðтот отчет Ñодержит информацию о не-IE браузерах.",
- "Resolutions": "По разрешению мониторов",
"VisitorSettings": "ÐаÑтройки поÑетителей",
- "WidgetGlobalVisitors": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
- "WidgetGlobalVisitorsDocumentation": "Ðтот отчет показывает общую информацию по наиболее популÑоным конфигурациÑм ÑиÑтемы ваших поÑетителей. ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ - Ñто ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¹ ÑиÑтемы, браузера и Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñкрана.",
"WidgetPlugins": "СпиÑок плагинов",
- "WidgetPluginsDocumentation": "Ðтот отчет показываетÑÑ ÐºÐ°ÐºÐ¸Ðµ плагины поÑетители иÑпользуют в Ñвоих браузерах. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть важна Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы поÑетители Ñмогли видеть ваш контент должным образом.",
- "WidgetResolutions": "По разрешению мониторов"
+ "WidgetPluginsDocumentation": "Ðтот отчет показываетÑÑ ÐºÐ°ÐºÐ¸Ðµ плагины поÑетители иÑпользуют в Ñвоих браузерах. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть важна Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы поÑетители Ñмогли видеть ваш контент должным образом."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserSettings/lang/sk.json
index 9874405ad0fe609d92af7d1740c63706bea5aed3..74a87bb041decc1e1b8620db5910a5e9f95c90e3 100644
--- a/plugins/UserSettings/lang/sk.json
+++ b/plugins/UserSettings/lang/sk.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigurácia",
- "ColumnResolution": "RozlÃÅ¡enie",
- "Configurations": "Konfigurácia",
"Language_aa": "afarÄina",
"Language_ab": "abcházština",
"Language_ae": "avestÄina",
@@ -190,10 +187,7 @@
"LanguageCode": "Kód jazyka",
"PluginDescription": "Rôzne reporty užÃvateľského nastavenia: PrehliadaÄ, Rodina prehliadaÄa, OperaÄný systém, Pluginy, RozlÃÅ¡enie, Globálne nastavenia.",
"PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadaÄov.",
- "Resolutions": "RozlÃÅ¡enie",
"VisitorSettings": "Nastavenia návÅ¡tevnÃkov",
- "WidgetGlobalVisitors": "Globálne konfigurácie návÅ¡tevnÃkov",
- "WidgetPlugins": "Zoznam modulov",
- "WidgetResolutions": "RozlÃÅ¡enie obrazovky"
+ "WidgetPlugins": "Zoznam modulov"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sl.json b/plugins/UserSettings/lang/sl.json
index 6a28d87223dc9cd152bf6942884df2a315a07e5f..9f6607afd2e9ec5b4038ee007c0402b3588f6481 100644
--- a/plugins/UserSettings/lang/sl.json
+++ b/plugins/UserSettings/lang/sl.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Jezik brskalnika",
"BrowserWithNoPluginsEnabled": "%1$s brez omogoÄenih vtiÄnikov",
"BrowserWithPluginsEnabled": "%1$s z omogoÄenimi vtiÄniki %2$s",
- "ColumnConfiguration": "Nastavitev",
- "ColumnResolution": "Resolucija",
- "Configurations": "Nastavitve",
"Language_aa": "afarÅ¡Äina",
"Language_ab": "abhaÅ¡Äina",
"Language_ae": "avestijÅ¡Äina",
@@ -191,9 +188,7 @@
"Language_zh": "kitajÅ¡Äina",
"Language_zu": "zulujÅ¡Äina",
"LanguageCode": "Å ifra jezika",
- "Resolutions": "Resolucije",
"VisitorSettings": "Nastavitve obiskovalcev",
- "WidgetPlugins": "Seznam VtiÄnikov",
- "WidgetResolutions": "Resolucija zaslona"
+ "WidgetPlugins": "Seznam VtiÄnikov"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserSettings/lang/sq.json
index 3920246e683a9eed50d853e1bdd6544322ea8019..d7dc1795b572621187ba1e00c84b7dc358873f6c 100644
--- a/plugins/UserSettings/lang/sq.json
+++ b/plugins/UserSettings/lang/sq.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Formësim",
- "ColumnResolution": "Qartësi",
- "Configurations": "Formësime",
"Language_af": "Afrikanisht",
"Language_am": "Amharike",
"Language_ar": "Arabisht",
@@ -107,12 +104,8 @@
"LanguageCode": "Kod Gjuhe",
"PluginDescription": "Raporton Rregullime të ndryshme të Përdoruesit: Shfletues, Familje Shfletuesi, Sistem Operativ, Shtojca, Qartësi, Rregullime Globale.",
"PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.",
- "Resolutions": "Qartësi",
"VisitorSettings": "Rregullimet për Vizitor",
- "WidgetGlobalVisitors": "Formësime globale vizitorësh",
- "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.",
"WidgetPlugins": "Listë e Shtojcave",
- "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj.",
- "WidgetResolutions": "Qartësi ekrani"
+ "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserSettings/lang/sr.json
index 289c2da55169c9cf2462cdbc60a1f32f240834f4..5fcf4549b4a8906a92bf735b067e1749d6fe58c4 100644
--- a/plugins/UserSettings/lang/sr.json
+++ b/plugins/UserSettings/lang/sr.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Jezik brauzera",
"BrowserWithNoPluginsEnabled": "%1$s sa iskljuÄenim dodacima",
"BrowserWithPluginsEnabled": "%1$s sa ukljuÄenim dodacima %2$s",
- "ColumnConfiguration": "Podešavanja",
- "ColumnResolution": "Rezolucija",
- "Configurations": "Podešavanja",
"Language_aa": "Afar",
"Language_ab": "Abhazijski",
"Language_ae": "Avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Kod jezika",
"PluginDescription": "IzveÅ¡taj o razliÄitim parametrima vezanim za posetioce: brauzeri, operativni sistemi, dodaci, ekranske rezolucije, globalna podeÅ¡avanja.",
"PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer",
- "Resolutions": "Rezolucije",
"VisitorSettings": "Parametri posetilaca",
- "WidgetGlobalVisitors": "Globalna podešavanja posetilaca",
- "WidgetGlobalVisitorsDocumentation": "Ovaj izveÅ¡taj prikazuje najÄešća podeÅ¡avanja vaÅ¡ih posetilaca. Pod podeÅ¡avanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.",
"WidgetPlugins": "Lista dodataka",
- "WidgetPluginsDocumentation": "Ovaj izveÅ¡taj prikazuje koje dodatke za brauzere vaÅ¡i posetioci imaju ukljuÄene. Ova informacija može biti od znaÄaja prilikom odabira pravog naÄina prikaza sadržaja na vaÅ¡em sajtu.",
- "WidgetResolutions": "Rezolucije ekrana"
+ "WidgetPluginsDocumentation": "Ovaj izveÅ¡taj prikazuje koje dodatke za brauzere vaÅ¡i posetioci imaju ukljuÄene. Ova informacija može biti od znaÄaja prilikom odabira pravog naÄina prikaza sadržaja na vaÅ¡em sajtu."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserSettings/lang/sv.json
index 558b7c7dfd825f6fcb3a32536c7418ddcfa68ee9..9cb34b693bbd6caf79741bc5bc61278e07b1d645 100644
--- a/plugins/UserSettings/lang/sv.json
+++ b/plugins/UserSettings/lang/sv.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Webbläsarspråk",
"BrowserWithNoPluginsEnabled": "%1$s med inga plugins är aktiverad",
"BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad",
- "ColumnConfiguration": "Konfiguration",
- "ColumnResolution": "Skärmupplösning",
- "Configurations": "Konfiguration",
"Language_aa": "Afar",
"Language_ab": "Abchaziska",
"Language_ae": "Avestiska",
@@ -193,12 +190,8 @@
"LanguageCode": "Språkkod",
"PluginDescription": "Rapporterar olika användarinställningar: Webbläsare, Webbläsarfamilj, operativsystem, Plugins, upplösning, Globala inställningar.",
"PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.",
- "Resolutions": "Skärmupplösning",
"VisitorSettings": "Besökarinställningar",
- "WidgetGlobalVisitors": "Global besökarkonfiguration",
- "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.",
"WidgetPlugins": "Lista över plugins",
- "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll.",
- "WidgetResolutions": "Skärmupplösning"
+ "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/te.json b/plugins/UserSettings/lang/te.json
index 9a69fd70c9a15880d52e069e350831048388feac..f61fd26b87442cae35c0090216802c82ab7a68b0 100644
--- a/plugins/UserSettings/lang/te.json
+++ b/plugins/UserSettings/lang/te.json
@@ -1,7 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "à°¸à±à°µà°°à±‚పణం",
- "Configurations": "à°¸à±à°µà°°à±‚పణలà±",
"Language_aa": "అఫారà±",
"Language_ab": "à°…à°¬à±à°–ాజియనà±",
"Language_ae": "అవేసà±à°Ÿà°¾à°¨à±",
diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserSettings/lang/th.json
index ee090e216545409124da8da84f0d0f0496f9c733..76d152d3d3be41b80ac3312a3b09d028ef00d5cc 100644
--- a/plugins/UserSettings/lang/th.json
+++ b/plugins/UserSettings/lang/th.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า",
- "ColumnResolution": "ความละเà¸à¸µà¸¢à¸”",
- "Configurations": "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่า",
"Language_aa": "à¸à¸°à¸Ÿà¸²à¸£à¹Œ",
"Language_ab": "à¸à¸±à¸šà¸„าซ",
"Language_ae": "à¸à¹€à¸§à¸ªà¸•à¸°",
@@ -190,10 +187,7 @@
"LanguageCode": "รหัสภาษา",
"PluginDescription": "รายงานà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าผู้ใช้ต่างๆ: เบราว์เซà¸à¸£à¹Œ, ตระà¸à¸¹à¸¥à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ,ระบบปà¸à¸´à¸šà¸±à¸•à¸´à¸à¸²à¸£, ปลั๊à¸à¸à¸´à¸™, à¸à¸²à¸£à¹à¸à¹‰à¹„ขà¹à¸¥à¸°à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าส่วนà¸à¸¥à¸²à¸‡",
"PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสà¸à¸šà¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¹„ม่ทำงานใน Internet Explorer รายงานนี้จะà¸à¸´à¸‡à¸•à¸²à¸¡à¹€à¸‰à¸žà¸²à¸°à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸—ี่ไม่ใช่ IE",
- "Resolutions": "ความละเà¸à¸µà¸¢à¸”",
"VisitorSettings": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าขà¸à¸‡à¸œà¸¹à¹‰à¹€à¸‚้าชม",
- "WidgetGlobalVisitors": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าผู้เข้าชมโดยรวม",
- "WidgetPlugins": "รายà¸à¸²à¸£à¸›à¸¥à¸±à¹‰à¸à¸à¸´à¸™",
- "WidgetResolutions": "ความละเà¸à¸µà¸¢à¸”จà¸à¸ าพ"
+ "WidgetPlugins": "รายà¸à¸²à¸£à¸›à¸¥à¸±à¹‰à¸à¸à¸´à¸™"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserSettings/lang/tl.json
index 19b42e9bf8e5d7825aeb1302732480a7e95cf3d8..e2166e7802f2bd65e43f1b8b1fe0fa18a29e0c89 100644
--- a/plugins/UserSettings/lang/tl.json
+++ b/plugins/UserSettings/lang/tl.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "wika ng browser",
"BrowserWithNoPluginsEnabled": "%1$s na may plugins na hindi pinapagana",
"BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable",
- "ColumnConfiguration": "Configuration",
- "ColumnResolution": "Resolusyon",
- "Configurations": "Configurations",
"Language_aa": "Afar",
"Language_ab": "Abkhazian",
"Language_ae": "Avestan",
@@ -192,12 +189,8 @@
"LanguageCode": "wika ng code",
"PluginDescription": "Ulat para sa ibat-ibang mga Setting ng user: Browser Pamilya ng browser Operating System Plugins Resolution Pang-kalahatang settings.",
"PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.",
- "Resolutions": "Mga Resolution",
"VisitorSettings": "Mga Setting ng bisita",
- "WidgetGlobalVisitors": "Configuration ng bisita",
- "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.",
"WidgetPlugins": "Browser Plugins",
- "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito.",
- "WidgetResolutions": "Screen Resolution"
+ "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserSettings/lang/tr.json
index c675a5e0226fcf28b2d899b44358c08266ab2b0f..0b47d7fc6c3ef0719e2c41f5b2218d94a5073875 100644
--- a/plugins/UserSettings/lang/tr.json
+++ b/plugins/UserSettings/lang/tr.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "Konfigürasyon",
- "ColumnResolution": "Çözünürlük",
- "Configurations": "Konfigürasyonları",
"Language_aa": "Afar",
"Language_ab": "Abazca",
"Language_ae": "Avestçe",
@@ -190,10 +187,7 @@
"LanguageCode": "Dil kodu",
"PluginDescription": "Çeşitli kullanıcı rapor ayalari: Tarayıcı, Tarayıcı Ailesi, İşletim Sistemi, Eklentiler, Çözünürlük, Genel Ayarlar.",
"PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.",
- "Resolutions": "Çözünürlükler",
"VisitorSettings": "Ziyaretçi Ayarlari",
- "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu",
- "WidgetPlugins": "Eklenti Listesi",
- "WidgetResolutions": "Ekran çözünürlükleri"
+ "WidgetPlugins": "Eklenti Listesi"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserSettings/lang/uk.json
index 10ae7b655e69b246d5dc30a48502698c6a822445..d3aaf7c6675aa8bd5654c705b1bdc2018da5ce50 100644
--- a/plugins/UserSettings/lang/uk.json
+++ b/plugins/UserSettings/lang/uk.json
@@ -1,8 +1,5 @@
{
"UserSettings": {
- "ColumnConfiguration": "КонфігураціÑ",
- "ColumnResolution": "Роздільна здатніÑÑ‚ÑŒ",
- "Configurations": "Конфігурації",
"Language_aa": "афарÑька",
"Language_ab": "абхазька",
"Language_ae": "авеÑтійÑька",
@@ -190,10 +187,7 @@
"LanguageCode": "Код мови",
"PluginDescription": "ПовідомлÑÑ” різні налаштуванÑн кориÑтовувача: веб-оглÑдач, родина веб-оглÑдача, операційна ÑиÑтема, плагіни, роздільна здатніÑÑ‚ÑŒ, глобальні налаштуваннÑ.",
"PluginDetectionDoesNotWorkInIE": "Примітка: Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ñ–Ð² не працює в Internet Explorer. Цей звіт базуєтьÑÑ Ð»Ð¸ÑˆÐµ на не-IE веб-оглÑдачах.",
- "Resolutions": "Роздільні здатноÑÑ‚Ñ–",
"VisitorSettings": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ñ‡Ð°",
- "WidgetGlobalVisitors": "Загальна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ñ‡Ñ–Ð²",
- "WidgetPlugins": "СпиÑок плагінів",
- "WidgetResolutions": "Роздільні здатноÑÑ‚Ñ–"
+ "WidgetPlugins": "СпиÑок плагінів"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserSettings/lang/vi.json
index 07ba3d51f7ab7c2ff26bffd173c54a30fe5cdf76..01e6272fd585afa10a03093e7f733ce447d54b49 100644
--- a/plugins/UserSettings/lang/vi.json
+++ b/plugins/UserSettings/lang/vi.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "Ngôn ngữ trình duyệt",
"BrowserWithNoPluginsEnabled": "%1$s không có plugin nà o được kÃch hoạt",
"BrowserWithPluginsEnabled": "%1$s vá»›i plugin %2$s đã kÃch hoạt",
- "ColumnConfiguration": "Cấu hình",
- "ColumnResolution": "Äá»™ phân giải",
- "Configurations": "cấu hình",
"Language_aa": "Tiếng Afar",
"Language_ab": "Tiếng Abkhazia",
"Language_ae": "Tiếng Avestan",
@@ -193,12 +190,8 @@
"LanguageCode": "Mã ngôn ngữ",
"PluginDescription": "Cà i đặt báo cáo ngÆ°á»i dùng khác nhau: trình duyệt, há» trình duyệt, Hệ Ä‘iá»u hà nh, Plugin, Äá»™ phân giải, Cà i đặt tổng quát.",
"PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không là m việc trên Internet Explorer. Báo cáo nà y chỉ dựa trên trình duyệt không phải IE.",
- "Resolutions": "Äá»™ phân giải",
"VisitorSettings": "Thiết láºp khách truy cáºp",
- "WidgetGlobalVisitors": "Cấu hình khách truy cáºp",
- "WidgetGlobalVisitorsDocumentation": "Báo cáo nà y cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cáºp của bạn đã có. Má»™t cấu hình là sá»± kết hợp của má»™t hệ Ä‘iá»u hà nh, má»™t loại trình duyệt và độ phân giải mà n hình.",
"WidgetPlugins": "Các Plugin trình duyệt",
- "WidgetPluginsDocumentation": "Báo cáo nà y cho thấy các plugin trình duyệt mà khách truy cáºp của bạn đã kÃch hoạt. Thông tin nà y có thể là quan trá»ng cho việc lá»±a chá»n cách đúng để cung cấp ná»™i dung của bạn.",
- "WidgetResolutions": "Äá»™ phân giải mà n hình"
+ "WidgetPluginsDocumentation": "Báo cáo nà y cho thấy các plugin trình duyệt mà khách truy cáºp của bạn đã kÃch hoạt. Thông tin nà y có thể là quan trá»ng cho việc lá»±a chá»n cách đúng để cung cấp ná»™i dung của bạn."
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserSettings/lang/zh-cn.json
index d176b168865c5d097922bc58e1893b3d3754e8f8..09db56f72918df9f0730a4b416095bc57f6ea604 100644
--- a/plugins/UserSettings/lang/zh-cn.json
+++ b/plugins/UserSettings/lang/zh-cn.json
@@ -3,9 +3,6 @@
"BrowserLanguage": "æµè§ˆå™¨è¯è¨€",
"BrowserWithNoPluginsEnabled": "%1$s 没有å¯ç”¨æ’件",
"BrowserWithPluginsEnabled": "%1$s å¯ç”¨æ’件%2$s",
- "ColumnConfiguration": "客户端é…ç½®",
- "ColumnResolution": "分辨率",
- "Configurations": "客户端é…ç½®",
"Language_aa": "阿法文",
"Language_ab": "阿布哈西亚文",
"Language_ae": "阿维斯塔文",
@@ -193,12 +190,8 @@
"LanguageCode": "è¯è¨€ä»£ç ",
"PluginDescription": "用户环境报表: æµè§ˆå™¨ã€æµè§ˆå™¨ç§ç±»ã€æ“作系统ã€æ’件ã€åˆ†è¾¨çŽ‡ã€å…¨å±€å‚数。",
"PluginDetectionDoesNotWorkInIE": "注æ„: æ’ä»¶æ£€æŸ¥æ— æ³•åœ¨ Internet Explorer 上è¿è¡Œã€‚这个报表仅æä¾›éž IE æµè§ˆå™¨ã€‚",
- "Resolutions": "分辨率",
"VisitorSettings": "访客设置",
- "WidgetGlobalVisitors": "访客设置",
- "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统é…置。系统é…置是æ“作系统ã€æµè§ˆå™¨ç±»åž‹åŠæ˜¾ç¤ºå™¨åˆ†è¾¨çŽ‡çš„组åˆã€‚",
"WidgetPlugins": "æµè§ˆå™¨æ’件清å•",
- "WidgetPluginsDocumentation": "本报表显示访客使用的æµè§ˆå™¨æ’件，这å¯èƒ½å¯¹å¦‚何å‘布您的内容很é‡è¦ã€‚",
- "WidgetResolutions": "ç”»é¢åˆ†è¾¨çŽ‡"
+ "WidgetPluginsDocumentation": "本报表显示访客使用的æµè§ˆå™¨æ’件，这å¯èƒ½å¯¹å¦‚何å‘布您的内容很é‡è¦ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserSettings/lang/zh-tw.json
index 6b9019f6714f8fe59cc09464042ddd051b3eb078..76e4bb926538ead4d2c391ff5f21feaa3f50fca6 100644
--- a/plugins/UserSettings/lang/zh-tw.json
+++ b/plugins/UserSettings/lang/zh-tw.json
@@ -1,9 +1,6 @@
{
"UserSettings": {
"BrowserLanguage": "ç€è¦½å™¨èªžç³»",
- "ColumnConfiguration": "客戶端é…ç½®",
- "ColumnResolution": "解æžåº¦",
- "Configurations": "客戶端é…ç½®",
"Language_aa": "阿法文",
"Language_ab": "阿布哈西亚文",
"Language_ae": "阿维斯塔文",
@@ -191,11 +188,7 @@
"LanguageCode": "語系代碼",
"PluginDescription": "å„個用戶è¨å®šå ±è¡¨ï¼šç€è¦½å™¨ã€ç€è¦½å™¨å®¶æ—ã€ä½œæ¥ç³»çµ±ã€å¤–掛ã€è§£æžåº¦ã€å…¨åŸŸè¨å®šã€‚",
"PluginDetectionDoesNotWorkInIE": "注æ„：外掛åµæ¸¬ç„¡æ³•åœ¨ Internet Explorer 上é‹ä½œã€‚é€™å€‹å ±å‘Šåƒ…æä¾›éž IE ç€è¦½å™¨ã€‚",
- "Resolutions": "解æžåº¦",
"VisitorSettings": "é€ è¨ªè€…è¨å®šå€¼",
- "WidgetGlobalVisitors": "全域訪客é…ç½®",
- "WidgetGlobalVisitorsDocumentation": "æ¤å ±è¡¨åˆ—出貴站訪客最常見的è¨å®šé…置。è¨å®šé…置包å«ä½œæ¥ç³»çµ±ã€ç€è¦½å™¨ã€èž¢å¹•è§£æžåº¦ç‰è³‡è¨Šã€‚",
- "WidgetPlugins": "ç€è¦½å™¨å¤–掛清單",
- "WidgetResolutions": "ç•«é¢è§£æžåº¦"
+ "WidgetPlugins": "ç€è¦½å™¨å¤–掛清單"
}
}
\ No newline at end of file
diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig
index abf96de9e103ca93991ec58e939d0420ed65a926..1ee1cf32a1aafd6b59fa293ec49ccf9e5e7d289f 100644
--- a/plugins/UserSettings/templates/index.twig
+++ b/plugins/UserSettings/templates/index.twig
@@ -8,9 +8,9 @@
<div id='rightcolumn'>
- <h2 piwik-enriched-headline>{{ 'UserSettings_Resolutions'|translate }}</h2>
+ <h2 piwik-enriched-headline>{{ 'Resolution_Resolutions'|translate }}</h2>
{{ dataTableResolution|raw }}
- <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2>
+ <h2 piwik-enriched-headline>{{ 'Resolution_Configurations'|translate }}</h2>
{{ dataTableConfiguration|raw }}
</div>
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index e72708a11d7438589afdc85acdef08ea6fd4b889..830d22778cdcc505b297d94ea185e12aa80cc935 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -27,6 +27,8 @@ class ManySitesImportedLogs extends Fixture
public $segments = null; // should be array mapping segment name => segment definition
public $addSegments = false;
+ public $includeIisWithCustom = false;
+ public $includeNetscaler = false;
public static function createAccessInstance()
{
@@ -111,6 +113,14 @@ class ManySitesImportedLogs extends Fixture
$this->logVisitsWithAllEnabled();
$this->replayLogFile();
$this->logCustomFormat();
+
+ if ($this->includeIisWithCustom) {
+ $this->logIisWithCustomFormat();
+ }
+
+ if ($this->includeNetscaler) {
+ $this->logNetscaler();
+ }
}
private function setupSegments()
@@ -229,4 +239,32 @@ class ManySitesImportedLogs extends Fixture
self::executeLogImporter($logFile, $opts);
}
+
+ private function logIisWithCustomFormat()
+ {
+ $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log';
+
+ $opts = array('--idsite' => $this->idSite,
+ '--token-auth' => self::getTokenAuth(),
+ '--w3c-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host', 'TimeTakenMS=time-taken'),
+ '--enable-http-errors' => false,
+ '--enable-http-redirects' => false);
+
+ self::executeLogImporter($logFile, $opts);
+ }
+
+ private function logNetscaler()
+ {
+ $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_netscaler.log';
+
+ $opts = array('--idsite' => $this->idSite,
+ '--token-auth' => self::getTokenAuth(),
+ '--w3c-map-field' => array(),
+ '--enable-http-redirects' => false);
+
+ $output = self::executeLogImporter($logFile, $opts);
+
+ // make sure warning about --w3c-time-taken-secs appears in importer output
+ self::assertContains("WARNING: netscaler log file being parsed without --w3c-time-taken-secs option.", implode("\n", $output));
+ }
}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index 3c73972a7a94a1c5ffc30fce12606634d3b3316e..5c3dcc553eeee4a9b31042765bc7e3501194aa12 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -25,6 +25,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
public function setUp()
{
+ $this->setPiwikEnvironmentOverrides();
$this->setUpWebsitesAndGoals();
$this->trackVisits();
}
@@ -33,6 +34,14 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
{
}
+ private function setPiwikEnvironmentOverrides()
+ {
+ $configOverride = $this->getTestEnvironment()->configOverride;
+ $configOverride['Tracker']['create_new_visit_when_website_referrer_changes'] = 1;
+ $this->getTestEnvironment()->configOverride = $configOverride;
+ $this->getTestEnvironment()->save();
+ }
+
private function setUpWebsitesAndGoals()
{
if (!self::siteCreated($idSite = 1)) {
@@ -85,6 +94,11 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
$t3->setUrl('http://example.org/index.htm#pk_campaign=CREDITED TO GOAL PLEASE');
self::checkResponse($t3->doTrackGoal($idGoal, 42));
+ // another action soon after last but with different campaign (should result in new visit)
+ $t3->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.4)->getDatetime());
+ $t3->setUrl('http://example.org/index.html#pk_campaign=CREDITED TO ANOTHER GOAL');
+ self::checkResponse($t3->doTrackGoal($idGoal, 24));
+
// visitor #4, test for blank referrer campaign keyword
$t4 = self::getTracker($idSite, $dateTime);
$t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(3)->getDatetime());
@@ -125,6 +139,44 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
$t4->setUrlReferrer($adwords);
$t4->setUrl('http://example.org/index.html');
self::checkResponse($t4->doTrackPageView('Bonjour le monde'));
+
+ // test one action w/ no campaign & then one action w/ a campaign (should result in 2 visits)
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10)->getDatetime());
+ $t4->setUrlReferrer('');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('Hallo welt'));
+
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10.1)->getDatetime());
+ $t4->setUrl('http://example.org/index.html?utm_campaign=GA Campaign&piwik_kwd=Piwik kwd');
+ self::checkResponse($t4->doTrackPageView('¡hola mundo'));
+
+ // right after last action, visit w/ referrer website (should result in another visit)
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10.2)->getDatetime());
+ $t4->setUrlReferrer('http://myreferrerwebsite.com');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('Dia duit ar domhan'));
+
+ // test one action w/ no referrer website & then one action w/ referrer website (should result in 2 visits)
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11)->getDatetime());
+ $t4->setUrlReferrer('');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('привет мир'));
+
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.1)->getDatetime());
+ $t4->setUrlReferrer('http://myotherreferrerwebsite.com');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('hallå världen'));
+
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.2)->getDatetime()); // same referrer in next action, should result in just another action
+ $t4->setUrlReferrer('http://myotherreferrerwebsite.com');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('halló heimur'));
+
+ // same visitor as last w/ action soon after last action but w/ new referrer website (should result in another visit)
+ $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.3)->getDatetime());
+ $t4->setUrlReferrer('http://mutantregistration.com');
+ $t4->setUrl('http://example.org/index.html');
+ self::checkResponse($t4->doTrackPageView('×”×¢×œ× ×•×•×¢×œ×˜'));
}
// see updateDomainHash() in piwik.js
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 693b76e2804a037d328b21fd2f67c0f0c9c3f6e5..a2d6a6327a819ad67dd9f186d933debd74fa7a4e 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -758,12 +758,18 @@ class Fixture extends \PHPUnit_Framework_Assert
. '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files
;
- foreach ($options as $name => $value) {
- $cmd .= $name;
- if ($value !== false) {
- $cmd .= '="' . $value . '"';
+ foreach ($options as $name => $values) {
+ if (!is_array($values)) {
+ $values = array($values);
+ }
+
+ foreach ($values as $value) {
+ $cmd .= $name;
+ if ($value !== false) {
+ $cmd .= '="' . $value . '"';
+ }
+ $cmd .= ' ';
}
- $cmd .= ' ';
}
$cmd .= '"' . $logFile . '" 2>&1';
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php
index 3d0b1622d42622ad276aa60561efb8669456300e..676c859b81579d72393e5667812fb86c2dc5c37c 100644
--- a/tests/PHPUnit/Framework/TestRequest/Response.php
+++ b/tests/PHPUnit/Framework/TestRequest/Response.php
@@ -161,6 +161,7 @@ class Response
'goalTimePretty',
'serverTimePretty',
'visitServerHour',
+ 'timestamp',
'date',
'prettyDate',
'serverDateTimePrettyFirstAction'
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index 3a516d1c53be2b9a6bba990bb42e3c3e75a530c1..eb5fd28d781335394eb33fc4da55405d573b1b2d 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -9,13 +9,18 @@
namespace Piwik\Tests\Integration\Tracker;
use Piwik\Access;
+use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\Date;
use Piwik\Network\IPUtils;
use Piwik\Plugin\Manager;
use Piwik\Plugins\SitesManager\API;
use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tracker\ActionPageview;
use Piwik\Tracker\Request;
+use Piwik\Tracker\Visit;
use Piwik\Tracker\VisitExcluded;
use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Visitor;
/**
* @group Core
@@ -249,6 +254,86 @@ class VisitTest extends IntegrationTestCase
$this->assertSame($isBot, $excluded->public_isNonHumanBot(), $userAgent);
}
}
+
+ public function test_isVisitNew_ReturnsFalse_IfLastActionTimestampIsWithinVisitTimeLength_AndNoDimensionForcesVisit_AndVisitorKnown()
+ {
+ $this->setDimensionsWithOnNewVisit(array(false, false, false));
+
+ /** @var Visit $visit */
+ list($visit, $visitor, $action) = $this->makeVisitorAndAction(
+ $lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45', $isVisitorKnown = true);
+
+ $result = $visit->isVisitNew($visitor, $action);
+
+ $this->assertFalse($result);
+ }
+
+ public function test_isVisitNew_ReturnsTrue_IfLastActionTimestampIsNotWithinVisitTimeLength_AndNoDimensionForcesVisit_AndVisitorNotKnown()
+ {
+ $this->setDimensionsWithOnNewVisit(array(false, false, false));
+
+ /** @var Visit $visit */
+ list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 09:12:45');
+
+ $result = $visit->isVisitNew($visitor, $action);
+
+ $this->assertTrue($result);
+ }
+
+ public function test_isVisitNew_ReturnsTrue_IfLastActionTimestampIsWithinVisitTimeLength_AndDimensionForcesVisit()
+ {
+ $this->setDimensionsWithOnNewVisit(array(false, false, true));
+
+ /** @var Visit $visit */
+ list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45');
+
+ $result = $visit->isVisitNew($visitor, $action);
+
+ $this->assertTrue($result);
+ }
+
+ public function test_isVisitNew_ReturnsTrue_IfDimensionForcesVisit_AndVisitorKnown()
+ {
+ $this->setDimensionsWithOnNewVisit(array(false, false, true));
+
+ /** @var Visit $visit */
+ list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45');
+
+ $result = $visit->isVisitNew($visitor, $action);
+
+ $this->assertTrue($result);
+ }
+
+ private function makeVisitorAndAction($lastActionTimestamp, $currentActionTime, $isVisitorKnown = false)
+ {
+ $idsite = API::getInstance()->addSite("name", "http://piwik.net/");
+
+ $request = new Request(array('idsite' => $idsite));
+ $request->setCurrentTimestamp(Date::factory($currentActionTime)->getTimestamp());
+
+ $visit = new Visit();
+ $visit->setRequest($request);
+
+ $visitor = new Visitor($request, 'configid', array('visit_last_action_time' => Date::factory($lastActionTimestamp)->getTimestamp()));
+ $visitor->setIsVisitorKnown($isVisitorKnown);
+
+ $action = new ActionPageview($request);
+
+ return array($visit, $visitor, $action);
+ }
+
+ private function setDimensionsWithOnNewVisit($dimensionOnNewVisitResults)
+ {
+ $dimensions = array();
+ foreach ($dimensionOnNewVisitResults as $onNewVisitResult) {
+ $dim = $this->getMock('Piwik\\Plugin\\Dimension', array('shouldForceNewVisit', 'getColumnName'));
+ $dim->expects($this->any())->method('shouldForceNewVisit')->will($this->returnValue($onNewVisitResult));
+ $dimensions[] = $dim;
+ }
+
+ $cache = new PluginAwareStaticCache('VisitDimensions');
+ $cache->set($dimensions);
+ }
}
class VisitExcluded_public extends VisitExcluded
diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php
index 44c6b7b0b9c137d7b33c5fca26e8f8ae1322b213..b13317b68fc8c1a750ead36465cf7489bae0510c 100755
--- a/tests/PHPUnit/System/ImportLogsTest.php
+++ b/tests/PHPUnit/System/ImportLogsTest.php
@@ -102,4 +102,6 @@ class ImportLogsTest extends SystemTestCase
}
}
-ImportLogsTest::$fixture = new ManySitesImportedLogs();
\ No newline at end of file
+ImportLogsTest::$fixture = new ManySitesImportedLogs();
+ImportLogsTest::$fixture->includeIisWithCustom = true;
+ImportLogsTest::$fixture->includeNetscaler = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 33678169edf9644b5ba39f1b50829a7958a3731b..e01e2b9983be930044fc7f75d818c41867e6f035 100755
--- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -43,7 +43,7 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
$apiToCall = array('Actions.getPageUrls',
'VisitsSummary.get',
- 'UserSettings.getResolution',
+ 'Resolution.getResolution',
'VisitFrequency.get',
'VisitTime.getVisitInformationPerServerTime');
@@ -109,14 +109,14 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
$tests = array(
// TODO Implement fix, then remove the +3 below
'archive_blob_2010_12' => ( ($expectedActionsBlobs+3) /*Actions*/
- + 4 /* UserSettings */
+ + 2 /* Resolution */
+ 2 /* VisitTime */) * 3,
/**
* In Each "Period=range" Archive, we expect following non zero numeric entries:
* 5 metrics + 1 flag // VisitsSummary
* + 2 metrics + 1 flag // Actions
- * + 1 flag // UserSettings
+ * + 1 flag // Resolution
* + 1 flag // VisitTime
* = 11
*
@@ -182,4 +182,4 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
}
-OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays();
\ No newline at end of file
+OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays();
diff --git a/tests/PHPUnit/System/PrivacyManagerTest.php b/tests/PHPUnit/System/PrivacyManagerTest.php
index 18b197a4102eb215279cd01ad4d5110f8a86f57e..0d99d0816d3eded22b790ff012469961dfb08c32 100644
--- a/tests/PHPUnit/System/PrivacyManagerTest.php
+++ b/tests/PHPUnit/System/PrivacyManagerTest.php
@@ -374,7 +374,7 @@ class PrivacyManagerTest extends SystemTestCase
// perform checks
$this->checkLogDataPurged();
- $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 5, $janNumericRemaining = 68); // 5 blobs for 5 days
+ $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 5, $janNumericRemaining = 69); // 5 blobs for 5 days
}
/**
@@ -574,7 +574,7 @@ class PrivacyManagerTest extends SystemTestCase
// perform checks
$this->checkLogDataPurged();
- $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 6, $janNumericRemaining = 70); // 1 segmented blob + 5 day blobs
+ $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 6, $janNumericRemaining = 71); // 1 segmented blob + 5 day blobs
}
// --- utility functions follow ---
@@ -720,15 +720,15 @@ class PrivacyManagerTest extends SystemTestCase
// one metric for jan & one for feb
Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])),
- array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 1, 100));
+ array(self::GARBAGE_FIELD, $janDate1, $janDate1, 1, $janDate1, 100));
Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])),
- array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 1, 200));
+ array(self::GARBAGE_FIELD, $febDate1, $febDate1, 1, $febDate1, 200));
// add garbage reports
Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][0])),
- array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 10, 'blobval'));
+ array(self::GARBAGE_FIELD, $janDate1, $janDate1, 10, $janDate1, 'blobval'));
Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][1])),
- array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 20, 'blobval'));
+ array(self::GARBAGE_FIELD, $febDate1, $febDate1, 20, $febDate1, 'blobval'));
}
protected function _checkNoDataChanges()
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
index 6140bf8214577a11d910e697b4cba7d97d51077b..c2ce8972b098c2ad34d9779c837c9d5bd94c9da7 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
@@ -77,11 +77,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -171,11 +171,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -265,11 +265,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -359,11 +359,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<deviceType>Desktop</deviceType>
@@ -453,11 +453,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -547,11 +547,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -641,11 +641,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<deviceType>Desktop</deviceType>
@@ -735,11 +735,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Android Browser </browserName>
- <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
<browserVersion />
<deviceType>Smartphone</deviceType>
@@ -829,11 +829,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
index 896b4d503fbc400e1b52ef1f756e287cd92c5904..d34efe28f802bc7dc701f29e7b76cf3467a4bced 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
@@ -186,11 +186,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion>UNK</browserVersion>
<deviceType>Desktop</deviceType>
@@ -298,11 +298,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 6.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>6.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -405,11 +405,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
@@ -526,11 +526,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
@@ -636,11 +636,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
@@ -734,11 +734,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Bot</operatingSystem>
<operatingSystemCode>BOT</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion>UNK</browserVersion>
<deviceType>Desktop</deviceType>
@@ -838,11 +838,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<deviceType>Desktop</deviceType>
@@ -926,11 +926,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion>UNK</browserVersion>
<deviceType>Desktop</deviceType>
@@ -1030,11 +1030,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Android Browser </browserName>
- <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
<browserVersion />
<deviceType>Smartphone</deviceType>
@@ -1128,11 +1128,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 8e3799fa9eeedb3c495ab4f914468279b7fa76f4..5f5b0e174d52cde0257b854cabbf6c9c829ed9c7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -56,7 +56,6 @@
<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -71,12 +70,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion />
<events>0</events>
@@ -94,6 +93,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -202,7 +202,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -217,12 +216,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -240,6 +239,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -325,7 +325,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -340,12 +339,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -363,6 +362,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -462,7 +462,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -477,12 +476,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -500,6 +499,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -585,7 +585,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -600,12 +599,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -623,6 +622,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -739,7 +739,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -754,12 +753,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -777,6 +776,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -862,7 +862,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -877,12 +876,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -900,6 +899,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -999,7 +999,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1014,12 +1013,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1037,6 +1036,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1122,7 +1122,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1137,12 +1136,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -1160,6 +1159,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1276,7 +1276,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1291,12 +1290,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1314,6 +1313,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>awesomeisp.com</provider>
<providerName>Awesomeisp</providerName>
<providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1399,7 +1399,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1414,12 +1413,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -1437,6 +1436,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>awesomeisp.com</provider>
<providerName>Awesomeisp</providerName>
<providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1536,7 +1536,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1551,12 +1550,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1574,6 +1573,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1673,7 +1673,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1688,12 +1687,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>1</events>
@@ -1711,6 +1710,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1788,7 +1788,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1803,12 +1802,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -1826,6 +1825,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1911,7 +1911,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1926,12 +1925,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -1949,6 +1948,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2065,7 +2065,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2080,12 +2079,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -2103,6 +2102,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>comcast.net</provider>
<providerName>Comcast</providerName>
<providerUrl>http://www.comcast.net/</providerUrl>
@@ -2219,7 +2219,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2234,12 +2233,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>1</events>
@@ -2257,6 +2256,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2334,7 +2334,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2349,12 +2348,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -2372,6 +2371,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>comcast.net</provider>
<providerName>Comcast</providerName>
<providerUrl>http://www.comcast.net/</providerUrl>
@@ -2457,7 +2457,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2472,12 +2471,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -2495,6 +2494,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2594,7 +2594,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2609,12 +2608,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -2632,6 +2631,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2731,7 +2731,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2746,12 +2745,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -2769,6 +2768,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2868,7 +2868,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -2883,12 +2882,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>1</events>
@@ -2906,6 +2905,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -2997,7 +2997,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3012,12 +3011,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -3035,6 +3034,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3120,7 +3120,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3135,12 +3134,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -3158,6 +3157,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3243,7 +3243,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3258,12 +3257,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -3281,6 +3280,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3366,7 +3366,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3381,12 +3380,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -3404,6 +3403,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3489,7 +3489,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3504,12 +3503,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -3527,6 +3526,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3643,7 +3643,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3658,12 +3657,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -3681,6 +3680,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3797,7 +3797,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3812,12 +3811,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -3835,6 +3834,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -3951,7 +3951,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -3966,12 +3965,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>1</events>
@@ -3989,6 +3988,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -4097,7 +4097,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -4112,12 +4111,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -4135,6 +4134,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -4220,7 +4220,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -4235,12 +4234,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -4258,6 +4257,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -4343,7 +4343,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -4358,12 +4357,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -4381,6 +4380,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -4466,7 +4466,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -4481,12 +4480,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -4504,6 +4503,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -4589,7 +4589,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -4604,12 +4603,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -4627,6 +4626,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index a45e6b00b5f9502ee57fde3f0fc051387ab9654b..52df0964ab3e9af1d2dc260da79e26f9812471ba 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -48,12 +48,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -68,6 +68,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -79,7 +80,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -148,12 +148,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -168,6 +168,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -179,7 +180,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -316,12 +316,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>6</events>
@@ -336,6 +336,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -347,7 +348,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -416,12 +416,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -436,6 +436,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -447,7 +448,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -751,12 +751,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>13</events>
@@ -771,6 +771,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -782,7 +783,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -851,12 +851,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -871,6 +871,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -882,7 +883,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -947,12 +947,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -967,6 +967,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -978,7 +979,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1111,12 +1111,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>6</events>
@@ -1131,6 +1131,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1142,7 +1143,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1207,12 +1207,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1227,6 +1227,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1238,7 +1239,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1538,12 +1538,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>13</events>
@@ -1558,6 +1558,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1569,7 +1570,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index a45e6b00b5f9502ee57fde3f0fc051387ab9654b..52df0964ab3e9af1d2dc260da79e26f9812471ba 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -48,12 +48,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -68,6 +68,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -79,7 +80,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -148,12 +148,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -168,6 +168,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -179,7 +180,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -316,12 +316,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>6</events>
@@ -336,6 +336,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -347,7 +348,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -416,12 +416,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -436,6 +436,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -447,7 +448,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -751,12 +751,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>13</events>
@@ -771,6 +771,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -782,7 +783,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -851,12 +851,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -871,6 +871,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -882,7 +883,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -947,12 +947,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -967,6 +967,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -978,7 +979,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1111,12 +1111,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>6</events>
@@ -1131,6 +1131,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1142,7 +1143,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1207,12 +1207,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1227,6 +1227,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1238,7 +1239,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
@@ -1538,12 +1538,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>13</events>
@@ -1558,6 +1558,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -1569,7 +1570,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index 77e2b6491835297b7eb1a9a68914273d2c611640..b979b765d88dd5de3339ebdcd139c34823f1be64 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
@@ -2,16 +2,21 @@
<result>
<row>
<label>301</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>90</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label> URL = http://piwik.net/moved-permanently</label>
@@ -32,23 +37,51 @@
</row>
<row>
<label>404</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
<subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
<row>
<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -60,6 +93,44 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>302</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
@@ -68,6 +139,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -76,6 +150,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label> URL = http://piwik.net/to-an-error</label>
@@ -101,6 +176,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -112,12 +190,16 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
<row>
<label> Piwik Forums</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -129,5 +211,6 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
index 2d81bb9f1952ed50ffb4d556dcac944b8092cfae..81d66a066b9a3f8debabe34c7b789d42609282f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
@@ -22,30 +22,9 @@
<avg_time_generation>0.177</avg_time_generation>
</row>
<row>
- <label> Log Analytics - Analytics - Piwik</label>
+ <label>301</label>
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
- <min_time_generation>0.145</min_time_generation>
- <max_time_generation>0.145</max_time_generation>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <avg_time_generation>0.145</avg_time_generation>
- </row>
- <row>
- <label>301</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
<sum_time_spent>180</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
@@ -54,9 +33,10 @@
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>90</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
+ <exit_rate>50%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
@@ -78,27 +58,51 @@
</row>
<row>
<label>404</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
- <min_time_generation />
- <max_time_generation>0</max_time_generation>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <avg_time_generation>0</avg_time_generation>
+ <avg_time_generation>0.359</avg_time_generation>
<subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
<row>
<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -110,6 +114,65 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label> Log Analytics - Analytics - Piwik</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.145</min_time_generation>
+ <max_time_generation>0.145</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.145</avg_time_generation>
+ </row>
+ <row>
+ <label>302</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 8845a80655eae7ba734c6e965f1cca9f4c164cc9..6ae99318f04ceb69b903a9f26ed3bbdb661418b1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -5,6 +5,9 @@
<nb_visits>5</nb_visits>
<nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>category</label>
@@ -171,6 +175,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>manage-websites</label>
@@ -273,6 +281,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -375,6 +387,9 @@
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>2</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -386,13 +401,245 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,6 +651,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://example.org/index.htm</url>
</row>
<row>
@@ -411,6 +659,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
@@ -420,6 +671,7 @@
<avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/moved-permanently</url>
</row>
<row>
@@ -427,6 +679,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -438,6 +693,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
</row>
<row>
@@ -445,6 +701,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -456,6 +715,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/to-an-error</url>
</row>
<row>
@@ -463,6 +723,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -471,6 +734,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>counter</label>
@@ -513,6 +777,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -521,6 +788,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -547,6 +815,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -555,6 +826,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -581,6 +853,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -589,6 +864,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -610,11 +886,53 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Products</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/theProduct</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <url>http://piwik.net/Products/theProduct</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>this</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -623,6 +941,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>is</label>
@@ -777,6 +1096,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -785,6 +1107,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index b7cbdc125bd73a263cb736382a5f155057cccf6a..cce26eeec72765adb4285292177ce0cf99b691c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -646,6 +646,90 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>2</nb_visits>
@@ -700,6 +784,150 @@
</row>
</subtable>
</row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>log-analytics</label>
<nb_visits>2</nb_visits>
@@ -999,6 +1227,45 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Products</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/theProduct</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <url>http://piwik.net/Products/theProduct</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>this</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index f1b90a5e1d6590f0f2bdb0bbbd6434a70bdfa868..8789133564dac4a61c9da2e0bc5cd7cba23643fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
@@ -1,17 +1,25 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>307</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
+ <label>301</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>182</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>90</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
- <label> URL = http://piwik.net/temp-redirect</label>
+ <label> URL = http://piwik.net/Topic/hw43061</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
@@ -26,23 +34,51 @@
</row>
<row>
<label>404</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
<subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
<row>
<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -54,6 +90,72 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>302</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>307</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/temp-redirect</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
@@ -62,6 +164,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -70,6 +175,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label> URL = http://piwik.net/to-an-error</label>
@@ -95,6 +201,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -106,12 +215,16 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
<row>
<label> Piwik Forums</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -123,5 +236,6 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
index 867e27cd0da22e0b1448b491aeb399f0a1eff8e4..401a36b8355c22c3f8d8694510879c909c550387 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
@@ -21,6 +21,100 @@
<exit_rate>50%</exit_rate>
<avg_time_generation>0.177</avg_time_generation>
</row>
+ <row>
+ <label>301</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>182</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>90</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/Topic/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>404</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
+ <row>
+ <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
<row>
<label> Log Analytics - Analytics - Piwik</label>
<nb_visits>2</nb_visits>
@@ -43,66 +137,66 @@
<avg_time_generation>0.145</avg_time_generation>
</row>
<row>
- <label>307</label>
+ <label>302</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
+ <sum_time_spent>240</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>240</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
- <label> URL = http://piwik.net/temp-redirect</label>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>240</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
<row>
- <label>404</label>
+ <label>307</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
+ <bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
- <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+ <label> URL = http://piwik.net/temp-redirect</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
+ <bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 28acca124218020bd3796fd88b46ec2e1538c067..f3ebc92964dd361358d43a0be56aa6d954ec2ded 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -5,6 +5,9 @@
<nb_visits>5</nb_visits>
<nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>category</label>
@@ -171,6 +175,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>manage-websites</label>
@@ -273,6 +281,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -375,6 +387,9 @@
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>2</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -386,13 +401,242 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/silentDetection.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,6 +648,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://example.org/index.htm</url>
</row>
<row>
@@ -411,6 +656,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -422,6 +670,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
</row>
<row>
@@ -429,12 +678,16 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/temp-redirect</url>
</row>
<row>
@@ -442,6 +695,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -453,6 +709,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/to-an-error</url>
</row>
<row>
@@ -460,6 +717,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -468,6 +728,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>counter</label>
@@ -510,6 +771,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -518,6 +782,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -544,6 +809,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -552,6 +820,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -578,6 +847,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -586,6 +858,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -612,6 +885,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -620,6 +896,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>is</label>
@@ -769,11 +1046,43 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Topic</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Topic/hw43061</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>translations</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -782,6 +1091,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index 7721a10da115ff80a5f193526eb82773b2f7465a..63c3d594e0641f8630e1894f7f298828fb5dedbb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -646,6 +646,87 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/silentDetection.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>2</nb_visits>
@@ -700,6 +781,150 @@
</row>
</subtable>
</row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>log-analytics</label>
<nb_visits>2</nb_visits>
@@ -1156,6 +1381,35 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Topic</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Topic/hw43061</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>translations</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 143229b5e7a2f8b22b4cc36c80e3f9014cd136da..7ecefada5550ab2cbd281d0f8738766448fbc7e7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,26 +2,35 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>20</nb_visits>
- <nb_hits>20</nb_hits>
+ <nb_visits>23</nb_visits>
+ <nb_hits>23</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <avg_time_generation>0.234</avg_time_generation>
</row>
<row>
<label>301</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>90</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label> URL = http://piwik.net/moved-permanently</label>
@@ -38,20 +47,8 @@
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
- </subtable>
- </row>
- <row>
- <label>307</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <subtable>
<row>
- <label> URL = http://piwik.net/temp-redirect</label>
+ <label> URL = http://piwik.net/Topic/hw43061</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
@@ -66,23 +63,51 @@
</row>
<row>
<label>404</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
<subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
<row>
<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -94,6 +119,72 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>302</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>307</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/temp-redirect</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
@@ -102,6 +193,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -110,6 +204,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label> URL = http://piwik.net/to-an-error</label>
@@ -135,6 +230,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -146,12 +244,16 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
<row>
<label> Piwik Forums</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -163,5 +265,6 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 509723308ff9503b9c64812f0aebd946f243bf95..690c2e28a00a2e64ec2d1a17f3773afdf387daab 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,17 +2,17 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>21</nb_visits>
- <nb_hits>30</nb_hits>
+ <nb_visits>24</nb_visits>
+ <nb_hits>33</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>10</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>12</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <avg_time_generation>0.387</avg_time_generation>
+ <avg_time_generation>0.361</avg_time_generation>
</row>
<row>
<label> Liberate Web Analytics - Analytics - Piwik</label>
@@ -36,30 +36,9 @@
<avg_time_generation>0.177</avg_time_generation>
</row>
<row>
- <label> Log Analytics - Analytics - Piwik</label>
+ <label>301</label>
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
- <min_time_generation>0.145</min_time_generation>
- <max_time_generation>0.145</max_time_generation>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <avg_time_generation>0.145</avg_time_generation>
- </row>
- <row>
- <label>301</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
<sum_time_spent>180</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
@@ -68,9 +47,10 @@
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>90</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
+ <exit_rate>50%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
@@ -88,69 +68,164 @@
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
+ <row>
+ <label> URL = http://piwik.net/Topic/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
</subtable>
</row>
<row>
- <label>307</label>
+ <label>404</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label> URL = http://piwik.net/hello/world/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ </row>
+ <row>
+ <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label> Log Analytics - Analytics - Piwik</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.145</min_time_generation>
+ <max_time_generation>0.145</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.145</avg_time_generation>
+ </row>
+ <row>
+ <label>302</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
+ <sum_time_spent>240</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>240</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
- <label> URL = http://piwik.net/temp-redirect</label>
+ <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>240</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
</subtable>
</row>
<row>
- <label>404</label>
+ <label>307</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
+ <bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0</avg_time_generation>
<subtable>
<row>
- <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+ <label> URL = http://piwik.net/temp-redirect</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
+ <bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index c3f7304c25412f79d905ea242569ab0160910c03..c7ae80a4540691bb43f674e84321d35909b00190 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -5,6 +5,9 @@
<nb_visits>5</nb_visits>
<nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>category</label>
@@ -171,6 +175,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>manage-websites</label>
@@ -273,6 +281,9 @@
<nb_visits>4</nb_visits>
<nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -375,6 +387,9 @@
<nb_visits>2</nb_visits>
<nb_hits>2</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>2</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -386,13 +401,258 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/</url>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ </row>
+ <row>
+ <label>/silentDetection.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,6 +664,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://example.org/index.htm</url>
</row>
<row>
@@ -411,6 +672,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>180</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions>
<entry_sum_visit_length>182</entry_sum_visit_length>
@@ -420,6 +684,7 @@
<avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/moved-permanently</url>
</row>
<row>
@@ -427,6 +692,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -438,6 +706,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
</row>
<row>
@@ -445,12 +714,16 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/temp-redirect</url>
</row>
<row>
@@ -458,6 +731,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -469,6 +745,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<url>http://piwik.net/to-an-error</url>
</row>
<row>
@@ -476,6 +753,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -484,6 +764,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>counter</label>
@@ -526,6 +807,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -534,6 +818,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -560,6 +845,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -568,6 +856,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -594,6 +883,9 @@
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -602,6 +894,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
@@ -623,11 +916,53 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Products</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/theProduct</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <url>http://piwik.net/Products/theProduct</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>this</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -636,6 +971,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>is</label>
@@ -785,11 +1121,43 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Topic</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Topic/hw43061</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>translations</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<entry_nb_visits>1</entry_nb_visits>
<entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -798,6 +1166,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<subtable>
<row>
<label>/index</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index aaabfb8fc32ec1779c967c5b4fcc4bbce6cd0604..3434158d1fd0d782ac88d8adb350830f8f29512f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -646,6 +646,103 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Citrix</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>XenApp</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>Wan</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>auth</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>120</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <subtable>
+ <row>
+ <label>/login.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>240</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>242</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>240</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ </row>
+ <row>
+ <label>/silentDetection.jsp</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>2</nb_visits>
@@ -719,6 +816,150 @@
</row>
</subtable>
</row>
+ <row>
+ <label>hello</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>2</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>from</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>another</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>world</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/6,681965</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.359</min_time_generation>
+ <max_time_generation>0.359</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.359</avg_time_generation>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ </row>
+ </subtable>
+ </row>
+ </subtable>
+ </row>
<row>
<label>log-analytics</label>
<nb_visits>2</nb_visits>
@@ -1064,6 +1305,45 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Products</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/theProduct</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.109</min_time_generation>
+ <max_time_generation>0.109</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0.109</avg_time_generation>
+ <url>http://piwik.net/Products/theProduct</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>this</label>
<nb_visits>1</nb_visits>
@@ -1230,6 +1510,35 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Topic</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/hw43061</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://piwik.net/Topic/hw43061</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>translations</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index c8388c1f4d1893bfd072c94a5324dc2f0acb9d75..18b7f289f647764258d1d8e463343494526997b1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>26</nb_pageviews>
- <nb_uniq_pageviews>26</nb_uniq_pageviews>
+ <nb_pageviews>32</nb_pageviews>
+ <nb_uniq_pageviews>32</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
+ <avg_time_generation>0.277</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index a87ec05ee33fddcf3f53f5dcca94b40548158e74..0fc359540dcc52c551e1e58ea755b48674753535 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>50</nb_pageviews>
- <nb_uniq_pageviews>44</nb_uniq_pageviews>
+ <nb_pageviews>56</nb_pageviews>
+ <nb_uniq_pageviews>50</nb_uniq_pageviews>
<nb_downloads>5</nb_downloads>
<nb_uniq_downloads>5</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
<nb_uniq_outlinks>1</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.301</avg_time_generation>
+ <avg_time_generation>0.298</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 6f8a9a4c9878632d0e3ec990cb33e0acc2e59681..491523012e9af9550d48e9efb8d8335c68b4555a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,28 +2,34 @@
<result>
<row>
<label>HTTP-code</label>
- <nb_actions>29</nb_actions>
+ <nb_actions>35</nb_actions>
<subtable>
<row>
<label>200</label>
- <nb_visits>23</nb_visits>
- <nb_actions>25</nb_actions>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
+ <nb_visits>26</nb_visits>
+ <nb_actions>28</nb_actions>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>301</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
<row>
- <label>307</label>
+ <label>404</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>302</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
<row>
- <label>404</label>
+ <label>307</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 38d80d2b64b3d60ebeb8f221d170f56127f69260..34fadbbd5726143dcfac8d29dc2d71d1ca126762 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>28</nb_visits>
+ <nb_actions>32</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
- <nb_visits_converted>23</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>548</sum_visit_length>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>26</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
</row>
<row>
@@ -24,4 +24,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
</row>
+ <row>
+ <label>Samsung</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index bb6679c9714cf98fd8cc2733ed5feb6ba2c3fb05..147f52ac7c9972ecb09ff697e2845f75bd60f8c9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -13,15 +13,26 @@
</row>
<row>
<label>Trident (IE)</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>7</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
<bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>Blink (Chrome, Opera)</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ </row>
<row>
<label>Unknown</label>
<nb_visits>2</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 8723d1a05faee3de0fc4ce4543784203bc248ba3..82fd2a7603ce4048d0db571cd4cf22bbd283ca42 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>Internet Explorer</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
+ <label>Chrome</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Chrome</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <label>Internet Explorer</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>Epiphany</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
</row>
<row>
<label>RockMelt</label>
@@ -46,7 +46,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
</row>
<row>
<label>Firefox</label>
@@ -70,7 +70,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -82,6 +82,18 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+ </row>
+ <row>
+ <label>Chrome Mobile</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 80d06470a3e8fc868ddc0e174315fd41484cdc1a..90f330a5e579698b2eb6f075f6a8338ad2096edf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
</row>
<row>
<label>Internet Explorer 9.0</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>RockMelt 0.9</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -46,7 +46,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
</row>
<row>
<label>Chrome 19.0</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Chrome 20.0</label>
@@ -70,7 +70,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+ </row>
+ <row>
+ <label>Chrome 37.0</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Firefox 6.0</label>
@@ -82,7 +94,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -94,7 +106,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
<row>
<label>Chrome 11.0</label>
@@ -106,7 +118,19 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+ </row>
+ <row>
+ <label>Chrome Mobile 39.0</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
</row>
<row>
<label>Internet Explorer 6.0</label>
@@ -118,6 +142,18 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+ </row>
+ <row>
+ <label>Internet Explorer 8.0</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 8723d1a05faee3de0fc4ce4543784203bc248ba3..82fd2a7603ce4048d0db571cd4cf22bbd283ca42 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>Internet Explorer</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
+ <label>Chrome</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Chrome</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <label>Internet Explorer</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>Epiphany</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
</row>
<row>
<label>RockMelt</label>
@@ -46,7 +46,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
</row>
<row>
<label>Firefox</label>
@@ -70,7 +70,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -82,6 +82,18 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+ </row>
+ <row>
+ <label>Chrome Mobile</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index b9bf650ebc84a5fa7ac1a41e5fa26d5567e6133b..d0be913ad265c5478c6c8bf801a69f27b5abbba7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>28</nb_visits>
+ <nb_actions>32</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
- <nb_visits_converted>23</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>548</sum_visit_length>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>26</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
</row>
<row>
<label>Vision</label>
@@ -22,4 +22,15 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>GALAXY S5</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 62d091d83d23e9cf46ed1816ec6957e5a35d484e..cfa85794747c7d7dce9d7e1a8a20f3cd87f3555d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -10,43 +10,43 @@
<nb_visits_converted>8</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
- </row>
- <row>
- <label>Windows</label>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>9</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Mac</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
+ <nb_visits>8</nb_visits>
+ <nb_actions>11</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_visit_length>306</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+ </row>
+ <row>
+ <label>Windows</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>11</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
<row>
<label>Android</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Bot</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -70,6 +70,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 7cad47e0a130bf0d60a92b7dcf353fb4ca176efd..636ccfdeb778d104fd4455253da465c8b4a2d02f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>8</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Windows 7</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
<row>
<label>Mac 10.6</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Android 2.3</label>
@@ -46,7 +46,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
+ </row>
+ <row>
+ <label>Mac 10.10</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Windows XP</label>
@@ -58,7 +70,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
+ </row>
+ <row>
+ <label>Android 4.4</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Bot</label>
@@ -70,7 +94,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
<row>
<label>Mac 10.8</label>
@@ -82,7 +106,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -94,6 +118,18 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
+ </row>
+ <row>
+ <label>Windows</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 0a059a62d67058dfe91cc94770385c54e5ecc92e..e838256d3f2eac29fc244d208a41d80d1007a6c3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -2,39 +2,39 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>23</nb_visits>
- <nb_actions>26</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>30</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>21</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>548</sum_visit_length>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>25</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <label>Smartphone</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
</row>
<row>
- <label>Smartphone</label>
+ <label>Unknown</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+ <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
</row>
<row>
<label>Tablet</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index 1ba1449d50cf3b1903a0fbf07517dcaead3612c7..8c1697b2218922fbe5fe67abf239078302502087 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>24</nb_conversions>
+ <nb_conversions>28</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 0a94d5f36db23610ae10110873314fdd66d4e4a5..970c5a295dc8696b17ae6ee853791ab95d0198f8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>25</nb_conversions>
+ <nb_conversions>29</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 4c6855264a3230ca96dc14964c1afc49dea6f4f2..35d78ccc178ab8e1c9ac3497fa2a8fe0e2de12e3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>25</nb_conversions>
- <nb_visits_converted>25</nb_visits_converted>
- <revenue>125</revenue>
- <conversion_rate>92.59%</conversion_rate>
+ <nb_conversions>29</nb_conversions>
+ <nb_visits_converted>29</nb_visits_converted>
+ <revenue>145</revenue>
+ <conversion_rate>93.55%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 93c0819d6cf324f382406089a718d158f7db978a..ff63b6a32a3ea26cde3abd83f0d91d5b2f499bf7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -64,12 +64,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 8.1</operatingSystem>
<operatingSystemCode>W81</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/W81.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 33.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
<events>0</events>
@@ -84,6 +84,7 @@
<referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1366x768</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -95,7 +96,6 @@
<location>Raleigh, North Carolina, United States</location>
<latitude>35.771999</latitude>
<longitude>-78.639000</longitude>
- <resolution>1366x768</resolution>
<plugins>pdf, flash, java</plugins>
<pluginsIcons>
<row>
@@ -200,12 +200,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 8.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>8.0</browserVersion>
<events>0</events>
@@ -220,6 +220,7 @@
<referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1536x864</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -231,7 +232,6 @@
<location>Lake Forest, California, United States</location>
<latitude>33.645000</latitude>
<longitude>-117.679001</longitude>
- <resolution>1536x864</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>17:33:27</visitLocalTime>
@@ -311,12 +311,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 34.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>34.0</browserVersion>
<events>0</events>
@@ -331,6 +331,7 @@
<referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1920x1200</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Germany</country>
@@ -342,7 +343,6 @@
<location>Germany</location>
<latitude>51</latitude>
<longitude>9</longitude>
- <resolution>1920x1200</resolution>
<plugins>pdf, flash, java, quicktime, silverlight</plugins>
<pluginsIcons>
<row>
@@ -455,12 +455,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari 7.0</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion>7.0</browserVersion>
<events>0</events>
@@ -475,6 +475,7 @@
<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>2880x1800</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -486,7 +487,6 @@
<location>United States</location>
<latitude>38</latitude>
<longitude>-97</longitude>
- <resolution>2880x1800</resolution>
<plugins>pdf, flash, java, quicktime</plugins>
<pluginsIcons>
<row>
@@ -568,12 +568,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 33.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
<events>0</events>
@@ -588,6 +588,7 @@
<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1920x1080</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Belgium</country>
@@ -599,7 +600,6 @@
<location>Maaseik, Limburg, Belgium</location>
<latitude>51.099998</latitude>
<longitude>5.800000</longitude>
- <resolution>1920x1080</resolution>
<plugins>pdf, flash, java, silverlight</plugins>
<pluginsIcons>
<row>
@@ -692,12 +692,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 33.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
<events>0</events>
@@ -712,6 +712,7 @@
<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1360x768</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -723,7 +724,6 @@
<location>San Francisco, California, United States</location>
<latitude>37.792000</latitude>
<longitude>-122.408997</longitude>
- <resolution>1360x768</resolution>
<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
<pluginsIcons>
<row>
@@ -823,12 +823,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari 7.0</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion>7.0</browserVersion>
<events>0</events>
@@ -843,6 +843,7 @@
<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>2560x1440</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -854,7 +855,6 @@
<location>Nihon'odori, Kanagawa, Japan</location>
<latitude>35.450001</latitude>
<longitude>139.649994</longitude>
- <resolution>2560x1440</resolution>
<plugins>pdf, java, quicktime</plugins>
<pluginsIcons>
<row>
@@ -943,12 +943,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 27.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
<events>0</events>
@@ -963,6 +963,7 @@
<referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>360x640</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Germany</country>
@@ -974,7 +975,6 @@
<location>Weilerswist, Nordrhein-Westfalen, Germany</location>
<latitude>50.766998</latitude>
<longitude>6.833000</longitude>
- <resolution>360x640</resolution>
<plugins>flash</plugins>
<pluginsIcons>
<row>
@@ -1055,12 +1055,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 27.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
<events>0</events>
@@ -1075,6 +1075,7 @@
<referrerUrl>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>2560x1440</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Germany</country>
@@ -1086,7 +1087,6 @@
<location>Mainz, Rheinland-Pfalz, Germany</location>
<latitude>50</latitude>
<longitude>8.271000</longitude>
- <resolution>2560x1440</resolution>
<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
<pluginsIcons>
<row>
@@ -1222,12 +1222,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 8</operatingSystem>
<operatingSystemCode>WI8</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI8.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 27.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
<events>0</events>
@@ -1242,6 +1242,7 @@
<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1920x1080</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Russian Federation</country>
@@ -1253,7 +1254,6 @@
<location>Moscow, Moscow City, Russian Federation</location>
<latitude>55.751999</latitude>
<longitude>37.616001</longitude>
- <resolution>1920x1080</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1338,12 +1338,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 33.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
<events>0</events>
@@ -1358,6 +1358,7 @@
<referrerUrl>http://piwik.org/docs/installation/</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1366x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Turkey</country>
@@ -1369,7 +1370,6 @@
<location>Esentepe, Rize, Turkey</location>
<latitude>40.979000</latitude>
<longitude>40.415001</longitude>
- <resolution>1366x768</resolution>
<plugins>pdf, flash, java, silverlight</plugins>
<pluginsIcons>
<row>
@@ -1462,12 +1462,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<browser>Chrome 33.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
<events>0</events>
@@ -1482,6 +1482,7 @@
<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1920x1080</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Belgium</country>
@@ -1493,7 +1494,6 @@
<location>Maaseik, Limburg, Belgium</location>
<latitude>51.099998</latitude>
<longitude>5.800000</longitude>
- <resolution>1920x1080</resolution>
<plugins>pdf, flash, java, silverlight</plugins>
<pluginsIcons>
<row>
@@ -1744,12 +1744,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -1764,6 +1764,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -1775,7 +1776,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>08:10:38</visitLocalTime>
@@ -1786,6 +1786,451 @@
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>45</idVisit>
+ <visitIp>172.20.1.0</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ <pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle>
+ <pageIdAction>62</pageIdAction>
+
+ <pageId>62</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>302</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <timeSpent>240</timeSpent>
+ <timeSpentPretty>4 min 0s</timeSpentPretty>
+ <icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>62</goalPageId>
+
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+ <pageTitle />
+ <pageIdAction>63</pageIdAction>
+
+ <pageId>63</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>2</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>242</visitDuration>
+ <visitDurationPretty>4 min 2s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <operatingSystem>Windows</operatingSystem>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+ <browser>Internet Explorer 8.0</browser>
+ <browserName>Internet Explorer</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
+ <browserCode>IE</browserCode>
+ <browserVersion>8.0</browserVersion>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
+ <continent>Unknown</continent>
+ <continentCode>unk</continentCode>
+ <country>Unknown</country>
+ <countryCode>xx</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Unknown</location>
+ <latitude />
+ <longitude />
+ <plugins />
+ <pluginsIcons />
+ <visitLocalTime>11:55:13</visitLocalTime>
+ <visitLocalHour>11</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>44</idVisit>
+ <visitIp>173.5.0.0</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>61</goalPageId>
+
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/hello/from/another/world/6,681965</url>
+ <pageTitle />
+ <pageIdAction>60</pageIdAction>
+
+ <pageId>61</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <generationTime>0.36s</generationTime>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId>user2</userId>
+ <visitorType>returning</visitorType>
+ <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>1</visitDuration>
+ <visitDurationPretty>1s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <operatingSystem>Mac</operatingSystem>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+ <browser>Chrome 37.0</browser>
+ <browserName>Chrome</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+ <browserCode>CH</browserCode>
+ <browserVersion>37.0</browserVersion>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>United States</location>
+ <latitude>38</latitude>
+ <longitude>-97</longitude>
+ <plugins />
+ <pluginsIcons />
+ <visitLocalTime>17:30:00</visitLocalTime>
+ <visitLocalHour>17</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>42</idVisit>
+ <visitIp>70.95.0.0</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>58</goalPageId>
+
+ <url>http://piwik.net/Products/theProduct</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/Topic/hw43061</url>
+ <pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle>
+ <pageIdAction>57</pageIdAction>
+
+ <pageId>59</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>301</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <icon />
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/Products/theProduct</url>
+ <pageTitle />
+ <pageIdAction>55</pageIdAction>
+
+ <pageId>58</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <generationTime>0.11s</generationTime>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>2</actions>
+ <userId>user1</userId>
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>2</visitDuration>
+ <visitDurationPretty>2s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Smartphone</deviceType>
+ <operatingSystem>Android</operatingSystem>
+ <operatingSystemCode>AND</operatingSystemCode>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+ <browser>Chrome Mobile 39.0</browser>
+ <browserName>Chrome Mobile</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon>
+ <browserCode>CM</browserCode>
+ <browserVersion>39.0</browserVersion>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>United States</location>
+ <latitude>38</latitude>
+ <longitude>-97</longitude>
+ <plugins />
+ <pluginsIcons />
+ <visitLocalTime>17:00:00</visitLocalTime>
+ <visitLocalHour>17</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>43</idVisit>
+ <visitIp>173.5.0.0</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>60</goalPageId>
+
+ <url>http://piwik.net/hello/world/6,681965</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/hello/world/6,681965</url>
+ <pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle>
+ <pageIdAction>59</pageIdAction>
+
+ <pageId>60</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>404</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <generationTime>0.36s</generationTime>
+ <icon />
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <searches>0</searches>
+ <actions>1</actions>
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <customVariables>
+ </customVariables>
+ <deviceType>Desktop</deviceType>
+ <operatingSystem>Mac</operatingSystem>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+ <browser>Chrome 37.0</browser>
+ <browserName>Chrome</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+ <browserCode>CH</browserCode>
+ <browserVersion>37.0</browserVersion>
+ <events>0</events>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>United States</location>
+ <latitude>38</latitude>
+ <longitude>-97</longitude>
+ <plugins />
+ <pluginsIcons />
+ <visitLocalTime>17:00:00</visitLocalTime>
+ <visitLocalHour>17</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+
+
+
+
+
</row>
<row>
<idSite>1</idSite>
@@ -1858,12 +2303,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 6.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>6.0</browserVersion>
<events>0</events>
@@ -1878,6 +2323,7 @@
<referrerUrl>http://piwik.org/contribute%</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -1889,7 +2335,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1973,12 +2418,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 11.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>11.0</browserVersion>
<events>0</events>
@@ -1993,6 +2438,7 @@
<referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1280x800</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -2004,7 +2450,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>1280x800</resolution>
<plugins>pdf, flash, java, director, windowsmedia, gears</plugins>
<pluginsIcons>
<row>
@@ -2104,12 +2549,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>RockMelt 0.9</browser>
<browserName>RockMelt</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<events>0</events>
@@ -2124,6 +2569,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -2135,7 +2581,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:15:41</visitLocalTime>
@@ -2227,12 +2672,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>RockMelt 0.9</browser>
<browserName>RockMelt</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<events>0</events>
@@ -2247,6 +2692,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -2258,7 +2704,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>19:12:40</visitLocalTime>
@@ -2357,12 +2802,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>RockMelt 0.9</browser>
<browserName>RockMelt</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<events>0</events>
@@ -2377,6 +2822,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -2388,7 +2834,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>18:10:38</visitLocalTime>
@@ -2463,12 +2908,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Bot</operatingSystem>
<operatingSystemCode>BOT</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -2483,6 +2928,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -2494,7 +2940,6 @@
<location>Ashburn, Virginia, United States</location>
<latitude>39.043999</latitude>
<longitude>-77.487999</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>17:48:08</visitLocalTime>
@@ -2569,12 +3014,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 9.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<events>0</events>
@@ -2589,6 +3034,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -2600,7 +3046,6 @@
<location>Ashburn, Virginia, United States</location>
<latitude>39.043999</latitude>
<longitude>-77.487999</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>17:48:07</visitLocalTime>
@@ -2665,12 +3110,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -2685,6 +3130,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Oceania</continent>
<continentCode>oce</continentCode>
<country>Australia</country>
@@ -2696,7 +3142,6 @@
<location>Australia</location>
<latitude>-27</latitude>
<longitude>133</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>17:46:03</visitLocalTime>
@@ -2771,12 +3216,12 @@
<deviceType>Smartphone</deviceType>
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Android Browser</browser>
<browserName>Android Browser</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
<browserVersion />
<events>0</events>
@@ -2791,6 +3236,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -2802,7 +3248,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>16:11:30</visitLocalTime>
@@ -2877,12 +3322,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>RockMelt 0.9</browser>
<browserName>RockMelt</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<events>0</events>
@@ -2897,6 +3342,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -2908,7 +3354,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>16:10:38</visitLocalTime>
@@ -2979,12 +3424,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 20.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>20.0</browserVersion>
<events>0</events>
@@ -2999,6 +3444,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -3010,7 +3456,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>15:31:05</visitLocalTime>
@@ -3081,12 +3526,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Epiphany 2.30</browser>
<browserName>Epiphany</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<events>0</events>
@@ -3101,6 +3546,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -3112,7 +3558,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>13:49:46</visitLocalTime>
@@ -3183,12 +3628,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 20.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>20.0</browserVersion>
<events>0</events>
@@ -3203,6 +3648,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>South America</continent>
<continentCode>ams</continentCode>
<country>Brazil</country>
@@ -3214,7 +3660,6 @@
<location>Brazil</location>
<latitude>-10</latitude>
<longitude>-55</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:22:08</visitLocalTime>
@@ -3285,12 +3730,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Epiphany 2.30</browser>
<browserName>Epiphany</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<events>0</events>
@@ -3305,6 +3750,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>South America</continent>
<continentCode>ams</continentCode>
<country>Brazil</country>
@@ -3316,7 +3762,6 @@
<location>Brazil</location>
<latitude>-10</latitude>
<longitude>-55</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:21:28</visitLocalTime>
@@ -3387,12 +3832,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 9.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<events>0</events>
@@ -3407,6 +3852,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>South America</continent>
<continentCode>ams</continentCode>
<country>Brazil</country>
@@ -3418,7 +3864,6 @@
<location>Brazil</location>
<latitude>-10</latitude>
<longitude>-55</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:21:03</visitLocalTime>
@@ -3489,12 +3934,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Epiphany 2.30</browser>
<browserName>Epiphany</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<events>0</events>
@@ -3509,6 +3954,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -3520,7 +3966,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:01:17</visitLocalTime>
@@ -3591,12 +4036,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 9.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<events>0</events>
@@ -3611,6 +4056,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -3622,7 +4068,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>19:59:50</visitLocalTime>
@@ -3693,12 +4138,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 9.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<events>0</events>
@@ -3713,6 +4158,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -3724,7 +4170,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>18:03:40</visitLocalTime>
@@ -3795,12 +4240,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 19.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<events>0</events>
@@ -3815,6 +4260,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -3826,7 +4272,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>21:00:42</visitLocalTime>
@@ -3897,12 +4342,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 6.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<events>0</events>
@@ -3917,6 +4362,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -3928,7 +4374,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>20:56:45</visitLocalTime>
@@ -3999,12 +4444,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 19.0</browser>
<browserName>Chrome</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<events>0</events>
@@ -4019,6 +4464,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -4030,7 +4476,6 @@
<location>Ashburn, Virginia, United States</location>
<latitude>39.043999</latitude>
<longitude>-77.487999</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>13:49:48</visitLocalTime>
@@ -4101,12 +4546,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Epiphany 2.30</browser>
<browserName>Epiphany</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<events>0</events>
@@ -4121,6 +4566,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -4132,7 +4578,6 @@
<location>Ashburn, Virginia, United States</location>
<latitude>39.043999</latitude>
<longitude>-77.487999</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>13:48:20</visitLocalTime>
@@ -4203,12 +4648,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 9.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<events>0</events>
@@ -4223,6 +4668,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>North America</continent>
<continentCode>amn</continentCode>
<country>United States</country>
@@ -4234,7 +4680,6 @@
<location>Ashburn, Virginia, United States</location>
<latitude>39.043999</latitude>
<longitude>-77.487999</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>13:48:07</visitLocalTime>
@@ -4305,12 +4750,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 6.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<events>0</events>
@@ -4325,6 +4770,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -4336,7 +4782,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>08:12:03</visitLocalTime>
@@ -4407,12 +4852,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>GNU/Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Epiphany 2.30</browser>
<browserName>Epiphany</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<events>0</events>
@@ -4427,6 +4872,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -4438,7 +4884,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>08:11:56</visitLocalTime>
@@ -4509,12 +4954,12 @@
<deviceType>Smartphone</deviceType>
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Android Browser</browser>
<browserName>Android Browser</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
<browserVersion />
<events>0</events>
@@ -4529,6 +4974,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -4540,7 +4986,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>08:11:30</visitLocalTime>
@@ -4611,12 +5056,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Mac</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>RockMelt 0.9</browser>
<browserName>RockMelt</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<events>0</events>
@@ -4631,6 +5076,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Asia</continent>
<continentCode>asi</continentCode>
<country>Japan</country>
@@ -4642,7 +5088,6 @@
<location>Japan</location>
<latitude>36</latitude>
<longitude>138</longitude>
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>08:10:38</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index eb2209a224e7e7e8963be833f0b0e13edd06b47c..d2edd33b602927437c05eeab99abd37cf4dc16dc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
- <nb_pageviews>26</nb_pageviews>
- <revenue>125</revenue>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
+ <nb_pageviews>32</nb_pageviews>
+ <revenue>145</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 1fb93e2a2abc6affa70542dc6179649c0fc12777..79b56ff9799a7f889943c890162255bca8e87637 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
- <nb_pageviews>26</nb_pageviews>
- <revenue>125</revenue>
+ <nb_pageviews>32</nb_pageviews>
+ <revenue>145</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
index 8cc6494492a35050c4058f1efc7a8ae8023cc432..f83cd0a71c0405f33aa3c9449d854117ab108d25 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>25</bounce_count>
- <nb_visits_converted>25</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>27</bounce_count>
+ <nb_visits_converted>29</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<url />
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 80a6349ac1c80ba68cca637acf2dec80ef2798f7..9b5ba79691ada699fd4293c224f82832cf4147f1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,22 +2,22 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>29</nb_visits>
+ <nb_actions>34</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>25</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>23</nb_conversions>
- <nb_visits_converted>23</nb_visits_converted>
- <revenue>115</revenue>
+ <nb_conversions>27</nb_conversions>
+ <nb_visits_converted>27</nb_visits_converted>
+ <revenue>135</revenue>
</row>
</goals>
- <nb_conversions>23</nb_conversions>
- <revenue>115</revenue>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <nb_conversions>27</nb_conversions>
+ <revenue>135</revenue>
+ <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
<row>
<label>Websites</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75d278b51bb646e1aa049df1f6bce9258367eddf
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>GNU/Linux / Epiphany / unknown</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Mac / RockMelt / unknown</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Windows 7 / Internet Explorer / unknown</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Mac / Chrome / unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Android / Android Browser / unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>GNU/Linux / Firefox / unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Windows 7 / Chrome / unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Android / Chrome Mobile / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Bot / Unknown / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>GNU/Linux / Chrome / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Unknown / Unknown / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Windows / Internet Explorer / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Windows XP / Chrome / 1280x800</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>Windows XP / Internet Explorer / 1024x768</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
new file mode 100644
index 0000000000000000000000000000000000000000..378996fabcacf7c4b04003e7f08e77b5c0c378a3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>unknown</label>
+ <nb_visits>29</nb_visits>
+ <nb_actions>34</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>27</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>1024x768</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>1280x800</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index a14f0cec91fce5df24c8fd25b92a201dbd6e532a..dc702824f1203add009a4d31f81da2119898dac4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,22 +2,22 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>31</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>20</bounce_count>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>22</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>20</nb_conversions>
- <nb_visits_converted>20</nb_visits_converted>
- <revenue>100</revenue>
+ <nb_conversions>24</nb_conversions>
+ <nb_visits_converted>24</nb_visits_converted>
+ <revenue>120</revenue>
</row>
</goals>
- <nb_conversions>20</nb_conversions>
- <revenue>100</revenue>
- <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <nb_conversions>24</nb_conversions>
+ <revenue>120</revenue>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<city_name>Unknown</city_name>
<city>xx</city>
<region>xx</region>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 23e244b75129fa3a514211f3ab8a396970f507d1..212e81c78595f2db8534c0fcbfb5693999189f9a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -21,44 +21,44 @@
<code>Asia</code>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <label>North America</label>
+ <nb_visits>8</nb_visits>
+ <nb_actions>9</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
<bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>7</nb_conversions>
- <nb_visits_converted>7</nb_visits_converted>
- <revenue>35</revenue>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
</row>
</goals>
- <nb_conversions>7</nb_conversions>
- <revenue>35</revenue>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <code>Unknown</code>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ <code>North America</code>
</row>
<row>
- <label>North America</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
+ <label>Unknown</label>
+ <nb_visits>8</nb_visits>
+ <nb_actions>9</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>5</nb_conversions>
- <nb_visits_converted>5</nb_visits_converted>
- <revenue>25</revenue>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
</row>
</goals>
- <nb_conversions>5</nb_conversions>
- <revenue>25</revenue>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
+ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>North America</code>
+ <code>Unknown</code>
</row>
<row>
<label>South America</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index ce5523efdeae2dc95abf7b667f5212d07fa395b1..1c82333bf07e88989ebfec6b3a319b30e0417387 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -24,48 +24,48 @@
<logoHeight>11</logoHeight>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <label>United States</label>
+ <nb_visits>8</nb_visits>
+ <nb_actions>9</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
<bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>7</nb_conversions>
- <nb_visits_converted>7</nb_visits_converted>
- <revenue>35</revenue>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
</row>
</goals>
- <nb_conversions>7</nb_conversions>
- <revenue>35</revenue>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <code>xx</code>
- <logo>plugins/UserCountry/images/flags/xx.png</logo>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ <code>us</code>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
</row>
<row>
- <label>United States</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
+ <label>Unknown</label>
+ <nb_visits>8</nb_visits>
+ <nb_actions>9</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>7</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>5</nb_conversions>
- <nb_visits_converted>5</nb_visits_converted>
- <revenue>25</revenue>
+ <nb_conversions>8</nb_conversions>
+ <nb_visits_converted>8</nb_visits_converted>
+ <revenue>40</revenue>
</row>
</goals>
- <nb_conversions>5</nb_conversions>
- <revenue>25</revenue>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <nb_conversions>8</nb_conversions>
+ <revenue>40</revenue>
+ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>us</code>
- <logo>plugins/UserCountry/images/flags/us.png</logo>
+ <code>xx</code>
+ <logo>plugins/UserCountry/images/flags/xx.png</logo>
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 4067fb26181abc41a4b9c5e4c303736257a6bb32..1149b705a7c4c8f1e09c5927cda33277766f3262 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,22 +2,22 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>31</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>20</bounce_count>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>22</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>20</nb_conversions>
- <nb_visits_converted>20</nb_visits_converted>
- <revenue>100</revenue>
+ <nb_conversions>24</nb_conversions>
+ <nb_visits_converted>24</nb_visits_converted>
+ <revenue>120</revenue>
</row>
</goals>
- <nb_conversions>20</nb_conversions>
- <revenue>100</revenue>
- <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <nb_conversions>24</nb_conversions>
+ <revenue>120</revenue>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<region>xx</region>
<country>xx</country>
<country_name>Unknown</country_name>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index bb6679c9714cf98fd8cc2733ed5feb6ba2c3fb05..147f52ac7c9972ecb09ff697e2845f75bd60f8c9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -13,15 +13,26 @@
</row>
<row>
<label>Trident (IE)</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>7</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
<bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>Blink (Chrome, Opera)</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ </row>
<row>
<label>Unknown</label>
<nb_visits>2</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index 80d06470a3e8fc868ddc0e174315fd41484cdc1a..90f330a5e579698b2eb6f075f6a8338ad2096edf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
</row>
<row>
<label>Internet Explorer 9.0</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>RockMelt 0.9</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -46,7 +46,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
</row>
<row>
<label>Chrome 19.0</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Chrome 20.0</label>
@@ -70,7 +70,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+ </row>
+ <row>
+ <label>Chrome 37.0</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Firefox 6.0</label>
@@ -82,7 +94,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -94,7 +106,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
<row>
<label>Chrome 11.0</label>
@@ -106,7 +118,19 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+ </row>
+ <row>
+ <label>Chrome Mobile 39.0</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
</row>
<row>
<label>Internet Explorer 6.0</label>
@@ -118,6 +142,18 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+ </row>
+ <row>
+ <label>Internet Explorer 8.0</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 8723d1a05faee3de0fc4ce4543784203bc248ba3..82fd2a7603ce4048d0db571cd4cf22bbd283ca42 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>Internet Explorer</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
+ <label>Chrome</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
<max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Chrome</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <label>Internet Explorer</label>
+ <nb_visits>7</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>Epiphany</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
</row>
<row>
<label>RockMelt</label>
@@ -46,7 +46,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
</row>
<row>
<label>Firefox</label>
@@ -70,7 +70,7 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -82,6 +82,18 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+ </row>
+ <row>
+ <label>Chrome Mobile</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 446d719865ca67ad7c3a410de9ae03c4dfb6587e..75d278b51bb646e1aa049df1f6bce9258367eddf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -33,6 +33,17 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>Mac / Chrome / unknown</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ </row>
<row>
<label>Android / Android Browser / unknown</label>
<nb_visits>2</nb_visits>
@@ -67,18 +78,18 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
- <label>Bot / Unknown / unknown</label>
+ <label>Android / Chrome Mobile / unknown</label>
<nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
</row>
<row>
- <label>GNU/Linux / Chrome / unknown</label>
+ <label>Bot / Unknown / unknown</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<max_actions>1</max_actions>
@@ -89,7 +100,7 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
- <label>Mac / Chrome / unknown</label>
+ <label>GNU/Linux / Chrome / unknown</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<max_actions>1</max_actions>
@@ -110,6 +121,17 @@
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>Windows / Internet Explorer / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
<row>
<label>Windows XP / Chrome / 1280x800</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
index fc37ec8a8fd100bd46e10dffc0f3723bbfce6493..8d4b8d074e821e05600c6c9d7642914fb0dbdddb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown (xx)</label>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>25</bounce_count>
- <nb_visits_converted>25</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>27</bounce_count>
+ <nb_visits_converted>29</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 1f8c578db73d28b5dcbdce702f4f534c13b6760b..3ed6ff730986a323aefd48fa7f42446896efe4dc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>25</bounce_count>
- <nb_visits_converted>25</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>27</bounce_count>
+ <nb_visits_converted>29</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 0a059a62d67058dfe91cc94770385c54e5ecc92e..e838256d3f2eac29fc244d208a41d80d1007a6c3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -2,39 +2,39 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>23</nb_visits>
- <nb_actions>26</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>30</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>21</bounce_count>
- <nb_visits_converted>22</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>548</sum_visit_length>
+ <bounce_count>23</bounce_count>
+ <nb_visits_converted>25</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <label>Smartphone</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
</row>
<row>
- <label>Smartphone</label>
+ <label>Unknown</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+ <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
</row>
<row>
<label>Tablet</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 62d091d83d23e9cf46ed1816ec6957e5a35d484e..cfa85794747c7d7dce9d7e1a8a20f3cd87f3555d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -10,43 +10,43 @@
<nb_visits_converted>8</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
- </row>
- <row>
- <label>Windows</label>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>9</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Mac</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
+ <nb_visits>8</nb_visits>
+ <nb_actions>11</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <sum_visit_length>306</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+ </row>
+ <row>
+ <label>Windows</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>11</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
<row>
<label>Android</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>3</nb_visits>
+ <nb_actions>4</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
<bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Bot</label>
@@ -58,7 +58,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -70,6 +70,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
index 7cad47e0a130bf0d60a92b7dcf353fb4ca176efd..636ccfdeb778d104fd4455253da465c8b4a2d02f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>8</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Windows 7</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
<row>
<label>Mac 10.6</label>
@@ -34,7 +34,7 @@
<nb_visits_converted>4</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Android 2.3</label>
@@ -46,7 +46,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
+ </row>
+ <row>
+ <label>Mac 10.10</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Windows XP</label>
@@ -58,7 +70,19 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
+ </row>
+ <row>
+ <label>Android 4.4</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Bot</label>
@@ -70,7 +94,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
<row>
<label>Mac 10.8</label>
@@ -82,7 +106,7 @@
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/MAC.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
</row>
<row>
<label>Unknown</label>
@@ -94,6 +118,18 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
+ </row>
+ <row>
+ <label>Windows</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index d1f2bda02f845e12d58773f02ccd73b84b1aea69..a96d5feb81e7ee99b694462cff4ef1e2e1d90b2b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -3,43 +3,43 @@
<row>
<label>Cookie</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
<label>Flash</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
<label>Java</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10%</nb_visits_percentage>
+ <nb_visits_percentage>8%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
<label>Director</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
<label>Gears</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
<label>Pdf</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Windowsmedia</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5%</nb_visits_percentage>
+ <nb_visits_percentage>4%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 659d5beea11515949b2fb41b483e5c7de81d8b84..378996fabcacf7c4b04003e7f08e77b5c0c378a3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>29</nb_visits>
+ <nb_actions>34</nb_actions>
<max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
- <nb_visits_converted>23</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_visit_length>550</sum_visit_length>
+ <bounce_count>25</bounce_count>
+ <nb_visits_converted>27</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
<row>
<label>1024x768</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 3633fe591455905c0e862657698625d9b314bc0e..02a0dc72729117f205fa2c0c68544d8f1cafdeaf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
- <nb_users_returning>0</nb_users_returning>
- <nb_visits_returning>1</nb_visits_returning>
- <nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
+ <nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
+ <nb_users_returning>1</nb_users_returning>
+ <nb_visits_returning>2</nb_visits_returning>
+ <nb_actions_returning>2</nb_actions_returning>
+ <nb_visits_converted_returning>2</nb_visits_converted_returning>
+ <bounce_count_returning>2</bounce_count_returning>
+ <sum_visit_length_returning>1</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
- <avg_time_on_site_returning>0</avg_time_on_site_returning>
+ <avg_time_on_site_returning>1</avg_time_on_site_returning>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
index f301254690deda6589c397b03bfdd8e93eb08cdc..c42125d07294aeb3f0d5e8db9fdafbb2aaf1b5ed 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits_returning>10</nb_visits_returning>
- <nb_actions_returning>12</nb_actions_returning>
- <nb_visits_converted_returning>9</nb_visits_converted_returning>
- <bounce_count_returning>8</bounce_count_returning>
- <sum_visit_length_returning>115</sum_visit_length_returning>
+ <nb_visits_returning>11</nb_visits_returning>
+ <nb_actions_returning>13</nb_actions_returning>
+ <nb_visits_converted_returning>10</nb_visits_converted_returning>
+ <bounce_count_returning>9</bounce_count_returning>
+ <sum_visit_length_returning>116</sum_visit_length_returning>
<max_actions_returning>2</max_actions_returning>
- <bounce_rate_returning>80%</bounce_rate_returning>
+ <bounce_rate_returning>82%</bounce_rate_returning>
<nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning>
- <avg_time_on_site_returning>12</avg_time_on_site_returning>
+ <avg_time_on_site_returning>11</avg_time_on_site_returning>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 1a729a8e268e2a97abcbb383ab686348f1baae9e..4de7a18047e3b9020bc519c4c62cb75ec7031e36 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -12,24 +12,24 @@
</row>
<row>
<label>Wednesday</label>
- <nb_visits>2</nb_visits>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits>5</nb_visits>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_actions>6</nb_actions>
+ <nb_users>2</nb_users>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
<day_of_week>3</day_of_week>
</row>
<row>
<label>Thursday</label>
- <nb_visits>9</nb_visits>
- <nb_uniq_visitors>9</nb_uniq_visitors>
- <nb_actions>9</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_uniq_visitors>10</nb_uniq_visitors>
+ <nb_actions>11</nb_actions>
<nb_users>0</nb_users>
- <sum_visit_length>0</sum_visit_length>
+ <sum_visit_length>242</sum_visit_length>
<bounce_count>9</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
+ <nb_visits_converted>10</nb_visits_converted>
<day_of_week>4</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 427319a89f7637f90ee1f2b89a97ffc31b32768d..dc841363a5dab7a8580fe1c57f4dea0be3f78e83 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -123,13 +123,13 @@
</row>
<row>
<label>11h</label>
- <nb_visits>0</nb_visits>
- <nb_actions>0</nb_actions>
- <max_actions>0</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
<bounce_count>0</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
@@ -189,14 +189,14 @@
</row>
<row>
<label>17h</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <nb_visits>6</nb_visits>
+ <nb_actions>7</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
<row>
<label>18h</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 515e54eb3b42a9efe63a3da9fe9f7b6c42ecd7cc..144d6c4221799cd6cff6a335f51e5b8a7208f103 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -150,14 +150,23 @@
</row>
<row>
<label>11h</label>
- <nb_visits>0</nb_visits>
- <nb_actions>0</nb_actions>
- <max_actions>0</max_actions>
- <sum_visit_length>0</sum_visit_length>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>242</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
</row>
<row>
<label>12h</label>
@@ -243,23 +252,23 @@
</row>
<row>
<label>17h</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>3</bounce_count>
+ <nb_visits>6</nb_visits>
+ <nb_actions>7</nb_actions>
+ <max_actions>2</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>5</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<goals>
<row idgoal='1'>
- <nb_conversions>2</nb_conversions>
- <nb_visits_converted>2</nb_visits_converted>
- <revenue>10</revenue>
+ <nb_conversions>5</nb_conversions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <revenue>25</revenue>
</row>
</goals>
- <nb_conversions>2</nb_conversions>
- <revenue>10</revenue>
+ <nb_conversions>5</nb_conversions>
+ <revenue>25</revenue>
</row>
<row>
<label>18h</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index c47de22fc427a4ea573df4ef7d568f80d43e22ad..005a1842ab8e57b8bf4ee5a8f5c36f655a514b35 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,11 +2,11 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>26</nb_visits>
+ <nb_visits>29</nb_visits>
</row>
<row>
<label>0 days</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>1</nb_visits>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index c7ed81d100a3d282d7015cd8b671fa73eeeb1be3..a66c195749ed3c145e2584805cfcf269c7f5656a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,11 +2,11 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>30</nb_visits>
+ <nb_visits>33</nb_visits>
</row>
<row>
<label>0 days</label>
- <nb_visits>3</nb_visits>
+ <nb_visits>4</nb_visits>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 0830ca0d1001d1fe898981b5a48336803756185b..dcd45b3a61feb927fc86b149776a4c673ebbbb3e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>27</nb_visits>
+ <nb_visits>31</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index d7672ae30c7c4cf53f738fb563337ca73f10dba7..768a0961d2e81341d0f4dcfda9c13a2f7748e802 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,8 +2,8 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>33</nb_visits>
- <nb_visits_percentage>83%</nb_visits_percentage>
+ <nb_visits>37</nb_visits>
+ <nb_visits_percentage>84%</nb_visits_percentage>
</row>
<row>
<label>2 visits</label>
@@ -18,7 +18,7 @@
<row>
<label>4 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>3%</nb_visits_percentage>
+ <nb_visits_percentage>2%</nb_visits_percentage>
</row>
<row>
<label>5 visits</label>
@@ -33,7 +33,7 @@
<row>
<label>7 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>3%</nb_visits_percentage>
+ <nb_visits_percentage>2%</nb_visits_percentage>
</row>
<row>
<label>8 visits</label>
@@ -58,7 +58,7 @@
<row>
<label>51-100 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>3%</nb_visits_percentage>
+ <nb_visits_percentage>2%</nb_visits_percentage>
</row>
<row>
<label>101-200 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 4e6a9ab29ed46d6b301d05c0e6719866ac42632b..c00b8e2c507561b104aab774976a90606996a6c6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,11 +2,11 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>25</nb_visits>
+ <nb_visits>27</nb_visits>
</row>
<row>
<label>2 pages</label>
- <nb_visits>1</nb_visits>
+ <nb_visits>3</nb_visits>
</row>
<row>
<label>3 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index 11e27426c02910e033b31738392aaaf6ca903587..95adfb7f9a392ab71f5ad4463110850ea41eb38a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,11 +2,11 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>34</nb_visits>
+ <nb_visits>36</nb_visits>
</row>
<row>
<label>2 pages</label>
- <nb_visits>3</nb_visits>
+ <nb_visits>5</nb_visits>
</row>
<row>
<label>3 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index a64c14a9673c775fdd503e97427075177ab328bc..1f6410e079559a0422a70c4d49bbf63c407a73bc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>25</nb_visits>
+ <nb_visits>28</nb_visits>
</row>
<row>
<label>11-30s</label>
@@ -22,7 +22,7 @@
</row>
<row>
<label>4-7 min</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>1</nb_visits>
</row>
<row>
<label>7-10 min</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index a0cba6d294af4130a971460d53030ac6379e1968..c53cacde6f045aee7db737ed3c1cd542e23f4ab8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>35</nb_visits>
+ <nb_visits>38</nb_visits>
</row>
<row>
<label>11-30s</label>
@@ -22,7 +22,7 @@
</row>
<row>
<label>4-7 min</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>1</nb_visits>
</row>
<row>
<label>7-10 min</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 3fb946966748c74c17e88efdbdab136d4c3a4f4b..8af80c337fce212214b9dcfe62d5beb85a63d248 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>30</result>
\ No newline at end of file
+<result>36</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 4c77f1f6e6033e2c861e4fa18a79df304b9fdb8e..40bd2e592a5902bdf9d39b4085ea459ca3ae7737 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>27</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
index 0a9c671f558dd011c15ac06d9cc83093fbb44a61..e686bbc101b92aacf3b6bd5088e1e49a9d146822 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>5 min 5s</result>
\ No newline at end of file
+<result>9 min 10s</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
index df25f1c1f33072b1eecf837e315e13a79f5aabbb..9674a59b3a4db881bbfc089f6080cab0be3c1793 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>305</result>
\ No newline at end of file
+<result>550</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 40bd2e592a5902bdf9d39b4085ea459ca3ae7737..3fb946966748c74c17e88efdbdab136d4c3a4f4b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>27</result>
\ No newline at end of file
+<result>30</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index f5722c2b947ae81c5390b2448986be96d1bf4ff3..13002b20179a7f01ad26b5afab050d0539adedf7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>0</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 4c77f1f6e6033e2c861e4fa18a79df304b9fdb8e..46af1425a39189f6792635a1df8c5b1f72b6aa34 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>29</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 40bd2e592a5902bdf9d39b4085ea459ca3ae7737..51c650b8b2b37026485dd3f023536254a8638981 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>27</result>
\ No newline at end of file
+<result>31</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 327d564f479323b2855bbe76d66030db9b200090..1772684d5e10535b85f7c04d90c8a4228c063c3f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>27</nb_uniq_visitors>
- <nb_users>0</nb_users>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
- <nb_visits_converted>25</nb_visits_converted>
- <bounce_count>25</bounce_count>
- <sum_visit_length>305</sum_visit_length>
+ <nb_uniq_visitors>30</nb_uniq_visitors>
+ <nb_users>2</nb_users>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
+ <nb_visits_converted>29</nb_visits_converted>
+ <bounce_count>27</bounce_count>
+ <sum_visit_length>550</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>93%</bounce_rate>
- <nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>11</avg_time_on_site>
+ <bounce_rate>87%</bounce_rate>
+ <nb_actions_per_visit>1.2</nb_actions_per_visit>
+ <avg_time_on_site>18</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 0fb183d46f39b9010ac24c45a0f0d2a6b288de9b..bce2027e1c72e5cb3d5cf955b64ce91cfe0778f5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
<result date="2012-08">
<row>
<label>Piwik test</label>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
- <nb_pageviews>26</nb_pageviews>
- <revenue>125</revenue>
- <nb_conversions>25</nb_conversions>
+ <nb_visits>31</nb_visits>
+ <nb_actions>36</nb_actions>
+ <nb_pageviews>32</nb_pageviews>
+ <revenue>145</revenue>
+ <nb_conversions>29</nb_conversions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
@@ -42,11 +42,11 @@
<nb_pageviews>10</nb_pageviews>
<revenue>5</revenue>
<nb_conversions>1</nb_conversions>
- <visits_evolution>-96.3%</visits_evolution>
- <actions_evolution>-66.7%</actions_evolution>
- <pageviews_evolution>-61.5%</pageviews_evolution>
- <revenue_evolution>-96%</revenue_evolution>
- <nb_conversions_evolution>-96%</nb_conversions_evolution>
+ <visits_evolution>-96.8%</visits_evolution>
+ <actions_evolution>-72.2%</actions_evolution>
+ <pageviews_evolution>-68.8%</pageviews_evolution>
+ <revenue_evolution>-96.6%</revenue_evolution>
+ <nb_conversions_evolution>-96.6%</nb_conversions_evolution>
<group />
<main_url>http://piwik.net</main_url>
<idsite>1</idsite>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
index 0879f6fb5b842c36e9abab231b14d7012112274d..0d6e1866eddf3da3c9bb8202257258bb95f25748 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
@@ -95,11 +95,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -216,11 +216,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -337,11 +337,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -458,11 +458,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -610,11 +610,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -762,11 +762,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<deviceType>Desktop</deviceType>
@@ -906,11 +906,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion>UNK</browserVersion>
<deviceType>Desktop</deviceType>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index d252d03f5d2622d73f459a9665c230efb0286df8..4af83361f6cd481f378e634a809767ec96c6da9e 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -66,7 +66,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -81,12 +80,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -102,6 +101,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -218,7 +218,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -233,12 +232,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -254,6 +253,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -339,7 +339,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -354,12 +353,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -375,6 +374,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -491,7 +491,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -506,12 +505,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -527,6 +526,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -612,7 +612,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -627,12 +626,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -648,6 +647,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -764,7 +764,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -779,12 +778,12 @@
<deviceType>Unknown</deviceType>
<operatingSystem>Unknown</operatingSystem>
<operatingSystemCode>UNK</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browser>Unknown</browser>
<browserName>Unknown</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>1</events>
@@ -800,6 +799,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -877,7 +877,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -892,12 +891,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -913,6 +912,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 2975b07bcb9130a86d41f69db929294eb8ea5460..18a864dbcddb5e03d6eab1d770d65d8bc1dea95e 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -56,7 +56,6 @@
<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -71,12 +70,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion />
<events>0</events>
@@ -94,6 +93,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -202,7 +202,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -217,12 +216,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -240,6 +239,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -325,7 +325,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -340,12 +339,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -363,6 +362,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -462,7 +462,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -477,12 +476,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -500,6 +499,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -585,7 +585,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -600,12 +599,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -623,6 +622,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -739,7 +739,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -754,12 +753,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -777,6 +776,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -862,7 +862,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -877,12 +876,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -900,6 +899,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 759645d39df54a656052c9b7a4aee8e9fe121bce..bf87d09256694d934d154cca0f65fc60037cd19a 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -97,7 +97,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -112,12 +111,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -135,6 +134,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -220,7 +220,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -235,12 +234,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -258,6 +257,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -374,7 +374,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -389,12 +388,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -412,6 +411,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -511,7 +511,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -526,12 +525,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -549,6 +548,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -634,7 +634,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -649,12 +648,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -672,6 +671,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -757,7 +757,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -772,12 +771,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -795,6 +794,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -870,7 +870,6 @@
<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -885,12 +884,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion />
<events>0</events>
@@ -908,6 +907,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 2975b07bcb9130a86d41f69db929294eb8ea5460..18a864dbcddb5e03d6eab1d770d65d8bc1dea95e 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -56,7 +56,6 @@
<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -71,12 +70,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion />
<events>0</events>
@@ -94,6 +93,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -202,7 +202,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -217,12 +216,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -240,6 +239,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -325,7 +325,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -340,12 +339,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -363,6 +362,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -462,7 +462,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -477,12 +476,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -500,6 +499,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -585,7 +585,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -600,12 +599,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -623,6 +622,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -739,7 +739,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -754,12 +753,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -777,6 +776,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -862,7 +862,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -877,12 +876,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -900,6 +899,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index bd23daaa0429b62de553f3bb30db73b6f8e726b5..855cc097558bfc71618a199ad16c7c952347d3e7 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -56,7 +56,6 @@
<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -71,12 +70,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Safari</browser>
<browserName>Safari</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion />
<events>0</events>
@@ -94,6 +93,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -202,7 +202,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -217,12 +216,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -240,6 +239,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -325,7 +325,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -340,12 +339,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -363,6 +362,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -462,7 +462,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -477,12 +476,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -500,6 +499,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -585,7 +585,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -600,12 +599,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -623,6 +622,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -739,7 +739,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -754,12 +753,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -777,6 +776,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -862,7 +862,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -877,12 +876,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -900,6 +899,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -999,7 +999,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1014,12 +1013,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1037,6 +1036,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1122,7 +1122,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1137,12 +1136,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -1160,6 +1159,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>11</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
<providerUrl />
@@ -1276,7 +1276,6 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -1291,12 +1290,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>1</events>
@@ -1314,6 +1313,7 @@
<visitLocalTime>12:34:06</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<daysSinceLastVisit>10</daysSinceLastVisit>
+ <resolution>1024x768</resolution>
<provider>awesomeisp.com</provider>
<providerName>Awesomeisp</providerName>
<providerUrl>http://www.awesomeisp.com/</providerUrl>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
index 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
index 6f656fdf684c09928aa6548f45a6c4b650694d11..019893396e997e2635e7d036a6a36ed779d1fc0f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
index 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
index 379e429ee3a8435028f4cbcb4044d2fc294c8498..b749f9ebe43cfaab2e489f927314c3424498341a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
index 4e417535ae556a2a037f12607a85814303f504d7..4429d16888099f15e94909d215975c1ff7ad4658 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a63f1933ae42cc012b38b3c3c2c54a58304f9e9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>Windows XP / Firefox / 1024x768</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ede209680dab5a18a20587e9749b6c1acf1fda05
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>1024x768</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>7</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
index 6f656fdf684c09928aa6548f45a6c4b650694d11..019893396e997e2635e7d036a6a36ed779d1fc0f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
index 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
index 379e429ee3a8435028f4cbcb4044d2fc294c8498..b749f9ebe43cfaab2e489f927314c3424498341a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
index 4e417535ae556a2a037f12607a85814303f504d7..4429d16888099f15e94909d215975c1ff7ad4658 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
@@ -9,6 +9,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
index 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
index b8deec1d68873a611027d1f0a4e3c35ca9729fb2..955f9837f9473fef5327dc68d8b21e9116a4e08a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
index 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
index 04cebec91e67db63635af9cdd3222d7adf1ab153..4c8451e2d8c7e18f8f2a528b75b2b513107d531a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
index 785661d383ef5ea632fc9df19673bb92e0695801..d5c916aa6c873f07a8a54b9ea373ace5c62e98b5 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 6649f123d99f5e39d7f983ccbb1b9bc2741d76d5..664c8bf45f93f5a2fb332c49b753c8d074738bf3 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -54,12 +54,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -74,6 +74,7 @@
<referrerUrl>http://search.yahoo.com/search?p=purchase</referrerUrl>
<referrerSearchEngineUrl>http://search.yahoo.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon>
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -85,7 +86,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -240,12 +240,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -260,6 +260,7 @@
<referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl>
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -271,7 +272,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
index b8deec1d68873a611027d1f0a4e3c35ca9729fb2..955f9837f9473fef5327dc68d8b21e9116a4e08a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
index 04cebec91e67db63635af9cdd3222d7adf1ab153..4c8451e2d8c7e18f8f2a528b75b2b513107d531a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WI7.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WI7.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
index 785661d383ef5ea632fc9df19673bb92e0695801..d5c916aa6c873f07a8a54b9ea373ace5c62e98b5 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/WXP.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 9b0149ac2a0d47c75b8b363a629bcac3c7bc443c..4baa370d704036e008579def5df1ebcc91d5c3d8 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -43,12 +43,12 @@
<deviceType>Inconnu</deviceType>
<operatingSystem>Bot</operatingSystem>
<operatingSystemCode>BOT</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Inconnu</browserFamilyDescription>
<browser>Inconnu</browser>
<browserName>Inconnu</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -63,6 +63,7 @@
<referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -74,7 +75,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -148,12 +148,12 @@
<deviceType>Inconnu</deviceType>
<operatingSystem>Bot</operatingSystem>
<operatingSystemCode>BOT</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Inconnu</browserFamilyDescription>
<browser>Inconnu</browser>
<browserName>Inconnu</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
<browserVersion />
<events>0</events>
@@ -168,6 +168,7 @@
<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -179,7 +180,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 4eb429a7633131ad521b257930ba1619f18bd51d..3953a817fba2a7689ff34ce8dc51344cec66306b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -48,12 +48,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 7.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<events>0</events>
@@ -68,6 +68,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -79,7 +80,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>10:00:00</visitLocalTime>
@@ -139,12 +139,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 7.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<events>0</events>
@@ -159,6 +159,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -170,7 +171,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>11:00:00</visitLocalTime>
@@ -230,12 +230,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browser>Internet Explorer 7.0</browser>
<browserName>Internet Explorer</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<events>0</events>
@@ -250,6 +250,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>unknown</resolution>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
@@ -261,7 +262,6 @@
<location>Unknown</location>
<latitude />
<longitude />
- <resolution>unknown</resolution>
<plugins />
<pluginsIcons />
<visitLocalTime>12:00:00</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
index 0ad33169a4c2aacfe167773bf48746439c210e12..8adb115a5f43e71ca56cbf229152d3e99763bec0 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>ga campaign</label>
- <nb_uniq_visitors>3</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
+ <nb_uniq_visitors>4</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>1</max_actions>
<sum_visit_length>1084</sum_visit_length>
- <bounce_count>3</bounce_count>
+ <bounce_count>4</bounce_count>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
@@ -21,13 +21,13 @@
<subtable>
<row>
<label>piwik kwd</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<nb_users>0</nb_users>
<max_actions>1</max_actions>
<sum_visit_length>1084</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
@@ -145,6 +145,46 @@
</row>
</subtable>
</row>
+ <row>
+ <label>credited to another goal</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>0</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>0</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>24</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>24</revenue>
+ <subtable>
+ <row>
+ <label>example.org</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>0</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>0</max_actions>
+ <sum_visit_length>3</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>24</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>24</revenue>
+ </row>
+ </subtable>
+ </row>
<row>
<label>credited to goal please</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
index c234bed59e963e268d7a9bc05348d941758c4aa9..51ea81cd04197e40d0b00ae795c116a69372a79b 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
@@ -1,2 +1,75 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>mutantregistration.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <subtable>
+ <row>
+ <label>http://mutantregistration.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>myotherreferrerwebsite.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>2</max_actions>
+ <sum_visit_length>361</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <subtable>
+ <row>
+ <label>http://myotherreferrerwebsite.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>2</max_actions>
+ <sum_visit_length>361</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>myreferrerwebsite.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <subtable>
+ <row>
+ <label>http://myreferrerwebsite.com</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ </row>
+ </subtable>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
index 78c6610886d659cb7416bef6861b095983ba9d45..3e911d8174b58d7f4e2499d4228941eb2bd478f8 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
@@ -2,13 +2,13 @@
<result>
<nb_uniq_visitors>3</nb_uniq_visitors>
<nb_users>0</nb_users>
- <nb_visits>8</nb_visits>
- <nb_actions>7</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>8</bounce_count>
- <sum_visit_length>1084</sum_visit_length>
- <max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
+ <nb_visits>15</nb_visits>
+ <nb_actions>14</nb_actions>
+ <nb_visits_converted>3</nb_visits_converted>
+ <bounce_count>14</bounce_count>
+ <sum_visit_length>1448</sum_visit_length>
+ <max_actions>2</max_actions>
+ <bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>0.9</nb_actions_per_visit>
- <avg_time_on_site>136</avg_time_on_site>
+ <avg_time_on_site>97</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
index 68837cb7a6458e9ffb9aff18df9a8295729aa974..ec4c9be19cbd1c0fe58aae24f71fa949bc223cd3 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
@@ -49,7 +49,7 @@
<metrics>
<nb_visits_0>
<name>Firefox (Visits)</name>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
<min>0</min>
<max>1</max>
</nb_visits_0>
@@ -58,7 +58,7 @@
</nb_visits_1>
<nb_visits_2>
<name>Opera (Visits)</name>
- <logo>plugins/UserSettings/images/browsers/OP.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/OP.gif</logo>
<min>0</min>
<max>1</max>
<change>-100%</change>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 17d9192ba422cc3aa77bb288ccf81c31518a0361..d37012289bcbdebe21ad070bfd1c3aad1b8ac46d 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -43,12 +43,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -63,6 +63,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -74,7 +75,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 8ca1417d42f5b16f957a7366870249d66706cc94..37aa7952b2ab43952af0709311a9446685cfd9d7 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -4713,7 +4713,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4738,7 +4738,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4763,7 +4763,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/OP.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
Opera </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4831,7 +4831,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4856,7 +4856,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox 3.6 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4881,7 +4881,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/OP.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
Opera 9.63 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5015,7 +5015,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/os/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5040,7 +5040,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WI7.gif'>
+ <img src='plugins/DevicesDetection/images/os/WI7.gif'>
Windows </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5108,7 +5108,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/os/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5133,7 +5133,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WXP.gif'>
+ <img src='plugins/DevicesDetection/images/os/WXP.gif'>
Windows XP </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 89c97c7ba3d1c99e99e005e6069806fdc0eb5d94..b8846f762cf211cdd8700487e712fe753e6e0300 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -45,7 +45,7 @@
</a>
</li>
<li>
- <a href="#UserSettings_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
+ <a href="#Resolution_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
Screen Resolution
</a>
</li>
@@ -55,7 +55,7 @@
</a>
</li>
<li>
- <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
+ <a href="#Resolution_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
Visitor Configuration
</a>
</li>
@@ -1864,7 +1864,7 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
Screen Resolution
</h2>
@@ -2102,7 +2102,7 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
Visitor Configuration
</h2>
@@ -4543,7 +4543,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4568,7 +4568,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4593,7 +4593,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/OP.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
Opera </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4717,7 +4717,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4742,7 +4742,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox 3.6 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4767,7 +4767,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/OP.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
Opera 9.63 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4889,7 +4889,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/os/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4914,7 +4914,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WI7.gif'>
+ <img src='plugins/DevicesDetection/images/os/WI7.gif'>
Windows </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4976,7 +4976,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/os/UNK.gif'>
Unknown </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5001,7 +5001,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WXP.gif'>
+ <img src='plugins/DevicesDetection/images/os/WXP.gif'>
Windows XP </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 90ebe565a75af160096ec03fa8ed9483a5e25f33..525999bee142c5fae5944014e4da90a97f034568 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -192,7 +192,7 @@
<row>
<category>Visitor Settings</category>
<name>Screen Resolution</name>
- <module>UserSettings</module>
+ <module>Resolution</module>
<action>getResolution</action>
<dimension>Resolution</dimension>
<metrics>
@@ -213,9 +213,9 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>UserSettings_getResolution</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>Resolution_getResolution</uniqueId>
</row>
<row>
<category>Visitor Settings</category>
@@ -240,7 +240,7 @@
<row>
<category>Visitor Settings</category>
<name>Visitor Configuration</name>
- <module>UserSettings</module>
+ <module>Resolution</module>
<action>getConfiguration</action>
<dimension>Configuration</dimension>
<documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
@@ -262,9 +262,9 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>UserSettings_getConfiguration</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>Resolution_getConfiguration</uniqueId>
</row>
<row>
<category>Visitor Settings</category>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index 346c1542dbf3c6c843ee17754e575ec5c71d7ca7..172e23b93df07e039866042b9c715f3ec0070931 100644
Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 76d48bc7b6e95c2460ff65f2a273c31e6543d057..6cdb55181ca8ae10a7f2eb2272e5a9e3e934da40 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -81,12 +81,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -101,6 +101,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Poland</country>
@@ -112,7 +113,6 @@
<location>Poland</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -290,12 +290,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -310,6 +310,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Poland</country>
@@ -321,7 +322,6 @@
<location>Poland</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 5ff6e58fbae68f83283f4537564934bc9ba61a2f..57a190c4a209a569e8d0626dcd9a5da1dd0d45f2 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -157,12 +157,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -177,6 +177,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Poland</country>
@@ -188,7 +189,6 @@
<location>Poland</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -485,12 +485,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -505,6 +505,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>Poland</country>
@@ -516,7 +517,6 @@
<location>Poland</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -699,12 +699,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -719,6 +719,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1024x768</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -730,7 +731,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index dd359fb284ae509e2d31aea7325d1b99c2d0bce6..34dfb95a2278379bd157e678224b2260113f1037 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -6502,7 +6502,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6570,7 +6570,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox 3.6 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6704,7 +6704,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WI7.gif'>
+ <img src='plugins/DevicesDetection/images/os/WI7.gif'>
Windows </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6772,7 +6772,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WXP.gif'>
+ <img src='plugins/DevicesDetection/images/os/WXP.gif'>
Windows XP </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index cf266ddbcc89f350a93556093a72305ead59a663..e4b7038652debb3ed2560cfbe8fd86226a87eced 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -45,7 +45,7 @@
</a>
</li>
<li>
- <a href="#UserSettings_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
+ <a href="#Resolution_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
Screen Resolution
</a>
</li>
@@ -55,7 +55,7 @@
</a>
</li>
<li>
- <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
+ <a href="#Resolution_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
Visitor Configuration
</a>
</li>
@@ -1924,7 +1924,7 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
Screen Resolution
</h2>
@@ -2139,7 +2139,7 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
Visitor Configuration
</h2>
@@ -6224,7 +6224,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6408,7 +6408,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
Firefox 3.6 </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6470,7 +6470,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WI7.gif'>
+ <img src='plugins/DevicesDetection/images/os/WI7.gif'>
Windows </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6532,7 +6532,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- <img src='plugins/UserSettings/images/os/WXP.gif'>
+ <img src='plugins/DevicesDetection/images/os/WXP.gif'>
Windows XP </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..106f23f16bb7dddc98ac7def1dd2c59d64a48127
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="2009-01-04" />
+ <result date="2009-01-05" />
+ <result date="2009-01-06" />
+ <result date="2009-01-07" />
+ <result date="2009-01-08" />
+ <result date="2009-01-09" />
+ <result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cfb246edc18a6da402cb45044dfaf1ad20e25bc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="From 2008-12-29 to 2009-01-04" />
+ <result date="From 2009-01-05 to 2009-01-11" />
+ <result date="From 2009-01-12 to 2009-01-18" />
+ <result date="From 2009-01-19 to 2009-01-25" />
+ <result date="From 2009-01-26 to 2009-02-01" />
+ <result date="From 2009-02-02 to 2009-02-08" />
+ <result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..106f23f16bb7dddc98ac7def1dd2c59d64a48127
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="2009-01-04" />
+ <result date="2009-01-05" />
+ <result date="2009-01-06" />
+ <result date="2009-01-07" />
+ <result date="2009-01-08" />
+ <result date="2009-01-09" />
+ <result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cfb246edc18a6da402cb45044dfaf1ad20e25bc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="From 2008-12-29 to 2009-01-04" />
+ <result date="From 2009-01-05 to 2009-01-11" />
+ <result date="From 2009-01-12 to 2009-01-18" />
+ <result date="From 2009-01-19 to 2009-01-25" />
+ <result date="From 2009-01-26 to 2009-02-01" />
+ <result date="From 2009-02-02 to 2009-02-08" />
+ <result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c234bed59e963e268d7a9bc05348d941758c4aa9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c234bed59e963e268d7a9bc05348d941758c4aa9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml
similarity index 100%
rename from tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
rename to tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
index b48064a09c9980a724ac7fcf19c71d1489c36c06..d1d3cb310d64881ac7d5e16baf97209418b23d90 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
@@ -51,12 +51,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -71,6 +71,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -82,7 +83,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -164,12 +164,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -184,6 +184,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -195,7 +196,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -337,12 +337,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -357,6 +357,7 @@
<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -368,7 +369,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index b48064a09c9980a724ac7fcf19c71d1489c36c06..d1d3cb310d64881ac7d5e16baf97209418b23d90 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -51,12 +51,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -71,6 +71,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -82,7 +83,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -164,12 +164,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -184,6 +184,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -195,7 +196,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -337,12 +337,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
@@ -357,6 +357,7 @@
<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -368,7 +369,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 845a1a23a9e41e3d5bbabfcbcb2d274db7250f28..76c9807789f24bdb0583bfc6776d4d699b156e49 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -97,12 +97,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -117,6 +117,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -128,7 +129,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
@@ -211,12 +211,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.0</browser>
<browserName>Firefox</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
<events>0</events>
@@ -231,6 +231,7 @@
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
+ <resolution>1111x222</resolution>
<continent>Europe</continent>
<continentCode>eur</continentCode>
<country>France</country>
@@ -242,7 +243,6 @@
<location>France</location>
<latitude />
<longitude />
- <resolution>1111x222</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
index a9683715379b2eb37e617e98f589e36d9f55910c..4606699122a64d042c95a71d831197883b60f83d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Internet Explorer 9.0</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>Others</label>
@@ -34,6 +34,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>45</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
index c58f00fa96ce13bc9a8567c34751dbfd4f38732a..2925479cc4d955997f3157eb4b445a293be35b14 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>20</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Android 4.0</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Others</label>
@@ -34,6 +34,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>40</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
index a9683715379b2eb37e617e98f589e36d9f55910c..4606699122a64d042c95a71d831197883b60f83d 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
</row>
<row>
<label>Internet Explorer 9.0</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
<row>
<label>Others</label>
@@ -34,6 +34,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>45</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
index c58f00fa96ce13bc9a8567c34751dbfd4f38732a..2925479cc4d955997f3157eb4b445a293be35b14 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>20</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/LIN.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
</row>
<row>
<label>Android 4.0</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>15</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/AND.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/AND.gif</logo>
</row>
<row>
<label>Others</label>
@@ -34,6 +34,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>40</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <logo>plugins/UserSettings/images/os/UNK.gif</logo>
+ <logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 6a6bbbb4db5f8243f462b94b3e57bc68e7366317..0165dcc57e66d0dfdeb2ff6bb2905e125fde722c 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 6a6bbbb4db5f8243f462b94b3e57bc68e7366317
+Subproject commit 0165dcc57e66d0dfdeb2ff6bb2905e125fde722c
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
index f072011675b16b6315a27b3356b6fa6da1c3367a..b9701a88cde902c3bb5503df7fdd70a885f2abf0 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_AddSummaryRowTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
index 6e8eb733b8c5775044cd65e9ee39f1fbc774f191..0f0675114f20c4f974233a1fe637fdad84383fa5 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
@@ -12,6 +12,9 @@ use Piwik\DataTable\Filter\ExcludeLowPopulation;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_ExcludeLowPopulationTest extends \PHPUnit_Framework_TestCase
{
protected function getTestDataTable()
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
index 94d2d4c84be1f2a588ddb96bb98b527f9758da34..753220542c808ef37330903ec47e0673e5e38166 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
@@ -12,6 +12,9 @@ use Piwik\DataTable\Filter\Limit;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -39,9 +42,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testNormal()
{
$offset = 2;
@@ -55,9 +56,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testLimitLessThanCountShouldReturnCountLimit()
{
$offset = 2;
@@ -71,9 +70,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testLimitIsCountShouldNotDeleteAnything()
{
$offset = 0;
@@ -88,9 +85,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testLimitGreaterThanCountShouldReturnCountUntilCount()
{
$offset = 5;
@@ -105,9 +100,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testLimitIsNullShouldReturnCountIsOffset()
{
$offset = 1;
@@ -120,9 +113,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testOffsetJustBeforeSummaryRowShouldJustReturnSummaryRow()
{
$offset = 9;
@@ -136,9 +127,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testOffsetJustBeforeSummaryRowWithBigLimitShouldJustReturnSummaryRow()
{
$offset = 9;
@@ -152,9 +141,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testOffsetBeforeSummaryRowShouldJustReturnRowAndSummaryRow()
{
$offset = 8;
@@ -168,9 +155,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testOffsetGreaterThanCountShouldReturnEmptyTable()
{
$offset = 10;
@@ -182,9 +167,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
}
- /**
- * @group Core
- */
+
public function testLimitIsZeroShouldReturnEmptyTable()
{
$offset = 0;
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
index 4c9cd46ab3bd30f206545d756d7042fd1976eb14..8ee9c439dddde334873c7532704c3d54790b7c82 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_PatternRecursiveTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
index e9d63f1d98ae1e4f923d7d6c242ee5c44b069b2d..5c97588a3c22fa1fa0f6a30953271c70b6681c99 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_PatternTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
index f1faa99b88bf89ec69d66e82ca73ce002aa4d667..d77a3ca7ed9fa939a3e11cbc0fa855bb84909f89 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
@@ -17,7 +17,7 @@ use PHPUnit_Framework_TestCase;
use Exception;
/**
- * @group Core
+ * @group DataTableTest
*/
class PivotByDimensionTest extends PHPUnit_Framework_TestCase
{
@@ -90,13 +90,13 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
/**
* @expectedException Exception
- * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'UserSettings.UserSettings_WidgetGlobalVisitors'
+ * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'Resolution.Resolution_WidgetGlobalVisitors'
*/
public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmentFetchingIsEnabledButThereIsNoSegment()
{
- $this->loadPlugins('Referrers', 'UserSettings');
+ $this->loadPlugins('Referrers', 'Resolution');
- new PivotByDimension(new DataTable(), "UserSettings.GetConfiguration", "Referrers.Keyword", "nb_visits");
+ new PivotByDimension(new DataTable(), "Resolution.GetConfiguration", "Referrers.Keyword", "nb_visits");
}
/**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
index 3c1d91a3576c7f9b23be2f5151af23def7986b65..0deccd217f807149fcaffb27b2f15b51e4d2042d 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
@@ -12,11 +12,12 @@ use Piwik\DataTable\Filter\RangeCheck;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_RangeCheckTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @group Core
- */
+
public function testRangeCheckNormalDataTable()
{
$table = new DataTable();
@@ -34,9 +35,7 @@ class DataTable_Filter_RangeCheckTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedOrder, $table->getColumn('count'));
}
- /**
- * @group Core
- */
+
public function testRangeCheckNormalDataTableNonIntegerValues()
{
$table = new DataTable();
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
index 64eab67a10352d683c21c7b47737a80dad98c2de..34ec2a2c9a74ba3d0a188b46900cc0ebd5ffff0c 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
@@ -13,13 +13,11 @@ use Piwik\DataTable;
use Piwik\DataTable\Row;
/**
- * @group SortTest
+ * @group DataTableTest
*/
class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @group Core
- */
+
public function testNormalSortDescending()
{
$table = new DataTable();
@@ -34,9 +32,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedOrder, $table->getColumn('label'));
}
- /**
- * @group Core
- */
+
public function testNormalSortAscending()
{
$table = new DataTable();
@@ -51,9 +47,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedOrder, $table->getColumn('label'));
}
- /**
- * @group Core
- */
+
public function testMissingColumnValuesShouldAppearLastAfterSortAsc()
{
$table = new DataTable();
@@ -71,9 +65,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedOrder, $table->getColumn('label'));
}
- /**
- * @group Core
- */
+
public function testMissingColumnValuesShouldAppearLastAfterSortDesc()
{
$table = new DataTable();
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
index d82e8da4411b8a635bc54b99d73113e618d7f972..b3b5710f91e88756065c42d14ae3cb7d12330cb2 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
@@ -12,11 +12,12 @@ use Piwik\DataTable\Filter\Truncate;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @group Core
- */
+
public function testUnrelatedDataTableNotFiltered()
{
// remark: this unit test would become invalid and would need to be rewritten if
@@ -38,9 +39,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$filter->filter($dataTableBeingFiltered);
}
- /**
- * @group Core
- */
+
public function testForInfiniteRecursion()
{
$dataTableBeingFiltered = new DataTable();
@@ -62,9 +61,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$filter->filter($dataTableBeingFiltered);
}
- /**
- * @group Core
- */
+
public function testOffsetIsCountSummaryRowShouldBeTheRow()
{
$table = $this->getDataTableCount5();
@@ -74,9 +71,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4()));
}
- /**
- * @group Core
- */
+
public function testOffsetIsLessThanCountSummaryRowShouldBeTheSum()
{
$table = $this->getDataTableCount5();
@@ -89,9 +84,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array_keys($table->getLastRow()->getColumns()), array_keys($expectedRow->getColumns()));
}
- /**
- * @group Core
- */
+
public function testOffsetIsMoreThanCountShouldNotTruncate()
{
$table = $this->getDataTableCount5();
@@ -101,9 +94,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4()));
}
- /**
- * @group Core
- */
+
public function testWhenThereIsAlreadyASummaryRowShouldReplaceTheSummaryRow()
{
$table = $this->getDataTableCount5();
@@ -116,9 +107,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(Row::isEqual($table->getLastRow(), $expectedRow));
}
- /**
- * @group Core
- */
+
public function testSumTablesWithSummaryRowShouldSumTheSummaryRow()
{
// row0, row1, row2, rowSummary1
@@ -142,9 +131,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(DataTable::isEqual($expectedTable, $table1));
}
- /**
- * @group Core
- */
+
public function testAddOneTableWithSummaryRow()
{
// row0, row1, row2, rowSummary1
@@ -169,9 +156,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
}
- /**
- * @group Core
- */
+
public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRowAfterSort()
{
$table = new DataTable;
diff --git a/tests/PHPUnit/Unit/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
index 659e76ac8fc227d50c2142c805d69f7206593225..179e3f11df07f036ea537391bb57a5cb50cde24d 100644
--- a/tests/PHPUnit/Unit/DataTable/MapTest.php
+++ b/tests/PHPUnit/Unit/DataTable/MapTest.php
@@ -7,6 +7,9 @@ use Piwik\DataTable\Manager;
use Piwik\DataTable;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class Test_DataTable_Map extends \PHPUnit_Framework_TestCase
{
public function setUp()
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
index 85691cab26f4ea6fa79f6a2cfa9b47398a2d79d7..c6fd94e40667f052d03a3e25698a13b8ea6b7770 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Csv;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
+/**
+ * @group DataTableTest
+ */
class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testCSVTest1()
{
$dataTable = $this->_getDataTableTest();
@@ -111,9 +112,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVTest2()
{
$dataTable = $this->_getDataTableSimpleTest();
@@ -125,9 +124,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testCSVTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -139,9 +136,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVTest5()
{
$dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -153,9 +148,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVTest4()
{
$dataTable = $this->_getDataTableEmpty();
@@ -167,9 +160,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVTest6()
{
$dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -181,9 +172,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVRendererCorrectlyEscapesHeadersAndValues()
{
$dataTable = $this->_getDataTableSimpleWithCommasInCells();
@@ -301,9 +290,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testCSVMapTest1()
{
$dataTable = $this->_getDataTableMapTest();
@@ -320,9 +307,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVMapTest2()
{
$dataTable = $this->_getDataTableSimpleMapTest();
@@ -335,9 +320,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVMapTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -349,9 +332,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVMapisMadeOfMapTest1()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -368,9 +349,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVMapIsMadeOfMapTest2()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -383,9 +362,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testCSVMapIsMadeOfMapTest3()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -397,9 +374,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testRenderArray1()
{
$data = array();
@@ -412,9 +387,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray2()
{
$data = array('a', 'b', 'c');
@@ -429,9 +402,7 @@ c';
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray3()
{
$data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -445,9 +416,7 @@ b,d,f,g';
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray4()
{
$data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
index 686f6a1be68d64d23cefb8291971a239c6d935e3..209a7a37a7e6d368ae019bb970422a1c8753ea08 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
@@ -13,6 +13,9 @@ use Piwik\DataTable;
use Piwik\DataTable\Renderer\Console;
use Piwik\DataTable\Row;
+/**
+ * @group DataTableTest
+ */
class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
@@ -89,9 +92,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testRenderArray1()
{
$data = array();
@@ -104,9 +105,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray2()
{
$data = array('a', 'b', 'c');
@@ -121,9 +120,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray3()
{
$data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -136,9 +133,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray4()
{
$data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
index 738439474c1ce43c6185181b234098c3e9fa5271..754424182ca12e238e1b650a944e4696a0590a10 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Json;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
+/**
+ * @group DataTableTest
+ */
class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testJSONTest1()
{
$dataTable = $this->_getDataTableTest();
@@ -108,9 +109,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONTest2()
{
$dataTable = $this->_getDataTableSimpleTest();
@@ -121,9 +120,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testJSONTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -133,9 +130,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testJSONTest4()
{
$dataTable = $this->_getDataTableEmpty();
@@ -145,9 +140,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testJSONTest5()
{
$dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -157,9 +150,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testJSONTest6()
{
$dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -274,9 +265,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testJSONArrayTest1()
{
$dataTable = $this->_getDataTableMapTest();
@@ -288,9 +277,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONMapTest2()
{
$dataTable = $this->_getDataTableSimpleMapTest();
@@ -303,9 +290,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONMapTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -317,9 +302,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONMapIsMadeOfMapTest1()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -330,9 +313,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONMapIsMadeOfMapTest2()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -345,9 +326,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testJSONMapIsMadeOfMapTest3()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -359,9 +338,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testRenderArray1()
{
$data = array();
@@ -373,9 +350,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray2()
{
$data = array('a', 'b', 'c', array('a' => 'b'), array(1, 2));
@@ -387,9 +362,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray3()
{
$data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -401,9 +374,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray4()
{
$data = array('a' => 'b', 'c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k'));
@@ -415,9 +386,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray5()
{
$data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
index e3201dfbe6b2f650902cafc4f9784f3f0cc837ee..de8128cfb9a718cc3794ca218e849cabdc632098 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Php;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
+/**
+ * @group DataTableTest
+ */
class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testPHPTest1()
{
$dataTable = $this->_getDataTableTest();
@@ -157,9 +158,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPTest2()
{
$dataTable = $this->_getDataTableSimpleTest();
@@ -176,9 +175,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testPHPTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -188,9 +185,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testPHPTest4()
{
$dataTable = $this->_getDataTableEmpty();
@@ -200,9 +195,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testPHPTest5()
{
$dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -212,9 +205,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testPHPTest6()
{
$dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -329,9 +320,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testPHPMapTest1()
{
$dataTable = $this->_getDataTableMapTest();
@@ -383,9 +372,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPMapTest2()
{
$dataTable = $this->_getDataTableSimpleMapTest();
@@ -410,9 +397,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPMapTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -428,9 +413,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPMapIsMadeOfMapTest1()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -484,9 +467,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPMapIsMadeOfMapTest2()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -512,9 +493,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testPHPMapIsMadeOfMapTest3()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
index 1abfe94b06c9b55f69f3cdeda5d79e9d184558b5..e9b02a9bd1305bfc2983b60074076741096c34fd 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Xml;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
+/**
+ * @group DataTableTest
+ */
class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testXMLTest1()
{
$dataTable = $this->_getDataTableTest();
@@ -152,9 +153,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testXMLTest2()
{
$dataTable = $this->_getDataTableSimpleTest();
@@ -172,9 +171,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -185,9 +182,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLTest4()
{
$dataTable = $this->_getDataTableEmpty();
@@ -198,9 +193,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLTest5()
{
$dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -211,9 +204,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLTest6()
{
$dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -224,9 +215,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLRendererSuccessfullyRendersWhenSimpleDataTableColumnsHaveInvalidXmlCharacters()
{
$dataTable = $this->_getDataTableSimpleWithInvalidChars();
@@ -241,9 +230,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLRendererSuccessfullyRendersWhenDataTableColumnsHaveInvalidXmlCharacters()
{
$dataTable = $this->_getDataTableWithInvalidChars();
@@ -365,9 +352,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
return $table;
}
- /**
- * @group Core
- */
+
public function testXMLMapTest1()
{
$dataTable = $this->_getDataTableMapTest();
@@ -412,9 +397,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLArrayIsMadeOfMapTest1()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -463,9 +446,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testXMLMapTest2()
{
$dataTable = $this->_getDataTableSimpleMapTest();
@@ -487,9 +468,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testXMLArrayIsMadeOfMapTest2()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -513,9 +492,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testXMLMapTest3()
{
$dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -532,9 +509,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testXMLArrayIsMadeOfMapTest3()
{
$dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -552,9 +527,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $rendered);
}
- /**
- * @group Core
- */
+
public function testRenderArray1()
{
$data = array();
@@ -567,9 +540,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray2()
{
$data = array("firstElement",
@@ -592,9 +563,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray3()
{
$data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -614,9 +583,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $render->render());
}
- /**
- * @group Core
- */
+
public function testRenderArray4()
{
$data = array('c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k'));
diff --git a/tests/PHPUnit/Unit/DataTable/RowTest.php b/tests/PHPUnit/Unit/DataTable/RowTest.php
index 53a072fa3614d9f59b1d44ea5ce608860afb6083..7033299df57ce514b807709d65cc12a9802f4743 100644
--- a/tests/PHPUnit/Unit/DataTable/RowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/RowTest.php
@@ -12,7 +12,7 @@ use Piwik\DataTable;
use Piwik\DataTable\Row;
/**
- * @group Core
+ * @group DataTableTest
*/
class RowTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
index 30320f32ce1a98071e2d678c6b36d6234fd88e01..b36dbd514613359cd9bb8840581c370c648d0154 100644
--- a/tests/PHPUnit/Unit/DataTableTest.php
+++ b/tests/PHPUnit/Unit/DataTableTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Row;
use Piwik\DataTable;
use Piwik\Timer;
+/**
+ * @group DataTableTest
+ */
class DataTableTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 2150dc32bac303ae19276ef19674079eb88f6891..25b9f46ee14f81ba205225e02d9adbf19efa9966 100644
--- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
@@ -62,6 +62,8 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
$this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill);
$this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill);
$this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill);
+ $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getResolution', $validTill);
+ $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getConfiguration', $validTill);
$this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill);
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add');
diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log
new file mode 100644
index 0000000000000000000000000000000000000000..d7ff476a6c5cff22e345e748c34e3c70fbd73aa5
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_custom_iis.log
@@ -0,0 +1,8 @@
+#Software: IIS Advanced Logging Module
+#Version: 1.0
+#Start-Date: 2014-11-18 00:00:00.128
+#Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS
+2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 user1 "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109
+2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 user1 "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0
+2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359
+2012-08-15 17:30:00.675 10.10.28.140 GET /hello/from/another/world/6,681965 - 80 user2 "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 200 0 0 359
diff --git a/tests/resources/access-logs/fake_logs_netscaler.log b/tests/resources/access-logs/fake_logs_netscaler.log
new file mode 100644
index 0000000000000000000000000000000000000000..17035db670f3e37384f83076db7408ba60c85925
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_netscaler.log
@@ -0,0 +1,6 @@
+#Version: 1.0
+#Software: Netscaler Web Logging(NSWL)
+#Date: 2014-02-18 11:55:13
+#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer)
+2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - -
+2012-08-16 11:59:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/silentDetection.jsp - 200 310 5609 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) JSESSIONID=7BBF2F11B80261B27D23010421412323 -
\ No newline at end of file