diff options
523 files changed, 6681 insertions, 2431 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 555eaaf2bf..b52ca59452 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 54575ea797..ee3153ad65 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 c0cd7aca1e..809780082d 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 74774d1b5d..fdddc728f8 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", @@ -355,78 +355,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", "source": { @@ -619,56 +547,18 @@ "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 4a319c7e89..fd0f00031e 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 b84d33d94f..5d4518196b 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 @@ -31,11 +29,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 4977fa5324..87b9e00282 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 61e8abb1eb..895645af0f 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 fb2dc009f9..dc4756d82e 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 697403c2e3..f383a13260 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 3c1e31e2d0..1e550f6e3f 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 d225b8fb87..07e7bc01b2 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 0e1c127fb1..a4fcbff0c5 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 56360b939c..eb6d32a3e3 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 c6c0d21e9f..0e7d329d77 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 7d477a304c..2c9eda5e8e 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 09a58554c0..b9aa3a9b2a 100644 --- a/core/Plugin/Dimension/VisitDimension.php +++ b/core/Plugin/Dimension/VisitDimension.php @@ -270,6 +270,25 @@ abstract class VisitDimension extends Dimension } /** + * 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 795d4da157..f29f208059 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 ae55b48aac..4174a3168f 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 4065ebe15c..4e108450b5 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 0000000000..21a5e7b1af --- /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 4c3de8b7df..7b382341ef 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 c998e1913d..ffb57b6195 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 322ffd0455..903611c970 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 a9d53d8dfc..d7eb5aff3a 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 7b46ea3e11..9e57eeb4cb 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 0000000000..73797b64dd --- /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 0000000000..380c09d2c4 --- /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 37af5eee8f..73811a3717 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 d19cfaa6fc..392e3777f8 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 e168f5d742..34873eb194 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 7b62e398c2..61ceb20717 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 7b62e398c2..61ceb20717 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 7b62e398c2..61ceb20717 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 7b62e398c2..61ceb20717 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 7b62e398c2..61ceb20717 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 -Subproject 8ad0ac8638c27a93cb4bef80ecdd29b56876430 +Subproject 2f10c8b496252d1527a47864cf39d18b359b7ae 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 da580cc910..eedf7e3f01 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 c8fe989045..8ab0ffe925 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 Binary files differindex 9b78ba7292..9b78ba7292 100644 --- a/plugins/UserSettings/images/browsers/AA.gif +++ b/plugins/DevicesDetection/images/browsers/AA.gif diff --git a/plugins/UserSettings/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif Binary files differindex 0e277b8e2d..0e277b8e2d 100644 --- a/plugins/UserSettings/images/browsers/AB.gif +++ b/plugins/DevicesDetection/images/browsers/AB.gif diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif Binary files differindex 151b9a33c6..151b9a33c6 100644 --- a/plugins/UserSettings/images/browsers/AG.gif +++ b/plugins/DevicesDetection/images/browsers/AG.gif diff --git a/plugins/UserSettings/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif Binary files differindex f38dd45077..f38dd45077 100644 --- a/plugins/UserSettings/images/browsers/AM.gif +++ b/plugins/DevicesDetection/images/browsers/AM.gif diff --git a/plugins/UserSettings/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif Binary files differindex bf0ade5551..bf0ade5551 100644 --- a/plugins/UserSettings/images/browsers/AN.gif +++ b/plugins/DevicesDetection/images/browsers/AN.gif diff --git a/plugins/UserSettings/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif Binary files differindex 69c79b25a0..69c79b25a0 100644 --- a/plugins/UserSettings/images/browsers/AR.gif +++ b/plugins/DevicesDetection/images/browsers/AR.gif diff --git a/plugins/UserSettings/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif Binary files differindex 2bee0af264..2bee0af264 100644 --- a/plugins/UserSettings/images/browsers/AV.gif +++ b/plugins/DevicesDetection/images/browsers/AV.gif diff --git a/plugins/UserSettings/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif Binary files differindex b7980bce3f..b7980bce3f 100644 --- a/plugins/UserSettings/images/browsers/AW.gif +++ b/plugins/DevicesDetection/images/browsers/AW.gif diff --git a/plugins/UserSettings/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif Binary files differindex dc732a8462..dc732a8462 100644 --- a/plugins/UserSettings/images/browsers/B2.gif +++ b/plugins/DevicesDetection/images/browsers/B2.gif diff --git a/plugins/UserSettings/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif Binary files differindex e8316ef586..e8316ef586 100644 --- a/plugins/UserSettings/images/browsers/BB.gif +++ b/plugins/DevicesDetection/images/browsers/BB.gif diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif Binary files differindex 4f4e740562..4f4e740562 100644 --- a/plugins/UserSettings/images/browsers/BD.gif +++ b/plugins/DevicesDetection/images/browsers/BD.gif diff --git a/plugins/UserSettings/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif Binary files differindex 317112b4ca..317112b4ca 100644 --- a/plugins/UserSettings/images/browsers/BE.gif +++ b/plugins/DevicesDetection/images/browsers/BE.gif diff --git a/plugins/UserSettings/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif Binary files differindex 5324db57b9..5324db57b9 100644 --- a/plugins/UserSettings/images/browsers/BJ.gif +++ b/plugins/DevicesDetection/images/browsers/BJ.gif diff --git a/plugins/UserSettings/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif Binary files differindex dc732a8462..dc732a8462 100644 --- a/plugins/UserSettings/images/browsers/BP.gif +++ b/plugins/DevicesDetection/images/browsers/BP.gif diff --git a/plugins/UserSettings/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif Binary files differindex 6a1d7bd1ed..6a1d7bd1ed 100644 --- a/plugins/UserSettings/images/browsers/BS.gif +++ b/plugins/DevicesDetection/images/browsers/BS.gif diff --git a/plugins/UserSettings/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif Binary files differindex fde79bdaf3..fde79bdaf3 100644 --- a/plugins/UserSettings/images/browsers/BX.gif +++ b/plugins/DevicesDetection/images/browsers/BX.gif diff --git a/plugins/UserSettings/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif Binary files differindex 3018ff3855..3018ff3855 100644 --- a/plugins/UserSettings/images/browsers/CA.gif +++ b/plugins/DevicesDetection/images/browsers/CA.gif diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif Binary files differindex dc98e39307..dc98e39307 100644 --- a/plugins/UserSettings/images/browsers/CD.gif +++ b/plugins/DevicesDetection/images/browsers/CD.gif diff --git a/plugins/UserSettings/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CF.gif +++ b/plugins/DevicesDetection/images/browsers/CF.gif diff --git a/plugins/UserSettings/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CH.gif +++ b/plugins/DevicesDetection/images/browsers/CH.gif diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif Binary files differindex 562a3406d0..562a3406d0 100644 --- a/plugins/UserSettings/images/browsers/CK.gif +++ b/plugins/DevicesDetection/images/browsers/CK.gif diff --git a/plugins/UserSettings/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CM.gif +++ b/plugins/DevicesDetection/images/browsers/CM.gif diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif Binary files differindex b3cdc7c202..b3cdc7c202 100644 --- a/plugins/UserSettings/images/browsers/CN.gif +++ b/plugins/DevicesDetection/images/browsers/CN.gif diff --git a/plugins/UserSettings/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif Binary files differindex 98f684c6c0..98f684c6c0 100644 --- a/plugins/UserSettings/images/browsers/CO.gif +++ b/plugins/DevicesDetection/images/browsers/CO.gif diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif Binary files differindex cb0b2db808..cb0b2db808 100644 --- a/plugins/UserSettings/images/browsers/CP.gif +++ b/plugins/DevicesDetection/images/browsers/CP.gif diff --git a/plugins/UserSettings/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif Binary files differindex 10fb8f7bc1..10fb8f7bc1 100644 --- a/plugins/UserSettings/images/browsers/CS.gif +++ b/plugins/DevicesDetection/images/browsers/CS.gif diff --git a/plugins/UserSettings/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif Binary files differindex 56ce414c2f..56ce414c2f 100644 --- a/plugins/UserSettings/images/browsers/DF.gif +++ b/plugins/DevicesDetection/images/browsers/DF.gif diff --git a/plugins/UserSettings/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif Binary files differindex 621d12fc0a..621d12fc0a 100644 --- a/plugins/UserSettings/images/browsers/DI.gif +++ b/plugins/DevicesDetection/images/browsers/DI.gif diff --git a/plugins/UserSettings/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif Binary files differindex f5053e9e0e..f5053e9e0e 100644 --- a/plugins/UserSettings/images/browsers/EL.gif +++ b/plugins/DevicesDetection/images/browsers/EL.gif diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif Binary files differindex 9759cd60ad..9759cd60ad 100644 --- a/plugins/UserSettings/images/browsers/EP.gif +++ b/plugins/DevicesDetection/images/browsers/EP.gif diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif Binary files differindex fad9cac483..fad9cac483 100644 --- a/plugins/UserSettings/images/browsers/ES.gif +++ b/plugins/DevicesDetection/images/browsers/ES.gif diff --git a/plugins/UserSettings/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif Binary files differindex e965479d41..e965479d41 100644 --- a/plugins/UserSettings/images/browsers/FB.gif +++ b/plugins/DevicesDetection/images/browsers/FB.gif diff --git a/plugins/UserSettings/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif Binary files differindex 2265625c6e..2265625c6e 100644 --- a/plugins/UserSettings/images/browsers/FD.gif +++ b/plugins/DevicesDetection/images/browsers/FD.gif diff --git a/plugins/UserSettings/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif Binary files differindex 0613d71812..0613d71812 100644 --- a/plugins/UserSettings/images/browsers/FE.gif +++ b/plugins/DevicesDetection/images/browsers/FE.gif diff --git a/plugins/UserSettings/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif Binary files differindex eb024c408a..eb024c408a 100644 --- a/plugins/UserSettings/images/browsers/FF.gif +++ b/plugins/DevicesDetection/images/browsers/FF.gif diff --git a/plugins/UserSettings/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif Binary files differindex ed58dab179..ed58dab179 100644 --- a/plugins/UserSettings/images/browsers/FL.gif +++ b/plugins/DevicesDetection/images/browsers/FL.gif diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif Binary files differindex 183dced4d7..183dced4d7 100644 --- a/plugins/UserSettings/images/browsers/FN.gif +++ b/plugins/DevicesDetection/images/browsers/FN.gif diff --git a/plugins/UserSettings/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif Binary files differindex 71605dfaeb..71605dfaeb 100644 --- a/plugins/UserSettings/images/browsers/GA.gif +++ b/plugins/DevicesDetection/images/browsers/GA.gif diff --git a/plugins/UserSettings/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif Binary files differindex 53e8f45f93..53e8f45f93 100644 --- a/plugins/UserSettings/images/browsers/GE.gif +++ b/plugins/DevicesDetection/images/browsers/GE.gif diff --git a/plugins/UserSettings/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif Binary files differindex 3eb4ac609b..3eb4ac609b 100644 --- a/plugins/UserSettings/images/browsers/HA.gif +++ b/plugins/DevicesDetection/images/browsers/HA.gif diff --git a/plugins/UserSettings/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif Binary files differindex f599043733..f599043733 100644 --- a/plugins/UserSettings/images/browsers/HJ.gif +++ b/plugins/DevicesDetection/images/browsers/HJ.gif diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif Binary files differindex 83aad8b1c6..83aad8b1c6 100644 --- a/plugins/UserSettings/images/browsers/IA.gif +++ b/plugins/DevicesDetection/images/browsers/IA.gif diff --git a/plugins/UserSettings/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif Binary files differindex ed3f7f7e07..ed3f7f7e07 100644 --- a/plugins/UserSettings/images/browsers/IB.gif +++ b/plugins/DevicesDetection/images/browsers/IB.gif diff --git a/plugins/UserSettings/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif Binary files differindex e3e1b69753..e3e1b69753 100644 --- a/plugins/UserSettings/images/browsers/IC.gif +++ b/plugins/DevicesDetection/images/browsers/IC.gif diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif Binary files differindex b6e614da48..b6e614da48 100644 --- a/plugins/UserSettings/images/browsers/ID.gif +++ b/plugins/DevicesDetection/images/browsers/ID.gif diff --git a/plugins/UserSettings/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif Binary files differindex 26f2f8fe30..26f2f8fe30 100644 --- a/plugins/UserSettings/images/browsers/IE.gif +++ b/plugins/DevicesDetection/images/browsers/IE.gif diff --git a/plugins/UserSettings/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif Binary files differindex 26f2f8fe30..26f2f8fe30 100644 --- a/plugins/UserSettings/images/browsers/IM.gif +++ b/plugins/DevicesDetection/images/browsers/IM.gif diff --git a/plugins/UserSettings/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif Binary files differindex fd58198194..fd58198194 100644 --- a/plugins/UserSettings/images/browsers/IR.gif +++ b/plugins/DevicesDetection/images/browsers/IR.gif diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif Binary files differindex ef1b5c0711..ef1b5c0711 100644 --- a/plugins/UserSettings/images/browsers/IW.gif +++ b/plugins/DevicesDetection/images/browsers/IW.gif diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif Binary files differindex 3be12eac66..3be12eac66 100644 --- a/plugins/UserSettings/images/browsers/KI.gif +++ b/plugins/DevicesDetection/images/browsers/KI.gif diff --git a/plugins/UserSettings/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif Binary files differindex 100e5cbbf5..100e5cbbf5 100644 --- a/plugins/UserSettings/images/browsers/KM.gif +++ b/plugins/DevicesDetection/images/browsers/KM.gif diff --git a/plugins/UserSettings/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif Binary files differindex 359fd78ec4..359fd78ec4 100644 --- a/plugins/UserSettings/images/browsers/KO.gif +++ b/plugins/DevicesDetection/images/browsers/KO.gif diff --git a/plugins/UserSettings/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif Binary files differindex 6d54c7f116..6d54c7f116 100644 --- a/plugins/UserSettings/images/browsers/KP.gif +++ b/plugins/DevicesDetection/images/browsers/KP.gif diff --git a/plugins/UserSettings/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif Binary files differindex 76ea10e03f..76ea10e03f 100644 --- a/plugins/UserSettings/images/browsers/KZ.gif +++ b/plugins/DevicesDetection/images/browsers/KZ.gif diff --git a/plugins/UserSettings/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif Binary files differindex 10379bdd5d..10379bdd5d 100644 --- a/plugins/UserSettings/images/browsers/LB.gif +++ b/plugins/DevicesDetection/images/browsers/LB.gif diff --git a/plugins/UserSettings/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif Binary files differindex ed8e5c0c22..ed8e5c0c22 100644 --- a/plugins/UserSettings/images/browsers/LG.gif +++ b/plugins/DevicesDetection/images/browsers/LG.gif diff --git a/plugins/UserSettings/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif Binary files differindex 0dc31911be..0dc31911be 100644 --- a/plugins/UserSettings/images/browsers/LI.gif +++ b/plugins/DevicesDetection/images/browsers/LI.gif diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif Binary files differindex c5f58ad4f0..c5f58ad4f0 100644 --- a/plugins/UserSettings/images/browsers/LS.gif +++ b/plugins/DevicesDetection/images/browsers/LS.gif diff --git a/plugins/UserSettings/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif Binary files differindex 0dc31911be..0dc31911be 100644 --- a/plugins/UserSettings/images/browsers/LX.gif +++ b/plugins/DevicesDetection/images/browsers/LX.gif diff --git a/plugins/UserSettings/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif Binary files differindex a359a22416..a359a22416 100644 --- a/plugins/UserSettings/images/browsers/MC.gif +++ b/plugins/DevicesDetection/images/browsers/MC.gif diff --git a/plugins/UserSettings/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif Binary files differindex 4d0eef37a7..4d0eef37a7 100644 --- a/plugins/UserSettings/images/browsers/MF.gif +++ b/plugins/DevicesDetection/images/browsers/MF.gif diff --git a/plugins/UserSettings/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif Binary files differindex ab797816ab..ab797816ab 100644 --- a/plugins/UserSettings/images/browsers/MI.gif +++ b/plugins/DevicesDetection/images/browsers/MI.gif diff --git a/plugins/UserSettings/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif Binary files differindex 21fad4d28c..21fad4d28c 100644 --- a/plugins/UserSettings/images/browsers/MO.gif +++ b/plugins/DevicesDetection/images/browsers/MO.gif diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif Binary files differindex cb42ed6892..cb42ed6892 100644 --- a/plugins/UserSettings/images/browsers/MS.gif +++ b/plugins/DevicesDetection/images/browsers/MS.gif diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif Binary files differindex b775666fa7..b775666fa7 100644 --- a/plugins/UserSettings/images/browsers/MX.gif +++ b/plugins/DevicesDetection/images/browsers/MX.gif diff --git a/plugins/UserSettings/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif Binary files differindex 3d87e9f4bc..3d87e9f4bc 100644 --- a/plugins/UserSettings/images/browsers/NB.gif +++ b/plugins/DevicesDetection/images/browsers/NB.gif diff --git a/plugins/UserSettings/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif Binary files differindex 8ad4aff666..8ad4aff666 100644 --- a/plugins/UserSettings/images/browsers/NF.gif +++ b/plugins/DevicesDetection/images/browsers/NF.gif diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif Binary files differindex a319b89783..a319b89783 100644 --- a/plugins/UserSettings/images/browsers/NL.gif +++ b/plugins/DevicesDetection/images/browsers/NL.gif diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif Binary files differindex c18d4d31f5..c18d4d31f5 100644 --- a/plugins/UserSettings/images/browsers/NP.gif +++ b/plugins/DevicesDetection/images/browsers/NP.gif diff --git a/plugins/UserSettings/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif Binary files differindex 5c57cdb283..5c57cdb283 100644 --- a/plugins/UserSettings/images/browsers/NS.gif +++ b/plugins/DevicesDetection/images/browsers/NS.gif diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif Binary files differindex a9c1a6f413..a9c1a6f413 100644 --- a/plugins/UserSettings/images/browsers/OB.gif +++ b/plugins/DevicesDetection/images/browsers/OB.gif diff --git a/plugins/UserSettings/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif Binary files differindex 1f5cb3ee3d..1f5cb3ee3d 100644 --- a/plugins/UserSettings/images/browsers/OI.gif +++ b/plugins/DevicesDetection/images/browsers/OI.gif diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif Binary files differindex 55e2dedb3c..55e2dedb3c 100644 --- a/plugins/UserSettings/images/browsers/ON.gif +++ b/plugins/DevicesDetection/images/browsers/ON.gif diff --git a/plugins/UserSettings/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif Binary files differindex ec422377da..ec422377da 100644 --- a/plugins/UserSettings/images/browsers/OP.gif +++ b/plugins/DevicesDetection/images/browsers/OP.gif diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif Binary files differindex 5b18e64798..5b18e64798 100644 --- a/plugins/UserSettings/images/browsers/OR.gif +++ b/plugins/DevicesDetection/images/browsers/OR.gif diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif Binary files differindex e40a9bc71f..e40a9bc71f 100644 --- a/plugins/UserSettings/images/browsers/OV.gif +++ b/plugins/DevicesDetection/images/browsers/OV.gif diff --git a/plugins/UserSettings/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif Binary files differindex 44067148ab..44067148ab 100644 --- a/plugins/UserSettings/images/browsers/OW.gif +++ b/plugins/DevicesDetection/images/browsers/OW.gif diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif Binary files differindex f8b83f26ad..f8b83f26ad 100644 --- a/plugins/UserSettings/images/browsers/PL.gif +++ b/plugins/DevicesDetection/images/browsers/PL.gif diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif Binary files differindex 69ed94dbaf..69ed94dbaf 100644 --- a/plugins/UserSettings/images/browsers/PM.gif +++ b/plugins/DevicesDetection/images/browsers/PM.gif diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif Binary files differindex 0747f55675..0747f55675 100644 --- a/plugins/UserSettings/images/browsers/PO.gif +++ b/plugins/DevicesDetection/images/browsers/PO.gif diff --git a/plugins/UserSettings/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif Binary files differindex 6319ae15cc..6319ae15cc 100644 --- a/plugins/UserSettings/images/browsers/PU.gif +++ b/plugins/DevicesDetection/images/browsers/PU.gif diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif Binary files differindex 3aae87d27c..3aae87d27c 100644 --- a/plugins/UserSettings/images/browsers/PW.gif +++ b/plugins/DevicesDetection/images/browsers/PW.gif diff --git a/plugins/UserSettings/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif Binary files differindex 386d46e122..386d46e122 100644 --- a/plugins/UserSettings/images/browsers/PX.gif +++ b/plugins/DevicesDetection/images/browsers/PX.gif diff --git a/plugins/UserSettings/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif Binary files differindex 72ee74a38d..72ee74a38d 100644 --- a/plugins/UserSettings/images/browsers/RK.gif +++ b/plugins/DevicesDetection/images/browsers/RK.gif diff --git a/plugins/UserSettings/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif Binary files differindex fb4c89c348..fb4c89c348 100644 --- a/plugins/UserSettings/images/browsers/SA.gif +++ b/plugins/DevicesDetection/images/browsers/SA.gif diff --git a/plugins/UserSettings/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif Binary files differindex 8603442161..8603442161 100644 --- a/plugins/UserSettings/images/browsers/SE.gif +++ b/plugins/DevicesDetection/images/browsers/SE.gif diff --git a/plugins/UserSettings/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif Binary files differindex 4d0eef37a7..4d0eef37a7 100644 --- a/plugins/UserSettings/images/browsers/SF.gif +++ b/plugins/DevicesDetection/images/browsers/SF.gif diff --git a/plugins/UserSettings/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif Binary files differindex 734c53cc43..734c53cc43 100644 --- a/plugins/UserSettings/images/browsers/SH.gif +++ b/plugins/DevicesDetection/images/browsers/SH.gif diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif Binary files differindex 890dd6d070..890dd6d070 100644 --- a/plugins/UserSettings/images/browsers/SL.gif +++ b/plugins/DevicesDetection/images/browsers/SL.gif diff --git a/plugins/UserSettings/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif Binary files differindex 83aad8b1c6..83aad8b1c6 100644 --- a/plugins/UserSettings/images/browsers/SM.gif +++ b/plugins/DevicesDetection/images/browsers/SM.gif diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif Binary files differindex 9c67b76c85..9c67b76c85 100644 --- a/plugins/UserSettings/images/browsers/TB.gif +++ b/plugins/DevicesDetection/images/browsers/TB.gif diff --git a/plugins/UserSettings/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif Binary files differindex 220c1126e3..220c1126e3 100644 --- a/plugins/UserSettings/images/browsers/TI.gif +++ b/plugins/DevicesDetection/images/browsers/TI.gif diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif Binary files differindex ce4524f4f0..ce4524f4f0 100644 --- a/plugins/UserSettings/images/browsers/TZ.gif +++ b/plugins/DevicesDetection/images/browsers/TZ.gif diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif Binary files differindex a2129a88fe..a2129a88fe 100644 --- a/plugins/UserSettings/images/browsers/UC.gif +++ b/plugins/DevicesDetection/images/browsers/UC.gif diff --git a/plugins/UserSettings/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/browsers/UN.gif +++ b/plugins/DevicesDetection/images/browsers/UN.gif diff --git a/plugins/UserSettings/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/browsers/UNK.gif +++ b/plugins/DevicesDetection/images/browsers/UNK.gif diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif Binary files differindex 3f2df63482..3f2df63482 100644 --- a/plugins/UserSettings/images/browsers/WE.gif +++ b/plugins/DevicesDetection/images/browsers/WE.gif diff --git a/plugins/UserSettings/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif Binary files differindex 6638abccb4..6638abccb4 100644 --- a/plugins/UserSettings/images/browsers/WO.gif +++ b/plugins/DevicesDetection/images/browsers/WO.gif diff --git a/plugins/UserSettings/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif Binary files differindex 92d9d20f75..92d9d20f75 100644 --- a/plugins/UserSettings/images/browsers/WP.gif +++ b/plugins/DevicesDetection/images/browsers/WP.gif diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif Binary files differindex 106121224d..106121224d 100644 --- a/plugins/UserSettings/images/browsers/YA.gif +++ b/plugins/DevicesDetection/images/browsers/YA.gif diff --git a/plugins/UserSettings/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif Binary files differindex 39e72e68f5..39e72e68f5 100644 --- a/plugins/UserSettings/images/os/3DS.gif +++ b/plugins/DevicesDetection/images/os/3DS.gif diff --git a/plugins/UserSettings/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif Binary files differindex 1b8d966190..1b8d966190 100644 --- a/plugins/UserSettings/images/os/AIX.gif +++ b/plugins/DevicesDetection/images/os/AIX.gif diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif Binary files differindex 1b9e8a6397..1b9e8a6397 100644 --- a/plugins/UserSettings/images/os/AMG.gif +++ b/plugins/DevicesDetection/images/os/AMG.gif diff --git a/plugins/UserSettings/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif Binary files differindex 00242b215c..00242b215c 100644 --- a/plugins/UserSettings/images/os/AMI.gif +++ b/plugins/DevicesDetection/images/os/AMI.gif diff --git a/plugins/UserSettings/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif Binary files differindex bf0ade5551..bf0ade5551 100644 --- a/plugins/UserSettings/images/os/AND.gif +++ b/plugins/DevicesDetection/images/os/AND.gif diff --git a/plugins/UserSettings/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif Binary files differindex ac92b2de6b..ac92b2de6b 100644 --- a/plugins/UserSettings/images/os/ARL.gif +++ b/plugins/DevicesDetection/images/os/ARL.gif diff --git a/plugins/UserSettings/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif Binary files differindex 295e37eafa..295e37eafa 100644 --- a/plugins/UserSettings/images/os/BBX.gif +++ b/plugins/DevicesDetection/images/os/BBX.gif diff --git a/plugins/UserSettings/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif Binary files differindex e22c9437ed..e22c9437ed 100644 --- a/plugins/UserSettings/images/os/BEO.gif +++ b/plugins/DevicesDetection/images/os/BEO.gif diff --git a/plugins/UserSettings/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif Binary files differindex e8316ef586..e8316ef586 100644 --- a/plugins/UserSettings/images/os/BLB.gif +++ b/plugins/DevicesDetection/images/os/BLB.gif diff --git a/plugins/UserSettings/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif Binary files differindex daeeb84007..daeeb84007 100644 --- a/plugins/UserSettings/images/os/BSD.gif +++ b/plugins/DevicesDetection/images/os/BSD.gif diff --git a/plugins/UserSettings/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif Binary files differindex bdba9fad3f..bdba9fad3f 100644 --- a/plugins/UserSettings/images/os/BTR.gif +++ b/plugins/DevicesDetection/images/os/BTR.gif diff --git a/plugins/UserSettings/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif Binary files differindex 028958c94a..028958c94a 100644 --- a/plugins/UserSettings/images/os/CES.gif +++ b/plugins/DevicesDetection/images/os/CES.gif diff --git a/plugins/UserSettings/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/os/COS.gif +++ b/plugins/DevicesDetection/images/os/COS.gif diff --git a/plugins/UserSettings/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif Binary files differindex b869c133f4..b869c133f4 100644 --- a/plugins/UserSettings/images/os/DFB.gif +++ b/plugins/DevicesDetection/images/os/DFB.gif diff --git a/plugins/UserSettings/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif Binary files differindex c4030a8f77..c4030a8f77 100644 --- a/plugins/UserSettings/images/os/DSI.gif +++ b/plugins/DevicesDetection/images/os/DSI.gif diff --git a/plugins/UserSettings/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif Binary files differindex 2e49af9d7c..2e49af9d7c 100644 --- a/plugins/UserSettings/images/os/FED.gif +++ b/plugins/DevicesDetection/images/os/FED.gif diff --git a/plugins/UserSettings/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif Binary files differindex eb024c408a..eb024c408a 100644 --- a/plugins/UserSettings/images/os/FOS.gif +++ b/plugins/DevicesDetection/images/os/FOS.gif diff --git a/plugins/UserSettings/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif Binary files differindex 47558caf9a..47558caf9a 100644 --- a/plugins/UserSettings/images/os/GNT.gif +++ b/plugins/DevicesDetection/images/os/GNT.gif diff --git a/plugins/UserSettings/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif Binary files differindex bdc4aefd88..bdc4aefd88 100644 --- a/plugins/UserSettings/images/os/GTV.gif +++ b/plugins/DevicesDetection/images/os/GTV.gif diff --git a/plugins/UserSettings/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif Binary files differindex 96ee1c01c3..96ee1c01c3 100644 --- a/plugins/UserSettings/images/os/HPX.gif +++ b/plugins/DevicesDetection/images/os/HPX.gif diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif Binary files differindex 17ef80cd53..17ef80cd53 100644 --- a/plugins/UserSettings/images/os/IOS.gif +++ b/plugins/DevicesDetection/images/os/IOS.gif diff --git a/plugins/UserSettings/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif Binary files differindex 24a37f246c..24a37f246c 100644 --- a/plugins/UserSettings/images/os/IPA.gif +++ b/plugins/DevicesDetection/images/os/IPA.gif diff --git a/plugins/UserSettings/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif Binary files differindex 117b6d2867..117b6d2867 100644 --- a/plugins/UserSettings/images/os/IPD.gif +++ b/plugins/DevicesDetection/images/os/IPD.gif diff --git a/plugins/UserSettings/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif Binary files differindex 71ff7d7592..71ff7d7592 100644 --- a/plugins/UserSettings/images/os/IPH.gif +++ b/plugins/DevicesDetection/images/os/IPH.gif diff --git a/plugins/UserSettings/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif Binary files differindex 796d547e52..796d547e52 100644 --- a/plugins/UserSettings/images/os/IRI.gif +++ b/plugins/DevicesDetection/images/os/IRI.gif diff --git a/plugins/UserSettings/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif Binary files differindex 28ba33292f..28ba33292f 100644 --- a/plugins/UserSettings/images/os/KBT.gif +++ b/plugins/DevicesDetection/images/os/KBT.gif diff --git a/plugins/UserSettings/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif Binary files differindex 3433a71a5f..3433a71a5f 100644 --- a/plugins/UserSettings/images/os/KNO.gif +++ b/plugins/DevicesDetection/images/os/KNO.gif diff --git a/plugins/UserSettings/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif Binary files differindex 47fad1402a..47fad1402a 100644 --- a/plugins/UserSettings/images/os/LBT.gif +++ b/plugins/DevicesDetection/images/os/LBT.gif diff --git a/plugins/UserSettings/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif Binary files differindex c76dfce8ff..c76dfce8ff 100644 --- a/plugins/UserSettings/images/os/LIN.gif +++ b/plugins/DevicesDetection/images/os/LIN.gif diff --git a/plugins/UserSettings/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif Binary files differindex 1ef41d5c75..1ef41d5c75 100644 --- a/plugins/UserSettings/images/os/MAC.gif +++ b/plugins/DevicesDetection/images/os/MAC.gif diff --git a/plugins/UserSettings/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif Binary files differindex 8573a0dc25..8573a0dc25 100755 --- a/plugins/UserSettings/images/os/MAE.gif +++ b/plugins/DevicesDetection/images/os/MAE.gif diff --git a/plugins/UserSettings/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif Binary files differindex b4d8d5e348..b4d8d5e348 100644 --- a/plugins/UserSettings/images/os/MDR.gif +++ b/plugins/DevicesDetection/images/os/MDR.gif diff --git a/plugins/UserSettings/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif Binary files differindex 71ce560b25..71ce560b25 100644 --- a/plugins/UserSettings/images/os/MIN.gif +++ b/plugins/DevicesDetection/images/os/MIN.gif diff --git a/plugins/UserSettings/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif Binary files differindex d282ad1a44..d282ad1a44 100644 --- a/plugins/UserSettings/images/os/NBS.gif +++ b/plugins/DevicesDetection/images/os/NBS.gif diff --git a/plugins/UserSettings/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif Binary files differindex bca132aad7..bca132aad7 100644 --- a/plugins/UserSettings/images/os/NDS.gif +++ b/plugins/DevicesDetection/images/os/NDS.gif diff --git a/plugins/UserSettings/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif Binary files differindex 993c8a4ebe..993c8a4ebe 100644 --- a/plugins/UserSettings/images/os/OBS.gif +++ b/plugins/DevicesDetection/images/os/OBS.gif diff --git a/plugins/UserSettings/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif Binary files differindex ae96a6972c..ae96a6972c 100644 --- a/plugins/UserSettings/images/os/OS2.gif +++ b/plugins/DevicesDetection/images/os/OS2.gif diff --git a/plugins/UserSettings/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif Binary files differindex f03e0d15f4..f03e0d15f4 100644 --- a/plugins/UserSettings/images/os/POS.gif +++ b/plugins/DevicesDetection/images/os/POS.gif diff --git a/plugins/UserSettings/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif Binary files differindex 20e8ef3291..20e8ef3291 100644 --- a/plugins/UserSettings/images/os/PPY.gif +++ b/plugins/DevicesDetection/images/os/PPY.gif diff --git a/plugins/UserSettings/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif Binary files differindex f087c11cb8..f087c11cb8 100644 --- a/plugins/UserSettings/images/os/PS3.gif +++ b/plugins/DevicesDetection/images/os/PS3.gif diff --git a/plugins/UserSettings/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif Binary files differindex b6003b6498..b6003b6498 100644 --- a/plugins/UserSettings/images/os/PSP.gif +++ b/plugins/DevicesDetection/images/os/PSP.gif diff --git a/plugins/UserSettings/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif Binary files differindex 65b4c23871..65b4c23871 100644 --- a/plugins/UserSettings/images/os/PSV.gif +++ b/plugins/DevicesDetection/images/os/PSV.gif diff --git a/plugins/UserSettings/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif Binary files differindex 9a2a70f5c3..9a2a70f5c3 100644 --- a/plugins/UserSettings/images/os/QNX.gif +++ b/plugins/DevicesDetection/images/os/QNX.gif diff --git a/plugins/UserSettings/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif Binary files differindex 043947cecb..043947cecb 100644 --- a/plugins/UserSettings/images/os/RHT.gif +++ b/plugins/DevicesDetection/images/os/RHT.gif diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif Binary files differindex a445b66182..a445b66182 100644 --- a/plugins/UserSettings/images/os/ROS.gif +++ b/plugins/DevicesDetection/images/os/ROS.gif diff --git a/plugins/UserSettings/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif Binary files differindex e5fe8a8f45..e5fe8a8f45 100644 --- a/plugins/UserSettings/images/os/SAF.gif +++ b/plugins/DevicesDetection/images/os/SAF.gif diff --git a/plugins/UserSettings/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif Binary files differindex 079ccc21d8..079ccc21d8 100644 --- a/plugins/UserSettings/images/os/SBA.gif +++ b/plugins/DevicesDetection/images/os/SBA.gif diff --git a/plugins/UserSettings/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif Binary files differindex cf6f2be297..cf6f2be297 100644 --- a/plugins/UserSettings/images/os/SLW.gif +++ b/plugins/DevicesDetection/images/os/SLW.gif diff --git a/plugins/UserSettings/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif Binary files differindex 34fc3248e4..34fc3248e4 100644 --- a/plugins/UserSettings/images/os/SOS.gif +++ b/plugins/DevicesDetection/images/os/SOS.gif diff --git a/plugins/UserSettings/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif Binary files differindex 3253aa2a75..3253aa2a75 100644 --- a/plugins/UserSettings/images/os/SSE.gif +++ b/plugins/DevicesDetection/images/os/SSE.gif diff --git a/plugins/UserSettings/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif Binary files differindex 27bd023afc..27bd023afc 100644 --- a/plugins/UserSettings/images/os/SYL.gif +++ b/plugins/DevicesDetection/images/os/SYL.gif diff --git a/plugins/UserSettings/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif Binary files differindex cd174dba19..cd174dba19 100644 --- a/plugins/UserSettings/images/os/SYM.gif +++ b/plugins/DevicesDetection/images/os/SYM.gif diff --git a/plugins/UserSettings/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif Binary files differindex 50b64ba9ec..50b64ba9ec 100644 --- a/plugins/UserSettings/images/os/T64.gif +++ b/plugins/DevicesDetection/images/os/T64.gif diff --git a/plugins/UserSettings/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif Binary files differindex 7563a5e31d..7563a5e31d 100644 --- a/plugins/UserSettings/images/os/TIZ.gif +++ b/plugins/DevicesDetection/images/os/TIZ.gif diff --git a/plugins/UserSettings/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif Binary files differindex c4789e0456..c4789e0456 100644 --- a/plugins/UserSettings/images/os/UBT.gif +++ b/plugins/DevicesDetection/images/os/UBT.gif diff --git a/plugins/UserSettings/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/os/UNK.gif +++ b/plugins/DevicesDetection/images/os/UNK.gif diff --git a/plugins/UserSettings/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif Binary files differindex 000d08a36f..000d08a36f 100644 --- a/plugins/UserSettings/images/os/VMS.gif +++ b/plugins/DevicesDetection/images/os/VMS.gif diff --git a/plugins/UserSettings/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/W10.gif +++ b/plugins/DevicesDetection/images/os/W10.gif diff --git a/plugins/UserSettings/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W2K.gif +++ b/plugins/DevicesDetection/images/os/W2K.gif diff --git a/plugins/UserSettings/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif Binary files differindex 773c4d48d1..773c4d48d1 100644 --- a/plugins/UserSettings/images/os/W61.gif +++ b/plugins/DevicesDetection/images/os/W61.gif diff --git a/plugins/UserSettings/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif Binary files differindex 773c4d48d1..773c4d48d1 100644 --- a/plugins/UserSettings/images/os/W65.gif +++ b/plugins/DevicesDetection/images/os/W65.gif diff --git a/plugins/UserSettings/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100644 --- a/plugins/UserSettings/images/os/W75.gif +++ b/plugins/DevicesDetection/images/os/W75.gif diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/W81.gif +++ b/plugins/DevicesDetection/images/os/W81.gif diff --git a/plugins/UserSettings/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W95.gif +++ b/plugins/DevicesDetection/images/os/W95.gif diff --git a/plugins/UserSettings/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W98.gif +++ b/plugins/DevicesDetection/images/os/W98.gif diff --git a/plugins/UserSettings/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/WCE.gif +++ b/plugins/DevicesDetection/images/os/WCE.gif diff --git a/plugins/UserSettings/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WI7.gif +++ b/plugins/DevicesDetection/images/os/WI7.gif diff --git a/plugins/UserSettings/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/WI8.gif +++ b/plugins/DevicesDetection/images/os/WI8.gif diff --git a/plugins/UserSettings/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif Binary files differindex 7957a9106a..7957a9106a 100644 --- a/plugins/UserSettings/images/os/WII.gif +++ b/plugins/DevicesDetection/images/os/WII.gif diff --git a/plugins/UserSettings/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WIN.gif +++ b/plugins/DevicesDetection/images/os/WIN.gif diff --git a/plugins/UserSettings/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif Binary files differindex 6d7e64e162..6d7e64e162 100644 --- a/plugins/UserSettings/images/os/WIU.gif +++ b/plugins/DevicesDetection/images/os/WIU.gif diff --git a/plugins/UserSettings/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif Binary files differindex 1ba0336426..1ba0336426 100644 --- a/plugins/UserSettings/images/os/WME.gif +++ b/plugins/DevicesDetection/images/os/WME.gif diff --git a/plugins/UserSettings/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif Binary files differindex 773c4d48d1..773c4d48d1 100755 --- a/plugins/UserSettings/images/os/WMO.gif +++ b/plugins/DevicesDetection/images/os/WMO.gif diff --git a/plugins/UserSettings/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/WNT.gif +++ b/plugins/DevicesDetection/images/os/WNT.gif diff --git a/plugins/UserSettings/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif Binary files differindex 2717d08226..2717d08226 100644 --- a/plugins/UserSettings/images/os/WOS.gif +++ b/plugins/DevicesDetection/images/os/WOS.gif diff --git a/plugins/UserSettings/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100644 --- a/plugins/UserSettings/images/os/WP7.gif +++ b/plugins/DevicesDetection/images/os/WP7.gif diff --git a/plugins/UserSettings/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100755 --- a/plugins/UserSettings/images/os/WPH.gif +++ b/plugins/DevicesDetection/images/os/WPH.gif diff --git a/plugins/UserSettings/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/WRT.gif +++ b/plugins/DevicesDetection/images/os/WRT.gif diff --git a/plugins/UserSettings/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WS3.gif +++ b/plugins/DevicesDetection/images/os/WS3.gif diff --git a/plugins/UserSettings/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WVI.gif +++ b/plugins/DevicesDetection/images/os/WVI.gif diff --git a/plugins/UserSettings/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WXP.gif +++ b/plugins/DevicesDetection/images/os/WXP.gif diff --git a/plugins/UserSettings/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif Binary files differindex a80d2291cc..a80d2291cc 100644 --- a/plugins/UserSettings/images/os/XBT.gif +++ b/plugins/DevicesDetection/images/os/XBT.gif diff --git a/plugins/UserSettings/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif Binary files differindex a9d567660e..a9d567660e 100644 --- a/plugins/UserSettings/images/os/XBX.gif +++ b/plugins/DevicesDetection/images/os/XBX.gif diff --git a/plugins/UserSettings/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif Binary files differindex 15f4c78e8f..15f4c78e8f 100644 --- a/plugins/UserSettings/images/os/YNS.gif +++ b/plugins/DevicesDetection/images/os/YNS.gif diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index a0a0d99716..535fd2a1ce 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 7b9f6a4d9d..ce7af8e36d 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 77f1c8f2bb..a515b0dff6 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 7488b83302..2815ed4a77 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 -Subproject 657d46244b3b8345250f474e49a6af84f918a3d +Subproject b64788b4b7a6286d8c3bc612fabc8e38c9391c2 diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php index a69fcc54bf..5e8c186af8 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 4413cd702f..ff2d5c2401 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 a5025b63c2..78605c9d94 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 fbd55219dc..7bdb0732a6 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 f4e688f60e..5303a1c360 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 0404a13247..21c5cd5bdc 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 53b143d693..42d05068d6 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 0000000000..8fc33efddb --- /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 0000000000..f44d744c53 --- /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 index 7577c06495..6929457495 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 index 35aaf4a23e..3f1e357279 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 0000000000..4b0e9a5a42 --- /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 index 67b00f8b7d..024efa844e 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 index 2c8012a8d1..fbb78eb878 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 0000000000..49b2d3a9a6 --- /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 0000000000..e21a2973d7 --- /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 0000000000..47fd330868 --- /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 0000000000..e71aaa907a --- /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 0000000000..db863d489e --- /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 0000000000..7d9bfebc01 --- /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 0000000000..d62451282c --- /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 0000000000..03e0d97f0b --- /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 0000000000..bda670af65 --- /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 0000000000..9173a432a8 --- /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 0000000000..cab3e10731 --- /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 0000000000..3581dd953d --- /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 0000000000..4eac9d0139 --- /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 0000000000..90491dccae --- /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 0000000000..dd606039e1 --- /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 0000000000..30eccef1b5 --- /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 0000000000..b1b820a1c2 --- /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 0000000000..cafca9deb7 --- /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 0000000000..70b35a17f6 --- /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 0000000000..fc933f2519 --- /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 0000000000..aaa796e7ca --- /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 0000000000..bd83655787 --- /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 0000000000..5918da9c01 --- /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 0000000000..a1b2c845ef --- /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 0000000000..1be3f7ca3e --- /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 0000000000..e224567379 --- /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 0000000000..d3b2411f15 --- /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 0000000000..d66edce256 --- /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 0000000000..08594ca73d --- /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 0000000000..4ef05cca97 --- /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 0000000000..d76113b7af --- /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 0000000000..34d0e7299f --- /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 0000000000..4183c8b7ce --- /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 0000000000..add66843bb --- /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 0000000000..d9724ada1a --- /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 0000000000..0524f04c04 --- /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 0000000000..00459e717b --- /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 0000000000..aed2a71000 --- /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 0000000000..1dd610e679 --- /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 0000000000..0ffc306ee5 --- /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 0000000000..8581b68f31 --- /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 0000000000..e956c53439 --- /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 0000000000..b2b1440a31 --- /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 0000000000..15b9a9c3ab --- /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 0000000000..56c82ccd4b --- /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 0000000000..232f7de8d3 --- /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 0000000000..ee4af78da4 --- /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 0000000000..dcdc1ca7d1 --- /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 0000000000..5d126ac0f6 --- /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 0000000000..91a8e73aa4 --- /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 0000000000..546bbaec47 --- /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 0000000000..600e5fe0ad --- /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 0000000000..ad8ae4895e --- /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 0000000000..6247b35720 --- /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 0aaef90049..e7b02512b3 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 1972feb6c8..c7faa74372 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 44a39fdcf5..7092fee8f8 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 1a80da3e9f..9f3649d3ba 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 740e5d4d94..a9b67a135c 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 a6154b5f29..8c64ede3da 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 8158470544..f72269dedf 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 33f3528487..e399cba3ac 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 eaab5557c7..c50e84146e 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 Binary files differdeleted file mode 100644 index a8cb8b2963..0000000000 --- a/plugins/UserSettings/images/screens/dual.gif +++ /dev/null diff --git a/plugins/UserSettings/images/screens/mobile.gif b/plugins/UserSettings/images/screens/mobile.gif Binary files differdeleted file mode 100644 index 814642933f..0000000000 --- a/plugins/UserSettings/images/screens/mobile.gif +++ /dev/null diff --git a/plugins/UserSettings/images/screens/normal.gif b/plugins/UserSettings/images/screens/normal.gif Binary files differdeleted file mode 100644 index afe97e9d9f..0000000000 --- a/plugins/UserSettings/images/screens/normal.gif +++ /dev/null diff --git a/plugins/UserSettings/images/screens/unknown.gif b/plugins/UserSettings/images/screens/unknown.gif Binary files differdeleted file mode 100644 index 2c44083422..0000000000 --- a/plugins/UserSettings/images/screens/unknown.gif +++ /dev/null diff --git a/plugins/UserSettings/images/screens/wide.gif b/plugins/UserSettings/images/screens/wide.gif Binary files differdeleted file mode 100644 index 1b09fc529b..0000000000 --- a/plugins/UserSettings/images/screens/wide.gif +++ /dev/null diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json index 2897ffa618..037b6c3249 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 cd0a0568c2..3613ab75df 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 7e0d6090ae..910b353116 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 857681dd6f..15b03d0a3f 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 9fedf7f751..ceb19d3255 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 50fc946965..4a78c685e1 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 a031640225..e15b757631 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 0b2cf46081..465ae682d5 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 9b7f7395f6..3fff7c6576 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 c692af975c..f5240dc9e2 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 5a9898f09c..5b068ba608 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 4905768aca..f88b9cef5d 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 902a023d2e..ad33730e08 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 eb38d32cb5..fac25a4b88 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 f6bb711136..938a7f5183 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 cb009e289c..82ac789d10 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 e461b383d8..e18820cb79 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 b6d08a31e7..5a31eaa865 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 d6963d29e5..e8b314eb2e 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 91cfd9bc1c..533587f029 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 2bdabbf3c4..d42c8f4cb3 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 990dbd67b1..cd7d7677e6 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 ff81439a86..a962d9452e 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 981f75a306..0100bd0797 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 7e409d6a05..7d1b353ac1 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 7dab7a6d23..66d3b0aa43 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 25a2077b83..e0ebf9c47b 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 321b8e4067..84ab811625 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 30db114188..15f82b1f93 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 3950648d83..9c25cc141e 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 1f90affe5a..481c3f259e 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 aa24a3f364..bbab7b45ce 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 69bc0e0122..c8dce6a4bc 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 079ad711b4..3a4ea45b6d 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 a5017d4a16..cadd238f27 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 e39b81caff..ce0a61ab5a 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 a55776ea0c..dc4738a5de 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 9874405ad0..74a87bb041 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 6a28d87223..9f6607afd2 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 3920246e68..d7dc1795b5 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 289c2da551..5fcf4549b4 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 558b7c7dfd..9cb34b693b 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 9a69fd70c9..f61fd26b87 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 ee090e2165..76d152d3d3 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 19b42e9bf8..e2166e7802 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 c675a5e022..0b47d7fc6c 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 10ae7b655e..d3aaf7c667 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 07ba3d51f7..01e6272fd5 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 d176b16886..09db56f729 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 6b9019f671..76e4bb9265 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 abf96de9e1..1ee1cf32a1 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 e72708a11d..830d22778c 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 3c73972a7a..5c3dcc553e 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 693b76e280..a2d6a6327a 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 3d0b1622d4..676c859b81 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 3a516d1c53..eb5fd28d78 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 44c6b7b0b9..b13317b68f 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 33678169ed..e01e2b9983 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 18b197a410..0d99d0816d 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 6140bf8214..c2ce8972b0 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 896b4d503f..d34efe28f8 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 8e3799fa9e..5f5b0e174d 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 a45e6b00b5..52df0964ab 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 a45e6b00b5..52df0964ab 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 77e2b64918..b979b765d8 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 2d81bb9f19..81d66a066b 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 8845a80655..6ae99318f0 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> @@ -611,10 +887,52 @@ </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 b7cbdc125b..cce26eeec7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -647,6 +647,90 @@ </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> <nb_hits>2</nb_hits> @@ -701,6 +785,150 @@ </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> <nb_hits>2</nb_hits> @@ -1000,6 +1228,45 @@ </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> 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 f1b90a5e1d..8789133564 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 867e27cd0d..401a36b835 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -22,6 +22,100 @@ <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> <nb_hits>2</nb_hits> @@ -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 28acca1242..f3ebc92964 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> @@ -770,10 +1047,42 @@ </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 7721a10da1..63c3d594e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -647,6 +647,87 @@ </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> <nb_hits>2</nb_hits> @@ -701,6 +782,150 @@ </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> <nb_hits>2</nb_hits> @@ -1157,6 +1382,35 @@ </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> 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 143229b5e7..7ecefada55 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 509723308f..690c2e28a0 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 c3f7304c25..c7ae80a454 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> @@ -624,10 +917,52 @@ </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> @@ -786,10 +1122,42 @@ </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 aaabfb8fc3..3434158d1f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -647,6 +647,103 @@ </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> <nb_hits>2</nb_hits> @@ -720,6 +817,150 @@ </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> <nb_hits>2</nb_hits> @@ -1065,6 +1306,45 @@ </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> @@ -1231,6 +1511,35 @@ </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> 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 c8388c1f4d..18b7f289f6 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 a87ec05ee3..0fc359540d 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 6f8a9a4c98..491523012e 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 38d80d2b64..34fadbbd57 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 bb6679c971..147f52ac7c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -13,16 +13,27 @@ </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> <nb_actions>2</nb_actions> 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 8723d1a05f..82fd2a7603 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 80d06470a3..90f330a5e5 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 8723d1a05f..82fd2a7603 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 b9bf650ebc..d0be913ad2 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 62d091d83d..cfa8579474 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 7cad47e0a1..636ccfdeb7 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 0a059a62d6..e838256d3f 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 1ba1449d50..8c1697b221 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 0a94d5f36d..970c5a295d 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 4c6855264a..35d78ccc17 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 93c0819d6c..ff63b6a32a 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> @@ -1789,6 +1789,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> <idVisit>26</idVisit> <visitIp>0.0.0.0</visitIp> @@ -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 eb2209a224..d2edd33b60 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 1fb93e2a2a..79b56ff979 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 8cc6494492..f83cd0a71c 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 80a6349ac1..9b5ba79691 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 0000000000..75d278b51b --- /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 0000000000..378996fabc --- /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 a14f0cec91..dc702824f1 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 23e244b751..212e81c785 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 ce5523efde..1c82333bf0 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 4067fb2618..1149b705a7 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 bb6679c971..147f52ac7c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -13,16 +13,27 @@ </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> <nb_actions>2</nb_actions> 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 80d06470a3..90f330a5e5 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 8723d1a05f..82fd2a7603 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 446d719865..75d278b51b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -34,6 +34,17 @@ <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> @@ -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> @@ -111,6 +122,17 @@ <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> 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 fc37ec8a8f..8d4b8d074e 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 1f8c578db7..3ed6ff7309 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 0a059a62d6..e838256d3f 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 62d091d83d..cfa8579474 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 7cad47e0a1..636ccfdeb7 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 d1f2bda02f..a96d5feb81 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 659d5beea1..378996fabc 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 3633fe5914..02a0dc7272 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 f301254690..c42125d072 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 1a729a8e26..4de7a18047 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 427319a89f..dc841363a5 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 515e54eb3b..144d6c4221 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 c47de22fc4..005a1842ab 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 c7ed81d100..a66c195749 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 0830ca0d10..dcd45b3a61 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 d7672ae30c..768a0961d2 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 4e6a9ab29e..c00b8e2c50 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 11e27426c0..95adfb7f9a 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 a64c14a967..1f6410e079 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 a0cba6d294..c53cacde6f 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 3fb9469667..8af80c337f 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 4c77f1f6e6..40bd2e592a 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 0a9c671f55..e686bbc101 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 df25f1c1f3..9674a59b3a 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 40bd2e592a..3fb9469667 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 f5722c2b94..13002b2017 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 4c77f1f6e6..46af1425a3 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 40bd2e592a..51c650b8b2 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 327d564f47..1772684d5e 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 0fb183d46f..bce2027e1c 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 0879f6fb5b..0d6e1866ed 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 d252d03f5d..4af83361f6 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 2975b07bcb..18a864dbcd 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 759645d39d..bf87d09256 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 2975b07bcb..18a864dbcd 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 bd23daaa04..855cc09755 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 84860eba92..d2b191ec2f 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 6f656fdf68..019893396e 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 84860eba92..d2b191ec2f 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 379e429ee3..b749f9ebe4 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 4e417535ae..4429d16888 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 0000000000..1a63f1933a --- /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 0000000000..ede209680d --- /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 6f656fdf68..019893396e 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 84860eba92..d2b191ec2f 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 379e429ee3..b749f9ebe4 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 4e417535ae..4429d16888 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 968ffc7d90..da553644d5 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 b8deec1d68..955f9837f9 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 968ffc7d90..da553644d5 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 04cebec91e..4c8451e2d8 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 785661d383..d5c916aa6c 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 6649f123d9..664c8bf45f 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 b8deec1d68..955f9837f9 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 968ffc7d90..da553644d5 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 04cebec91e..4c8451e2d8 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 785661d383..d5c916aa6c 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 9b0149ac2a..4baa370d70 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 4eb429a763..3953a817fb 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 0ad33169a4..8adb115a5f 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> @@ -146,6 +146,46 @@ </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> <nb_visits>1</nb_visits> 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 c234bed59e..51ea81cd04 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 78c6610886..3e911d8174 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 68837cb7a6..ec4c9be19c 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 17d9192ba4..d37012289b 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 8ca1417d42..37aa7952b2 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 89c97c7ba3..b8846f762c 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 90ebe565a7..525999bee1 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 Binary files differindex 346c1542db..172e23b93d 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv 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 76d48bc7b6..6cdb55181c 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 5ff6e58fba..57a190c4a2 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 dd359fb284..34dfb95a22 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 cf266ddbcc..e4b7038652 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 0000000000..106f23f16b --- /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 0000000000..5cfb246edc --- /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 0000000000..106f23f16b --- /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 0000000000..5cfb246edc --- /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 0000000000..c234bed59e --- /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 0000000000..c234bed59e --- /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 index bef1e186ef..bef1e186ef 100644 --- 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 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 b48064a09c..d1d3cb310d 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 b48064a09c..d1d3cb310d 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 845a1a23a9..76c9807789 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 a968371537..4606699122 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 c58f00fa96..2925479cc4 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 a968371537..4606699122 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 c58f00fa96..2925479cc4 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 -Subproject 6a6bbbb4db5f8243f462b94b3e57bc68e736631 +Subproject 0165dcc57e66d0dfdeb2ff6bb2905e125fde722 diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php index f072011675..b9701a88cd 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 6e8eb733b8..0f0675114f 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 94d2d4c84b..753220542c 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 4c9cd46ab3..8ee9c439dd 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 e9d63f1d98..5c97588a3c 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 f1faa99b88..d77a3ca7ed 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 3c1d91a357..0deccd217f 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 64eab67a10..34ec2a2c9a 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 d82e8da441..b3b5710f91 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 659e76ac8f..179e3f11df 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 85691cab26..c6fd94e406 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 686f6a1be6..209a7a37a7 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 738439474c..754424182c 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 e3201dfbe6..de8128cfb9 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 1abfe94b06..e9b02a9bd1 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 53a072fa36..7033299df5 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 30320f32ce..b36dbd5146 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 2150dc32ba..25b9f46ee1 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 0000000000..d7ff476a6c --- /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 0000000000..17035db670 --- /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 |
