diff options
460 files changed, 5060 insertions, 2425 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c6720e9fc..06cd5f970c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API's, Plugins, Themes, etc will be listed here. +## Piwik 2.7.0 + +### Deprecations +* The `Piwik\Menu\MenuAbstract::add()` method is deprecated in favor of `addItem()`. Read more about this here: [#6140](https://github.com/piwik/piwik/issues/6140). We do not plan to remove the deprecated method before Piwik 3.0. + +### New APIs +* It is now easier to generate the URL for a menu item see [#6140](https://github.com/piwik/piwik/issues/6140), [urlForDefaultAction()](http://developer.piwik.org/api-reference/Piwik/Plugin/Menu#urlfordefaultaction), [urlForAction()](http://developer.piwik.org/api-reference/Piwik/Plugin/Menu#urlforaction), [urlForModuleAction()](http://developer.piwik.org/api-reference/Piwik/Plugin/Menu#urlformoduleaction) + +### New commands +* `core:clear-caches` Lets you easily delete all caches. This command can be useful for instance after updating Piwik files manually. + + ## Piwik 2.6.0 ### New features @@ -14,7 +26,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' * If an API returns an indexed array, it is now possible to use `filter_limit` and `filter_offset`. This was before only possible if an API returned a DataTable. * The Live API now returns only visitor information of activated plugins. So if for instance the Referrers plugin is deactivated a visitor won't contain any referrers related properties. This is a bugfix as the API was crashing before if some core plugins were deactivated. Affected methods are for instance `getLastVisitDetails` or `getVisitorProfile`. If all core plugins are enabled as by default there will be no change at all except the order of the properties within one visitor. -### New commmands +### New commands * `core:run-scheduled-tasks` Let's you run all scheduled tasks due to run at this time. Useful for instance when testing tasks. #### Internal change @@ -66,7 +78,7 @@ We are using `@since` annotations in case we are introducing new API's to make i * [MenuUser](http://developer.piwik.org/api-reference/Piwik/Menu/MenuUser) to add or modify user menu items * [Tasks](http://developer.piwik.org/api-reference/Piwik/Plugin/Tasks) to add scheduled tasks -### New commmands +### New commands * `generate:theme` Let's you easily generate a new theme and customize colors, see the [Theming guide](http://developer.piwik.org/guides/theming) * `generate:update` Let's you generate an update file * `generate:report` Let's you generate a report @@ -84,7 +96,7 @@ We are using `@since` annotations in case we are introducing new API's to make i ### Deprecations ### New features ### New APIs -### New commmands +### New commands ### New guides ### Internal change --> diff --git a/composer.lock b/composer.lock index 7a30ec861b..e126a39a7f 100644 --- a/composer.lock +++ b/composer.lock @@ -96,16 +96,16 @@ }, { "name": "piwik/device-detector", - "version": "2.3.1", + "version": "2.4", "source": { "type": "git", "url": "https://github.com/piwik/device-detector.git", - "reference": "9cd0338be126aaf947f20fd08a6381c0c658dca5" + "reference": "64d91375aea2340b81e2cb46745dc3b2213d3231" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/device-detector/zipball/9cd0338be126aaf947f20fd08a6381c0c658dca5", - "reference": "9cd0338be126aaf947f20fd08a6381c0c658dca5", + "url": "https://api.github.com/repos/piwik/device-detector/zipball/64d91375aea2340b81e2cb46745dc3b2213d3231", + "reference": "64d91375aea2340b81e2cb46745dc3b2213d3231", "shasum": "" }, "require": { @@ -139,21 +139,21 @@ "parser", "useragent" ], - "time": "2014-08-11 20:21:18" + "time": "2014-08-29 18:24:04" }, { "name": "symfony/console", - "version": "v2.5.3", + "version": "v2.5.4", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63" + "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/cd2d1e4bac2206b337326b0140ff475fe9ad5f63", - "reference": "cd2d1e4bac2206b337326b0140ff475fe9ad5f63", + "url": "https://api.github.com/repos/symfony/Console/zipball/748beed2a1e73179c3f5154d33fe6ae100c1aeb1", + "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1", "shasum": "" }, "require": { @@ -194,7 +194,7 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-08-05 09:00:40" + "time": "2014-08-14 16:10:54" }, { "name": "tedivm/jshrink", @@ -687,16 +687,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.2.4", + "version": "4.2.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f0c2d374ad06ec1e56c721f4ed87c59ff35f440e" + "reference": "c3abe5953d1e60a0bf23012b1bc8c4d07f4832d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f0c2d374ad06ec1e56c721f4ed87c59ff35f440e", - "reference": "f0c2d374ad06ec1e56c721f4ed87c59ff35f440e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c3abe5953d1e60a0bf23012b1bc8c4d07f4832d7", + "reference": "c3abe5953d1e60a0bf23012b1bc8c4d07f4832d7", "shasum": "" }, "require": { @@ -757,20 +757,20 @@ "testing", "xunit" ], - "time": "2014-08-31 06:46:49" + "time": "2014-09-06 18:38:27" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "42e589e08bc86e3e9bdf20d385e948347788505b" + "reference": "b241b18d87a47093f20fae8b0ba40379b00bd53a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/42e589e08bc86e3e9bdf20d385e948347788505b", - "reference": "42e589e08bc86e3e9bdf20d385e948347788505b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b241b18d87a47093f20fae8b0ba40379b00bd53a", + "reference": "b241b18d87a47093f20fae8b0ba40379b00bd53a", "shasum": "" }, "require": { @@ -779,7 +779,7 @@ "phpunit/php-text-template": "~1.2" }, "require-dev": { - "phpunit/phpunit": "4.2.*@dev" + "phpunit/phpunit": "~4.2" }, "suggest": { "ext-soap": "*" @@ -796,9 +796,6 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -815,7 +812,7 @@ "mock", "xunit" ], - "time": "2014-08-02 13:50:58" + "time": "2014-09-06 17:32:37" }, { "name": "sebastian/comparator", @@ -1086,17 +1083,17 @@ }, { "name": "symfony/yaml", - "version": "v2.5.3", + "version": "v2.5.4", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f" + "reference": "01a7695bcfb013d0a15c6757e15aae120342986f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", - "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/01a7695bcfb013d0a15c6757e15aae120342986f", + "reference": "01a7695bcfb013d0a15c6757e15aae120342986f", "shasum": "" }, "require": { @@ -1129,12 +1126,10 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-08-05 09:00:40" + "time": "2014-08-31 03:22:04" } ], - "aliases": [ - - ], + "aliases": [], "minimum-stability": "stable", "stability-flags": { "facebook/xhprof": 20 @@ -1143,7 +1138,5 @@ "platform": { "php": ">=5.3.2" }, - "platform-dev": [ - - ] + "platform-dev": [] } diff --git a/config/global.ini.php b/config/global.ini.php index 62552298cd..d72d5e6150 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -101,16 +101,21 @@ disable_merged_assets = 0 [General] -; the following settings control whether Unique Visitors will be processed for different period types. +; the following settings control whether Unique Visitors `nb_uniq_visitors` and Unique users `nb_users` will be processed for different period types. ; year and range periods are disabled by default, to ensure optimal performance for high traffic Piwik instances ; if you set it to 1 and want the Unique Visitors to be re-processed for reports in the past, drop all piwik_archive_* tables -; it is recommended to always enable Unique Visitors processing for 'day' periods +; it is recommended to always enable Unique Visitors and Unique Users processing for 'day' periods enable_processing_unique_visitors_day = 1 enable_processing_unique_visitors_week = 1 enable_processing_unique_visitors_month = 1 enable_processing_unique_visitors_year = 0 enable_processing_unique_visitors_range = 0 +; controls whether Unique Visitors will be processed for groups of websites. these metrics describe the number +; of unique visitors across the entire set of websites, so if a visitor visited two websites in the group, she +; would still only be counted as one. only relevant when using plugins that group sites together +enable_processing_unique_visitors_multiple_sites = 0 + ; The list of periods that are available in the Piwik calendar ; Example use case: custom date range requests are processed in real time, ; so they may take a few minutes on very high traffic website: you may remove "range" below to disable this period @@ -172,6 +177,11 @@ enable_segment_suggested_values = 1 ; Possible values are "view", "admin", "superuser" adding_segment_requires_access = "view" +; Whether it is allowed for users to add segments that affect all websites or not. If there are many websites +; this admin option can be used to prevent users from performing an action that will have a major impact +; on Piwik performance. +allow_adding_segments_for_all_websites = 1 + ; this action name is used when the URL ends with a slash / ; it is useful to have an actual string to write in the UI action_default_name = index @@ -472,13 +482,6 @@ use_third_party_id_cookie = 0 ; Once enabled (set to 1) messages will be logged to all loggers defined in "[log] log_writers" config. debug = 0 -; There is a feature in the Tracking API that lets you create new visit at any given time, for example if you know that a different user/customer is using -; the app then you would want to tell Piwik to create a new visit (even though both users are using the same browser/computer). -; To prevent abuse and easy creation of fake visits, this feature requires admin token_auth by default -; If you wish to use this feature using the Javascript tracker, you can set the setting new_visit_api_requires_admin=0, and in Javascript write: -; _paq.push(['appendToTrackingUrl', 'new_visit=1']); -new_visit_api_requires_admin = 1 - ; This setting is described in this FAQ: http://piwik.org/faq/how-to/faq_175/ ; Note: generally this should only be set to 1 in an intranet setting, where most users have the same configuration (browsers, OS) ; and the same IP. If left to 0 in this setting, all visitors will be counted as one single visitor. diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index cd3fc0138c..2df309d69c 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -10,6 +10,7 @@ namespace Piwik; use Exception; use Piwik\ArchiveProcessor\Parameters; +use Piwik\ArchiveProcessor\Rules; use Piwik\DataAccess\ArchiveWriter; use Piwik\DataAccess\LogAggregator; use Piwik\DataTable\Manager; @@ -99,13 +100,27 @@ class ArchiveProcessor * @var int */ protected $numberOfVisits = false; + protected $numberOfVisitsConverted = false; + /** + * If true, unique visitors are not calculated when we are aggregating data for multiple sites. + * The `[General] enable_processing_unique_visitors_multiple_sites` INI config option controls + * the value of this variable. + * + * @var bool + */ + private $skipUniqueVisitorsCalculationForMultipleSites = true; + + const SKIP_UNIQUE_VISITORS_FOR_MULTIPLE_SITES = 'enable_processing_unique_visitors_multiple_sites'; + public function __construct(Parameters $params, ArchiveWriter $archiveWriter) { $this->params = $params; $this->logAggregator = new LogAggregator($params); $this->archiveWriter = $archiveWriter; + + $this->skipUniqueVisitorsCalculationForMultipleSites = Rules::shouldSkipUniqueVisitorsCalculationForMultipleSites(); } protected function getArchive() @@ -154,7 +169,8 @@ class ArchiveProcessor * @var array */ protected static $columnsToRenameAfterAggregation = array( - Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS + Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS, + Metrics::INDEX_NB_USERS => Metrics::INDEX_SUM_DAILY_NB_USERS, ); /** @@ -364,16 +380,23 @@ class ArchiveProcessor protected function enrichWithUniqueVisitorsMetric(Row $row) { - if(!$this->getParams()->isSingleSite() ) { - // we only compute unique visitors for a single site + // skip unique visitors metrics calculation if calculating for multiple sites is disabled + if (!$this->getParams()->isSingleSite() + && $this->skipUniqueVisitorsCalculationForMultipleSites + ) { return; } - if ( $row->getColumn('nb_uniq_visitors') !== false) { + if ($row->getColumn('nb_uniq_visitors') !== false + || $row->getColumn('nb_users') !== false + ) { if (SettingsPiwik::isUniqueVisitorsEnabled($this->getParams()->getPeriod()->getLabel())) { - $uniqueVisitors = (float)$this->computeNbUniqVisitors(); - $row->setColumn('nb_uniq_visitors', $uniqueVisitors); + $metrics = array(Metrics::INDEX_NB_UNIQ_VISITORS, Metrics::INDEX_NB_USERS); + $uniques = $this->computeNbUniques( $metrics ); + $row->setColumn('nb_uniq_visitors', $uniques[Metrics::INDEX_NB_UNIQ_VISITORS]); + $row->setColumn('nb_users', $uniques[Metrics::INDEX_NB_USERS]); } else { $row->deleteColumn('nb_uniq_visitors'); + $row->deleteColumn('nb_users'); } } } @@ -395,14 +418,15 @@ class ArchiveProcessor * This is the only Period metric (ie. week/month/year/range) that we process from the logs directly, * since unique visitors cannot be summed like other metrics. * + * @param array Metrics Ids for which to aggregates count of values * @return int */ - protected function computeNbUniqVisitors() + protected function computeNbUniques($metrics) { $logAggregator = $this->getLogAggregator(); - $query = $logAggregator->queryVisitsByDimension(array(), false, array(), array(Metrics::INDEX_NB_UNIQ_VISITORS)); + $query = $logAggregator->queryVisitsByDimension(array(), false, array(), $metrics); $data = $query->fetch(); - return $data[Metrics::INDEX_NB_UNIQ_VISITORS]; + return $data; } /** diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php index 03b26acf2f..223241e980 100644 --- a/core/ArchiveProcessor/Rules.php +++ b/core/ArchiveProcessor/Rules.php @@ -285,6 +285,18 @@ class Rules } /** + * Returns true if the archiving process should skip the calculation of unique visitors + * across several sites. The `[General] enable_processing_unique_visitors_multiple_sites` + * INI config option controls the value of this variable. + * + * @return bool + */ + public static function shouldSkipUniqueVisitorsCalculationForMultipleSites() + { + return Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] == 1; + } + + /** * @param array $idSites * @param Segment $segment * @return bool @@ -310,4 +322,4 @@ class Rules } return false; } -} +}
\ No newline at end of file diff --git a/core/Factory.php b/core/BaseFactory.php index 480f9313c1..e24b6dfc02 100644 --- a/core/Factory.php +++ b/core/BaseFactory.php @@ -20,13 +20,13 @@ use Exception; * Derived classes should override the **getClassNameFromClassId** and **getInvalidClassIdExceptionMessage** * static methods. */ -abstract class Factory +abstract class BaseFactory { /** * Creates a new instance of a class using a string ID. * * @param string $classId The ID of the class. - * @return Factory + * @return BaseFactory * @throws Exception if $classId is invalid. */ public static function factory($classId) diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php index 0318136a36..9c7e82fe53 100644 --- a/core/CliMulti/Process.php +++ b/core/CliMulti/Process.php @@ -203,6 +203,13 @@ class Process */ private static function isProcFSMounted() { - return is_resource(@fopen('/proc', 'r')); + if(is_resource(@fopen('/proc', 'r'))) { + return true; + } + // Testing if /proc is a resource with @fopen fails on systems with open_basedir set. + // by using stat we not only test the existance of /proc but also confirm it's a 'proc' filesystem + $type = shell_exec('stat -f -c "%T" /proc 2>/dev/null'); + return strpos($type, 'proc') === 0; } + } diff --git a/core/Common.php b/core/Common.php index ecfefabcec..5d5c35c764 100644 --- a/core/Common.php +++ b/core/Common.php @@ -575,6 +575,18 @@ class Common } /** + * Converts a User ID string to the Visitor ID Binary representation. + * + * @param $userId + * @return string + */ + public static function convertUserIdToVisitorIdBin($userId) + { + $userIdHashed = \PiwikTracker::getUserIdHashed($userId); + return self::convertVisitorIdToBin($userIdHashed); + } + + /** * Convert IP address (in network address format) to presentation format. * This is a backward compatibility function for code that only expects * IPv4 addresses (i.e., doesn't support IPv6). diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index d52ff8b7a0..95a7603176 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -9,6 +9,7 @@ namespace Piwik\DataAccess; use Piwik\ArchiveProcessor\Parameters; +use Piwik\Common; use Piwik\DataArray; use Piwik\Db; use Piwik\Metrics; @@ -128,8 +129,8 @@ class LogAggregator /** @var \Piwik\Date */ protected $dateEnd; - /** @var \Piwik\Site */ - protected $site; + /** @var int[] */ + protected $sites; /** @var \Piwik\Segment */ protected $segment; @@ -144,12 +145,12 @@ class LogAggregator $this->dateStart = $params->getDateStart(); $this->dateEnd = $params->getDateEnd(); $this->segment = $params->getSegment(); - $this->site = $params->getSite(); + $this->sites = $params->getIdSites(); } public function generateQuery($select, $from, $where, $groupBy, $orderBy) { - $bind = $this->getBindDatetimeSite(); + $bind = $this->getGeneralQueryBindParams(); $query = $this->segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy); return $query; } @@ -164,6 +165,7 @@ class LogAggregator Metrics::INDEX_SUM_VISIT_LENGTH => "sum(" . self::LOG_VISIT_TABLE . ".visit_total_time)", Metrics::INDEX_BOUNCE_COUNT => "sum(case " . self::LOG_VISIT_TABLE . ".visit_total_actions when 1 then 1 when 0 then 1 else 0 end)", Metrics::INDEX_NB_VISITS_CONVERTED => "sum(case " . self::LOG_VISIT_TABLE . ".visit_goal_converted when 1 then 1 else 0 end)", + Metrics::INDEX_NB_USERS => "count(distinct " . self::LOG_VISIT_TABLE . ".user_id)", ); } @@ -437,7 +439,7 @@ class LogAggregator { $where = "$tableName.$datetimeField >= ? AND $tableName.$datetimeField <= ? - AND $tableName.idsite = ?"; + AND $tableName.idsite IN (". Common::getSqlStringFieldsArray($this->sites) . ")"; if (!empty($extraWhere)) { $extraWhere = sprintf($extraWhere, $tableName, $tableName); $where .= ' AND ' . $extraWhere; @@ -452,9 +454,17 @@ class LogAggregator return $groupBy; } - protected function getBindDatetimeSite() + /** + * Returns general bind parameters for all log aggregation queries. This includes the datetime + * start of entities, datetime end of entities and IDs of all sites. + * + * @return array + */ + protected function getGeneralQueryBindParams() { - return array($this->dateStart->getDateStartUTC(), $this->dateEnd->getDateEndUTC(), $this->site->getId()); + $bind = array($this->dateStart->getDateStartUTC(), $this->dateEnd->getDateEndUTC()); + $bind = array_merge($bind, $this->sites); + return $bind; } /** @@ -544,7 +554,7 @@ class LogAggregator array( 'log_conversion_item.server_time >= ?', 'log_conversion_item.server_time <= ?', - 'log_conversion_item.idsite = ?', + 'log_conversion_item.idsite IN (' . Common::getSqlStringFieldsArray($this->sites) . ')', 'log_conversion_item.deleted = 0' ) ), diff --git a/core/DataArray.php b/core/DataArray.php index 4f994a7d3e..042d5ae961 100644 --- a/core/DataArray.php +++ b/core/DataArray.php @@ -62,6 +62,7 @@ class DataArray return array(Metrics::INDEX_NB_UNIQ_VISITORS => 0, Metrics::INDEX_NB_VISITS => 0, Metrics::INDEX_NB_ACTIONS => 0, + Metrics::INDEX_NB_USERS => 0, Metrics::INDEX_MAX_ACTIONS => 0, Metrics::INDEX_SUM_VISIT_LENGTH => 0, Metrics::INDEX_BOUNCE_COUNT => 0, @@ -90,6 +91,7 @@ class DataArray if ($onlyMetricsAvailableInActionsTable) { return; } + $oldRowToUpdate[Metrics::INDEX_NB_USERS] += $newRowToAdd['nb_users']; $oldRowToUpdate[Metrics::INDEX_MAX_ACTIONS] = (float)max($newRowToAdd['max_actions'], $oldRowToUpdate[Metrics::INDEX_MAX_ACTIONS]); $oldRowToUpdate[Metrics::INDEX_SUM_VISIT_LENGTH] += $newRowToAdd['sum_visit_length']; $oldRowToUpdate[Metrics::INDEX_BOUNCE_COUNT] += $newRowToAdd['bounce_count']; @@ -116,6 +118,7 @@ class DataArray } } + $oldRowToUpdate[Metrics::INDEX_NB_USERS] += $newRowToAdd[Metrics::INDEX_NB_USERS]; $oldRowToUpdate[Metrics::INDEX_MAX_ACTIONS] = (float)max($newRowToAdd[Metrics::INDEX_MAX_ACTIONS], $oldRowToUpdate[Metrics::INDEX_MAX_ACTIONS]); $oldRowToUpdate[Metrics::INDEX_SUM_VISIT_LENGTH] += $newRowToAdd[Metrics::INDEX_SUM_VISIT_LENGTH]; $oldRowToUpdate[Metrics::INDEX_BOUNCE_COUNT] += $newRowToAdd[Metrics::INDEX_BOUNCE_COUNT]; diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index aea71e4da8..e366cc2ec8 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -12,7 +12,7 @@ use Exception; use Piwik\DataTable; use Piwik\Metrics; use Piwik\Piwik; -use Piwik\Factory; +use Piwik\BaseFactory; /** * A DataTable Renderer can produce an output given a DataTable object. @@ -22,7 +22,7 @@ use Piwik\Factory; * $render->setTable($dataTable); * echo $render; */ -abstract class Renderer extends Factory +abstract class Renderer extends BaseFactory { protected $table; diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 43a42f167d..1130c1b6bf 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -149,6 +149,7 @@ class Mysql implements SchemaInterface idvisitor BINARY(8) NOT NULL, visit_last_action_time DATETIME NOT NULL, config_id BINARY(8) NOT NULL, + user_id varchar(200) NULL, location_ip VARBINARY(16) NOT NULL, PRIMARY KEY(idvisit), INDEX index_idsite_config_datetime (idsite, config_id, visit_last_action_time), diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index 2ccf6fda28..1fe1152c98 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -77,16 +77,32 @@ abstract class MenuAbstract extends Singleton * current user. If false, the entry will not be added. * @param int $order The order hint. * @param bool|string $tooltip An optional tooltip to display or false to display the tooltip. - * @api + * + * @deprecated since 2.7.0 Use {@link addItem() instead}. Method will be removed in Piwik 3.0 */ public function add($menuName, $subMenuName, $url, $displayedForCurrentUser = true, $order = 50, $tooltip = false) { if (!$displayedForCurrentUser) { - // TODO this parameter should be removed and instead menu items should be only added if it is supposed to be - // displayed. Won't do it now to stay backward compatible. For Piwik 3.0 we should do it. return; } + $this->addItem($menuName, $subMenuName, $url, $order, $tooltip); + } + + /** + * Adds a new entry to the menu. + * + * @param string $menuName The menu's category name. Can be a translation token. + * @param string $subMenuName The menu item's name. Can be a translation token. + * @param string|array $url The URL the admin menu entry should link to, or an array of query parameters + * that can be used to build the URL. + * @param int $order The order hint. + * @param bool|string $tooltip An optional tooltip to display or false to display the tooltip. + * @since 2.7.0 + * @api + */ + public function addItem($menuName, $subMenuName, $url, $order = 50, $tooltip = false) + { // make sure the idSite value used is numeric (hack-y fix for #3426) if (!is_numeric(Common::getRequestVar('idSite', false))) { $idSites = API::getInstance()->getSitesIdWithAtLeastViewAccess(); diff --git a/core/Metrics.php b/core/Metrics.php index 37685dd09a..c88bb13294 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -78,9 +78,13 @@ class Metrics const INDEX_EVENT_MAX_EVENT_VALUE = 37; const INDEX_EVENT_NB_HITS_WITH_VALUE = 38; + // Number of unique User IDs + const INDEX_NB_USERS = 39; + const INDEX_SUM_DAILY_NB_USERS = 40; + // Contents - const INDEX_CONTENT_NB_IMPRESSIONS = 39; - const INDEX_CONTENT_NB_INTERACTIONS = 40; + const INDEX_CONTENT_NB_IMPRESSIONS = 41; + const INDEX_CONTENT_NB_INTERACTIONS = 42; // Goal reports const INDEX_GOAL_NB_CONVERSIONS = 1; @@ -96,6 +100,7 @@ class Metrics Metrics::INDEX_NB_UNIQ_VISITORS => 'nb_uniq_visitors', Metrics::INDEX_NB_VISITS => 'nb_visits', Metrics::INDEX_NB_ACTIONS => 'nb_actions', + Metrics::INDEX_NB_USERS => 'nb_users', Metrics::INDEX_MAX_ACTIONS => 'max_actions', Metrics::INDEX_SUM_VISIT_LENGTH => 'sum_visit_length', Metrics::INDEX_BOUNCE_COUNT => 'bounce_count', @@ -104,6 +109,7 @@ class Metrics Metrics::INDEX_REVENUE => 'revenue', Metrics::INDEX_GOALS => 'goals', Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS => 'sum_daily_nb_uniq_visitors', + Metrics::INDEX_SUM_DAILY_NB_USERS => 'sum_daily_nb_users', // Actions metrics Metrics::INDEX_PAGE_NB_HITS => 'nb_hits', @@ -159,6 +165,7 @@ class Metrics Metrics::INDEX_NB_UNIQ_VISITORS, Metrics::INDEX_NB_VISITS, Metrics::INDEX_NB_ACTIONS, + Metrics::INDEX_NB_USERS, Metrics::INDEX_MAX_ACTIONS, Metrics::INDEX_SUM_VISIT_LENGTH, Metrics::INDEX_BOUNCE_COUNT, @@ -263,6 +270,7 @@ class Metrics $afterEntry = ' ' . Piwik::translate('General_AfterEntry'); $translations['sum_daily_nb_uniq_visitors'] = Piwik::translate('General_ColumnNbUniqVisitors') . $dailySum; + $translations['sum_daily_nb_users'] = Piwik::translate('General_ColumnNbUsers') . $dailySum; $translations['sum_daily_entry_nb_uniq_visitors'] = Piwik::translate('General_ColumnUniqueEntrances') . $dailySum; $translations['sum_daily_exit_nb_uniq_visitors'] = Piwik::translate('General_ColumnUniqueExits') . $dailySum; $translations['entry_nb_actions'] = Piwik::translate('General_ColumnNbActions') . $afterEntry; @@ -296,6 +304,7 @@ class Metrics 'nb_visits' => 'General_ColumnNbVisits', 'nb_uniq_visitors' => 'General_ColumnNbUniqVisitors', 'nb_actions' => 'General_ColumnNbActions', + 'nb_users' => 'General_ColumnNbUsers', ); $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations); @@ -369,6 +378,7 @@ class Metrics 'nb_visits' => 'General_ColumnNbVisitsDocumentation', 'nb_uniq_visitors' => 'General_ColumnNbUniqVisitorsDocumentation', 'nb_actions' => 'General_ColumnNbActionsDocumentation', + 'nb_users' => 'General_ColumnNbUsersDocumentation', 'nb_actions_per_visit' => 'General_ColumnActionsPerVisitDocumentation', 'avg_time_on_site' => 'General_ColumnAvgTimeOnSiteDocumentation', 'bounce_rate' => 'General_ColumnBounceRateDocumentation', diff --git a/core/Piwik.php b/core/Piwik.php index fcb49ee82f..9e53964e60 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -211,13 +211,9 @@ class Piwik */ self::postEvent('Piwik.getJavascriptCode', array(&$codeImpl, $parameters)); + $setTrackerUrl = 'var u="//{$piwikUrl}/";'; if (!empty($codeImpl['httpsPiwikUrl'])) { - $setTrackerUrl = 'var u=(("https:" == document.location.protocol) ? "https://{$httpsPiwikUrl}/" : ' - . '"http://{$piwikUrl}/");'; - $codeImpl['httpsPiwikUrl'] = rtrim($codeImpl['httpsPiwikUrl'], "/"); - } else { - $setTrackerUrl = 'var u=(("https:" == document.location.protocol) ? "https" : "http") + "://{$piwikUrl}/";'; } $codeImpl = array('setTrackerUrl' => htmlentities($setTrackerUrl)) + $codeImpl; diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index 7b6298dfe7..3ebad0f1ed 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -252,13 +252,13 @@ abstract class Controller * Assigns the given variables to the template and renders it. * * Example: - * ``` - public function myControllerAction () { - return $this->renderTemplate('index', array( - 'answerToLife' => '42' - )); - } - ``` + * + * public function myControllerAction () { + * return $this->renderTemplate('index', array( + * 'answerToLife' => '42' + * )); + * } + * * This will render the 'index.twig' file within the plugin templates folder and assign the view variable * `answerToLife` to `42`. * @@ -278,7 +278,17 @@ abstract class Controller } $view = new View($template); - $this->setBasicVariablesView($view); + + // alternatively we could check whether the templates extends either admin.twig or dashboard.twig and based on + // that call the correct method. This will be needed once we unify Controller and ControllerAdmin see + // https://github.com/piwik/piwik/issues/6151 + if ($this instanceof ControllerAdmin) { + $this->setBasicVariablesView($view); + } elseif (empty($this->site) || empty($this->idSite)) { + $this->setBasicVariablesView($view); + } else { + $this->setGeneralVariablesView($view); + } foreach ($variables as $key => $value) { $view->$key = $value; diff --git a/core/Plugin/Menu.php b/core/Plugin/Menu.php index 9f7240b1f3..6d2bdefccd 100644 --- a/core/Plugin/Menu.php +++ b/core/Plugin/Menu.php @@ -8,10 +8,12 @@ */ namespace Piwik\Plugin; +use Piwik\Development; use Piwik\Menu\MenuAdmin; use Piwik\Menu\MenuReporting; use Piwik\Menu\MenuTop; use Piwik\Menu\MenuUser; +use Piwik\Plugin\Manager as PluginManager; /** * Base class of all plugin menu providers. Plugins that define their own menu items can extend this class to easily @@ -27,6 +29,106 @@ use Piwik\Menu\MenuUser; */ class Menu { + protected $module = ''; + + /** + * @ignore + */ + public function __construct() + { + $this->module = $this->getModule(); + } + + private function getModule() + { + $className = get_class($this); + $className = explode('\\', $className); + + return $className[2]; + } + + /** + * Generates a URL for the default action of the plugin controller. + * + * Example: + * ``` + * $menu->addItem('UI Framework', '', $this->urlForDefaultAction(), $orderId = 30); + * // will add a menu item that leads to the default action of the plugin controller when a user clicks on it. + * // The default action is usually the `index` action - meaning the `index()` method the controller - + * // but the default action can be customized within a controller + * ``` + * + * @param array $additionalParams Optional URL parameters that will be appended to the URL + * @return array + * + * @since 2.7.0 + * @api + */ + protected function urlForDefaultAction($additionalParams = array()) + { + $params = (array) $additionalParams; + $params['action'] = ''; + $params['module'] = $this->module; + + return $params; + } + + /** + * Generates a URL for the given action. In your plugin controller you have to create a method with the same name + * as this method will be executed when a user clicks on the menu item. If you want to generate a URL for the + * action of another module, meaning not your plugin, you should use the method {@link urlForModuleAction()}. + * + * @param string $controllerAction The name of the action that should be executed within your controller + * @param array $additionalParams Optional URL parameters that will be appended to the URL + * @return array + * + * @since 2.7.0 + * @api + */ + protected function urlForAction($controllerAction, $additionalParams = array()) + { + $this->checkisValidCallable($this->module, $controllerAction); + + $params = (array) $additionalParams; + $params['action'] = $controllerAction; + $params['module'] = $this->module; + + return $params; + } + + /** + * Generates a URL for the given action of the given module. We usually do not recommend to use this method as you + * should make sure the method of that module actually exists. If the plugin owner of that module changes the method + * in a future version your link might no longer work. If you want to link to an action of your controller use the + * method {@link urlForAction()}. Note: We will generate a link only if the given module is installed and activated. + * + * @param string $module The name of the module/plugin the action belongs to. The module name is case sensitive. + * @param string $controllerAction The name of the action that should be executed within your controller + * @param array $additionalParams Optional URL parameters that will be appended to the URL + * @return array|null Returns null if the given module is either not installed or not activated. Returns the URL + * to the given module action otherwise. + * + * @since 2.7.0 + * // not API for now + */ + protected function urlForModuleAction($module, $controllerAction, $additionalParams = array()) + { + $this->checkisValidCallable($module, $controllerAction); + + $pluginManager = PluginManager::getInstance(); + + if (!$pluginManager->isPluginLoaded($module) || + !$pluginManager->isPluginActivated($module)) { + return null; + } + + $params = (array) $additionalParams; + $params['action'] = $controllerAction; + $params['module'] = $module; + + return $params; + } + /** * Configures the reporting menu which should only contain links to reports of a specific site such as * "Search Engines", "Page Titles" or "Locations & Provider". @@ -59,4 +161,32 @@ class Menu { } + private function checkisValidCallable($module, $action) + { + if (!Development::isEnabled()) { + return; + } + + $prefix = 'Menu item added in ' . get_class($this) . ' will fail when being selected. '; + + if (!is_string($action)) { + Development::error($prefix . 'No valid action is specified. Make sure the defined action that should be executed is a string.'); + } + + $reportAction = lcfirst(substr($action, 4)); + if (Report::factory($module, $reportAction)) { + return; + } + + $controllerClass = '\\Piwik\\Plugins\\' . $module . '\\Controller'; + + if (!Development::methodExists($controllerClass, $action)) { + Development::error($prefix . 'The defined action "' . $action . '" does not exist in ' . $controllerClass . '". Make sure to define such a method.'); + } + + if (!Development::isCallableMethod($controllerClass, $action)) { + Development::error($prefix . 'The defined action "' . $action . '" is not callable on "' . $controllerClass . '". Make sure the method is public.'); + } + } + } diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php index c341926a5c..f59e8a13c0 100644 --- a/core/Plugin/Report.php +++ b/core/Plugin/Report.php @@ -97,7 +97,7 @@ class Report * @var array * @api */ - protected $metrics = array('nb_visits', 'nb_uniq_visitors', 'nb_actions'); + protected $metrics = array('nb_visits', 'nb_uniq_visitors', 'nb_actions', 'nb_users'); // for a little performance improvement we avoid having to call Metrics::getDefaultMetrics for each report /** diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index e6ccc530ed..9cf58448f7 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -14,13 +14,13 @@ use Piwik\DataTable\Row; use Piwik\DataTable\Simple; use Piwik\DataTable; use Piwik\Plugins\ImageGraph\API; -use Piwik\Factory; +use Piwik\BaseFactory; /** * A Report Renderer produces user friendly renderings of any given Piwik report. * All new Renderers must be copied in ReportRenderer and added to the $availableReportRenderers. */ -abstract class ReportRenderer extends Factory +abstract class ReportRenderer extends BaseFactory { const DEFAULT_REPORT_FONT = 'dejavusans'; const REPORT_TEXT_COLOR = "68,68,68"; diff --git a/core/Tracker.php b/core/Tracker.php index ef9c7d7e4f..d9e8a04278 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -45,7 +45,6 @@ class Tracker protected static $forcedDateTime = null; protected static $forcedIpString = null; - protected static $forcedVisitorId = null; protected static $pluginsNotToLoad = array(); protected static $pluginsToLoad = array(); @@ -92,7 +91,6 @@ class Tracker { self::$forcedIpString = null; self::$forcedDateTime = null; - self::$forcedVisitorId = null; $this->stateValid = self::STATE_NOTHING_TO_NOTICE; } @@ -106,11 +104,6 @@ class Tracker self::$forcedDateTime = $dateTime; } - public static function setForceVisitorId($visitorId) - { - self::$forcedVisitorId = $visitorId; - } - /** * Do not load the specified plugins (used during testing, to disable Provider plugin) * @param array $plugins @@ -770,12 +763,6 @@ class Tracker if (!empty($customDatetime)) { $this->setForceDateTime($customDatetime); } - - // Forced Visitor ID to record the visit / action - $customVisitorId = $request->getParam('cid'); - if (!empty($customVisitorId)) { - $this->setForceVisitorId($customVisitorId); - } } public static function setTestEnvironment($args = null, $requestMethod = null) @@ -835,11 +822,6 @@ class Tracker self::setForceDateTime($customDatetime); } - // Custom visitor id - $customVisitorId = Common::getRequestVar('cid', false, null, $args); - if (!empty($customVisitorId)) { - self::setForceVisitorId($customVisitorId); - } $pluginsDisabled = array('Provider'); // Disable provider plugin, because it is so slow to do many reverse ip lookups @@ -882,7 +864,6 @@ class Tracker try { if ($this->isVisitValid()) { - $request->setForcedVisitorId(self::$forcedVisitorId); $request->setForceDateTime(self::$forcedDateTime); $request->setForceIp(self::$forcedIpString); diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 6a7f96b0b9..659c5fac6a 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -29,8 +29,6 @@ class Request */ protected $params; - protected $forcedVisitorId = false; - protected $isAuthenticated = null; protected $tokenAuth; @@ -277,6 +275,7 @@ class Request 'cip' => array(false, 'string'), 'cdt' => array(false, 'string'), 'cid' => array(false, 'string'), + 'uid' => array(false, 'string'), // Actions / pages 'cs' => array(false, 'string'), @@ -442,21 +441,37 @@ class Request } /** - * Is the request for a known VisitorId, based on 1st party, 3rd party (optional) cookies or Tracking API forced Visitor ID + * Returns the ID from the request in this order: + * return from a given User ID, + * or from a Tracking API forced Visitor ID, + * or from a Visitor ID from 3rd party (optional) cookies, + * or from a given Visitor Id from 1st party? + * * @throws Exception */ public function getVisitorId() { $found = false; + // If User ID is set it takes precedence + $userId = $this->getForcedUserId(); + if(strlen($userId) > 0) { + $userIdHashed = $this->getUserIdHashed($userId); + $idVisitor = $this->truncateIdAsVisitorId($userIdHashed); + Common::printDebug("Request will be recorded for this user_id = " . $userId . " (idvisitor = $idVisitor)"); + $found = true; + } + // Was a Visitor ID "forced" (@see Tracking API setVisitorId()) for this request? - $idVisitor = $this->getForcedVisitorId(); - if (!empty($idVisitor)) { - if (strlen($idVisitor) != Tracker::LENGTH_HEX_ID_STRING) { - throw new Exception("Visitor ID (cid) $idVisitor must be " . Tracker::LENGTH_HEX_ID_STRING . " characters long"); + if (!$found) { + $idVisitor = $this->getForcedVisitorId(); + if (!empty($idVisitor)) { + if (strlen($idVisitor) != Tracker::LENGTH_HEX_ID_STRING) { + throw new Exception("Visitor ID (cid) $idVisitor must be " . Tracker::LENGTH_HEX_ID_STRING . " characters long"); + } + Common::printDebug("Request will be recorded for this idvisitor = " . $idVisitor); + $found = true; } - Common::printDebug("Request will be recorded for this idvisitor = " . $idVisitor); - $found = true; } // - If set to use 3rd party cookies for Visit ID, read the cookie @@ -473,6 +488,7 @@ class Request } } } + // If a third party cookie was not found, we default to the first party cookie if (!$found) { $idVisitor = Common::getRequestVar('_id', '', 'string', $this->params); @@ -480,7 +496,7 @@ class Request } if ($found) { - $truncated = substr($idVisitor, 0, Tracker::LENGTH_HEX_ID_STRING); + $truncated = $this->truncateIdAsVisitorId($idVisitor); $binVisitorId = @Common::hex2bin($truncated); if (!empty($binVisitorId)) { return $binVisitorId; @@ -517,16 +533,14 @@ class Request } } - public function setForcedVisitorId($visitorId) + public function getForcedUserId() { - if (!empty($visitorId)) { - $this->forcedVisitorId = $visitorId; - } + return $this->getParam('uid'); } public function getForcedVisitorId() { - return $this->forcedVisitorId; + return $this->getParam('cid'); } public function getPlugins() @@ -556,4 +570,24 @@ class Request } return false; } + + /** + * @param $idVisitor + * @return string + */ + private function truncateIdAsVisitorId($idVisitor) + { + return substr($idVisitor, 0, Tracker::LENGTH_HEX_ID_STRING); + } + + /** + * Matches implementation of PiwikTracker::getUserIdHashed + * + * @param $userId + * @return string + */ + private function getUserIdHashed($userId) + { + return sha1($userId); + } } diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php index 90b58a88b0..793cfefb1c 100644 --- a/core/Tracker/Visit.php +++ b/core/Tracker/Visit.php @@ -497,6 +497,7 @@ class Visit implements VisitInterface 'idvisitor' => $this->getVisitorIdcookie($visitor), 'config_id' => $this->getSettingsObject()->getConfigId(), 'location_ip' => $this->getVisitorIp(), + 'user_id' => $this->request->getForcedUserId(), ); } @@ -518,6 +519,11 @@ class Visit implements VisitInterface $visitor->setVisitorColumn('idvisitor', $this->visitorInfo['idvisitor']); } + if (strlen($this->request->getForcedUserId()) > 0) { + $valuesToUpdate['user_id'] = $this->request->getForcedUserId(); + $visitor->setVisitorColumn('user_id', $valuesToUpdate['user_id']); + } + $dimensions = $this->getAllVisitDimensions(); $valuesToUpdate = $this->triggerHookOnDimensions($dimensions, 'onExistingVisit', $visitor, $action, $valuesToUpdate); diff --git a/core/Tracker/Visitor.php b/core/Tracker/Visitor.php index 70fb165f9b..846c7c78ac 100644 --- a/core/Tracker/Visitor.php +++ b/core/Tracker/Visitor.php @@ -153,10 +153,7 @@ class Visitor $isNewVisitForced = $this->request->getParam('new_visit'); $isNewVisitForced = !empty($isNewVisitForced); - $newVisitEnforcedAPI = $isNewVisitForced - && ($this->request->isAuthenticated() - || !Config::getInstance()->Tracker['new_visit_api_requires_admin']); - $enforceNewVisit = $newVisitEnforcedAPI || Config::getInstance()->Debug['tracker_always_new_visitor']; + $enforceNewVisit = $isNewVisitForced || Config::getInstance()->Debug['tracker_always_new_visitor']; if (!$enforceNewVisit && $visitRow @@ -236,8 +233,12 @@ class Visitor // If a &cid= was set, we force to select this visitor (or create a new one) $isForcedVisitorIdMustMatch = ($this->request->getForcedVisitorId() != null); + // if &iud was set, we force to select this visitor (or create new one) + $isForcedUserIdMustMatch = ($this->request->getForcedUserId() != null); + $shouldMatchOneFieldOnly = (($isVisitorIdToLookup && $trustCookiesOnly) || $isForcedVisitorIdMustMatch + || $isForcedUserIdMustMatch || !$isVisitorIdToLookup); return $shouldMatchOneFieldOnly; } @@ -250,6 +251,8 @@ class Visitor $fields = array( 'idvisitor', 'idvisit', + 'user_id', + 'visit_exit_idaction_url', 'visit_exit_idaction_name', 'visitor_returning', diff --git a/core/Updates/2.7.0-b2.php b/core/Updates/2.7.0-b2.php new file mode 100644 index 0000000000..914d2ab65e --- /dev/null +++ b/core/Updates/2.7.0-b2.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\Updates; + +use Piwik\Common; +use Piwik\Updater; +use Piwik\Updates; + +/** + */ +class Updates_2_7_0_b2 extends Updates +{ + static function getSql() + { + return array( + 'ALTER TABLE `' . Common::prefixTable('log_visit') . '` + ADD `user_id` varchar(200) NULL AFTER `config_id` + ' => array(1060), + ); + } + + static function update() + { + // Run the SQL + Updater::updateDatabase(__FILE__, self::getSql()); + } +} + diff --git a/core/Version.php b/core/Version.php index 843a22004b..b91bb28685 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.6.0-b1'; + const VERSION = '2.7.0-b2'; } diff --git a/core/View.php b/core/View.php index fe6494c87e..c62c0eed78 100644 --- a/core/View.php +++ b/core/View.php @@ -232,6 +232,8 @@ class View implements ViewInterface $user = APIUsersManager::getInstance()->getUser($this->userLogin); $this->userAlias = $user['alias']; } catch (Exception $e) { + Log::verbose($e); + // can fail, for example at installation (no plugin loaded yet) } @@ -253,7 +255,16 @@ class View implements ViewInterface protected function renderTwigTemplate() { - $output = $this->twig->render($this->getTemplateFile(), $this->getTemplateVars()); + try { + $output = $this->twig->render($this->getTemplateFile(), $this->getTemplateVars()); + } catch (Exception $ex) { + // twig does not rethrow exceptions, it wraps them so we log the cause if we can find it + $cause = $ex->getPrevious(); + Log::debug($cause === null ? $ex : $cause); + + throw $ex; + } + $output = $this->applyFilter_cacheBuster($output); $helper = new Theme; diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 5df0950b37..5a67f53716 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -26,12 +26,6 @@ if ($minimumPhpInvalid) { support PHP $piwik_minimumPHPVersion.</p> <p>Also see the FAQ: <a href='http://piwik.org/faq/how-to-install/#faq_77'>My Web host supports PHP4 by default. How can I enable PHP5?</a></p>"; } else { - if (!class_exists('ArrayObject')) { - $piwik_errorMessage .= "<p><strong>Piwik and Zend Framework require the SPL extension</strong></p> - <p>It appears your PHP was compiled with <pre>--disable-spl</pre>. - To enjoy Piwik, you need PHP compiled without that configure option.</p>"; - } - if (!extension_loaded('session')) { $piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the session extension</strong></p> <p>It appears your PHP was compiled with <pre>--disable-session</pre>. diff --git a/lang/cs.json b/lang/cs.json index ac9a4ff71f..2aa35778cc 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -10,12 +10,12 @@ "Add": "Přidat", "AfterEntry": "Po vložení dne", "All": "Vše", - "AllowPiwikArchivingToTriggerBrowser": "Spouštět archovování když jsou hlášení prohlížena ve Web prohlížeči", + "AllowPiwikArchivingToTriggerBrowser": "Povolit spouštění archivování, když jsou hlášení prohlížena ve Webovém prohlížeči", "AllWebsitesDashboard": "Nástěnka pro všechny weby", "And": "a", "API": "API", - "ApplyDateRange": "Aplikovat vybraný rozsah", - "ArchivingInlineHelp": "Pro web stránky se střední, nebo vysokou návštěvností je doporučeno zakázat archivování Piwiku z web prohlížeče. Místo toho doporučujeme vytvoření úlohy pro cron", + "ApplyDateRange": "Použít vybraný rozsah", + "ArchivingInlineHelp": "Pro web stránky se střední nebo vysokou návštěvností je doporučeno zakázat archivování Piwiku z webového prohlížeče. Místo toho doporučujeme vytvoření úlohy pro cron", "ArchivingTriggerDescription": "Doporučeno pro větší instalace Piwiku, potřebujete %snastavit cron úlohu%s na automatické spracování hlášení.", "AuthenticationMethodSmtp": "Autentizační metoda SMTP", "AverageOrderValue": "Průměrná hodnota objednávky", @@ -23,64 +23,65 @@ "AverageQuantity": "Průměrné množství", "BackToPiwik": "Zpět do Piwiku", "Broken": "Rozbité", - "BrokenDownReportDocumentation": "Je členěn do různých hlášení, která jsou zobrazena dolní části stránky. Vybraný graf můžete zvětšit tak, že na něj kliknete.", + "BrokenDownReportDocumentation": "Je členěn do různých hlášení, která jsou zobrazena v dolní části stránky. Vybraný graf můžete zvětšit tak, že na něj kliknete.", "Cancel": "Zrušit", "CannotUnzipFile": "Nelze rozbalit soubor %1$s: %2$s", "ChangePassword": "Změnit heslo", - "ChangeTagCloudView": "Všimněte si, že můžete zobrazit hlášení jinak, než jako tag cloud. Pro změnu zobrazení použíjte ovládací prvky pod ním.", - "ChooseDate": "Vyber datum", + "ChangeTagCloudView": "Všimněte si, že můžete zobrazit hlášení jinak, než jako tag cloud. Pro změnu zobrazení použijte ovládací prvky pod ním.", + "ChooseDate": "Zvolte datum", "ChooseLanguage": "Zvolte jazyk", "ChoosePeriod": "Zvolte období", "ChooseWebsite": "Zvolte web", + "Clear": "Vyčistit", "ClickHere": "Klikněte zde pro více informací", "ClickToChangePeriod": "Klikni znovu pro změnu období.", "Close": "Zavřít", "ColumnActionsPerVisit": "Akcí za návštěvu", - "ColumnActionsPerVisitDocumentation": "Průměrní počet akcí (zobrazení stránek, stažení nebo externích odkazů) za návštěvu.", - "ColumnAverageGenerationTime": "Průměrný generovaný čas", + "ColumnActionsPerVisitDocumentation": "Průměrný počet akcí (zobrazení stránek, stažení nebo externích odkazů) za návštěvu.", + "ColumnAverageGenerationTime": "Průměrný čas generování", "ColumnAverageGenerationTimeDocumentation": "Průměrný čas, za který byla stránka vygenerována. Toto měření zahrnuje čas, který potřeboval server k vygenerování stránky plus čas, který potřeboval klient k jejímu stažení. Kratší průměrný čas znamená rychlejší stránku.", - "ColumnAverageTimeOnPage": "Přůměrně času na stránce", - "ColumnAverageTimeOnPageDocumentation": "Průměrný celkový čas strávený na stránce (pouze konkrétní stránky),", + "ColumnAverageTimeOnPage": "Průměrný čas na stránce", + "ColumnAverageTimeOnPageDocumentation": "Průměrný celkový čas strávený na stránce (pouze konkrétní stránky, ne celý web).", "ColumnAvgTimeOnSite": "Průměrně času na stránkách", "ColumnAvgTimeOnSiteDocumentation": "Průměrná doba jedné návštěvy", "ColumnBounceRate": "Odchozí frekvence", "ColumnBounceRateDocumentation": "Procento návštěv, které měly jedno zobrazení. To znamená návštěvníci, kteří po zobrazení stránky okamžitě odešli.", "ColumnBounceRateForPageDocumentation": "Procento návštěv, které začaly a skončily touto stránkou", "ColumnBounces": "Ihned odchozí", - "ColumnBouncesDocumentation": "Počet návštěv, které začaly a skončily na touto stránkou. To znamená, kteří navštívily jen tuto stránku.", + "ColumnBouncesDocumentation": "Počet návštěv, které začaly a skončily na této stránce. To znamená, kteří navštívily jen tuto stránku.", "ColumnConversionRate": "Frekvence konverzí", - "ColumnConversionRateDocumentation": "Procento návštěv, které provedli konverzi Cíle,", + "ColumnConversionRateDocumentation": "Procento návštěv, které provedly konverzi Cíle.", "ColumnDestinationPage": "Cílová stránka", "ColumnEntrances": "Vstupy", - "ColumnEntrancesDocumentation": "Počet návštěvníků, kteří započali návštěvu touto stránkovu.", + "ColumnEntrancesDocumentation": "Počet návštěvníků, kteří započali návštěvu touto stránkou.", "ColumnExitRate": "Frekvence odchodů", "ColumnExitRateDocumentation": "Procentuální vyjádření těch, kteří opustili tuto stránku po jejím zobrazení.", "ColumnExits": "Odchody", - "ColumnExitsDocumentation": "Počet návštěv, které skončily touto stránkovu.", + "ColumnExitsDocumentation": "Počet návštěv, které skončily touto stránkou.", "ColumnGenerationTime": "Čas generování", "ColumnKeyword": "Klíčové slovo", "ColumnLabel": "Popisek", "ColumnMaxActions": "Maximální počet akcí při jedné návštěvě", "ColumnNbActions": "Akce", - "ColumnNbActionsDocumentation": "Počet akcí Vašich návstěvníků. Akcí se rozumí zobrazení stránky, stažení a kliknutí na externí odkazy.", + "ColumnNbActionsDocumentation": "Počet akcí Vašich návštěvníků. Akcí se rozumí zobrazení stránky, stažení a kliknutí na externí odkazy.", "ColumnNbUniqVisitors": "Jedineční návštěvníci", "ColumnNbUniqVisitorsDocumentation": "Počet neduplicitních návštěvníků, kteří navštívili vaše stránky. Každý návštěvník je počítán pouze jednou, ikdyž třeba přišel několikrát za den.", "ColumnNbVisits": "Návštěv", - "ColumnNbVisitsDocumentation": "Pokud návštěvník přijde na vaše stránky poprvé, nebo po třiceti minutách, je tato návštěva započítána jako nová.", + "ColumnNbVisitsDocumentation": "Pokud návštěvník přijde na vaše stránky poprvé nebo po třiceti minutách, je tato návštěva započítána jako nová.", "ColumnPageBounceRateDocumentation": "Procento návštěv, které začaly touto stránkou a ihned ji opustili.", "ColumnPageviews": "Zobrazení stránek", - "ColumnPageviewsDocumentation": "Počet navštívení této stránky.", + "ColumnPageviewsDocumentation": "Počet návštěv této stránky.", "ColumnPercentageVisits": "% návštěv", "ColumnRevenue": "Příjem", "ColumnSumVisitLength": "Celkový čas strávený návštěvníky (v sekundách)", "ColumnTotalPageviews": "Celkem zobrazených stránek", - "ColumnUniqueEntrances": "Unikátních navštívení stránky", + "ColumnUniqueEntrances": "Unikátních vstupů", "ColumnUniqueExits": "Unikátních opuštění stránky", "ColumnUniquePageviews": "Jedinečná zobrazení stránek", "ColumnUniquePageviewsDocumentation": "Počet návštěvníků, kteří navštívily tuto stránku. Pokud byla tato stránka navštívena několikrát, návštěva je započítána jen jednou.", "ColumnValuePerVisit": "Hodnota za návštěvu", "ColumnViewedAfterSearch": "Kliknuto ve výsledcích vyhledávání", - "ColumnViewedAfterSearchDocumentation": "ePočet návštěv této stránky poté, co návštěvník provedl vyhledávání a kliknul na tuto stránku.", + "ColumnViewedAfterSearchDocumentation": "Počet návštěv této stránky poté, co návštěvník provedl vyhledávání a kliknul na tuto stránku.", "ColumnVisitDuration": "Doba návštěvy (v sekundách)", "ColumnVisitsWithConversions": "Návštěvy s přechodem", "ConfigFileIsNotWritable": "Konfigurační soubor Piwiku %s není zapisovatelný, některé změny nebudou uloženy. %s Prosím upravte oprávnění ke konfiguračnímu souboru", @@ -120,15 +121,15 @@ "Desktop": "Desktop", "Details": "Detaily", "Discount": "Sleva", - "DisplaySimpleTable": "Zobrazit jednotuchou tabulku", + "DisplaySimpleTable": "Zobrazit jednoduchou tabulku", "DisplayTableWithGoalMetrics": "Zobrazit tabulku s měřením cílů", "DisplayTableWithMoreMetrics": "Zobrazit tabulku s více měřeními", "Documentation": "Dokumentace", "Donate": "Přispějte", "Done": "Hotovo", "Download": "Stáhnout", - "DownloadFail_FileExists": "Sobor %s již existuje!", - "DownloadFail_FileExistsContinue": "Pokus o pokračování stahování %s, ale celý stažený soubor už existuje!", + "DownloadFail_FileExists": "Soubor %s již existuje!", + "DownloadFail_FileExistsContinue": "Pokus o pokračování stahování %s, ale celý stažený soubor již existuje!", "DownloadFail_HttpRequestFail": "Nepodařilo se stáhnout soubor. Něco může být v nepořádku se stránkou, z níž byl soubor stahován. Můžete to zkusit později nebo můžete soubor stáhnout sami.", "DownloadFullVersion": "%1$sStáhnout%2$s plnou verzi! Podívejte se na %3$s", "DownloadPleaseRemoveExisting": "Pokud to chcete nahradit, odstraňte stávající soubor.", @@ -137,7 +138,7 @@ "EcommerceVisitStatusDesc": "Stav elektronického obchodu na konci návštěvy", "EcommerceVisitStatusEg": "Například pro výběr všech návštěv, které obsahují elektronickou objednávku, API požadavek by byl %s", "Edit": "Upravit", - "EncryptedSmtpTransport": "Zadejte šifrování transportvní vrsty vyžadované vaším SMTP serverem.", + "EncryptedSmtpTransport": "Zadejte šifrování transportní vrstvy vyžadované vaším SMTP serverem.", "EnglishLanguageName": "Czech", "Error": "Chyba", "ErrorRequest": "Ajaj! Při požadavku došlo k chybě. Na serveru mohlo dojít k dočasnému problému, nebo jste požádali o hlášení s příliš mnoha daty. Prosím, zkuste to znovu. Pokud se bude problém opakovat, %skontaktujte svého administrátora Piwiku%s.", @@ -149,7 +150,7 @@ "ExceptionFileIntegrity": "Test integrity selhal: %s", "ExceptionFilesizeMismatch": "Nesouhlasí velikost souboru: %1$s (očekávaná délka: %2$s, nalezeno: %3$s)", "ExceptionIncompatibleClientServerVersions": "Vaše %1$s verze klienta je %2$s tato je ale nekompatibilní se serverem %3$s.", - "ExceptionInvalidAggregateReportsFormat": "Agregovaný formát hlášený %s není platný. Zkuste místo toho nějaký z %s.", + "ExceptionInvalidAggregateReportsFormat": "Agregovaný formát hlášení %s není platný. Zkuste místo toho nějaký z %s.", "ExceptionInvalidArchiveTimeToLive": "Dnešní doba života archivu musí být číslo větší než nula", "ExceptionInvalidDateFormat": "Formát data musí být: %s nebo klíčové slovo podporované funkcí %s (více informací viz %s)", "ExceptionInvalidDateRange": "Datum '%s' není v platném rozmezí. Může mít následující formát: %s.", @@ -232,7 +233,7 @@ "LongMonth_7": "Červenec", "LongMonth_8": "Srpen", "LongMonth_9": "Září", - "MainMetrics": "Vlastní měření", + "MainMetrics": "Hlavní metriky", "Matches": "Shody", "MediumToHighTrafficItIsRecommendedTo": "Pro weby se středním, nebo velkým provozem doporučujeme zpracovat dnešní hlášení každou půlhodinu (%s vteřin), nebo každou hodinu (%s vteřin)", "Metadata": "Meta data", @@ -313,14 +314,14 @@ "Plugins": "Zásuvné moduly", "PoweredBy": "Běží na", "Previous": "Předchozí", - "PreviousDays": "předešlých %s dní (kromě dneška)", + "PreviousDays": "předešlých %s dnů (kromě dneška)", "PreviousDaysShort": "Předchozích %s dnů", "Price": "Cena", "ProductConversionRate": "Konverzní poměr", "ProductRevenue": "Hodnota produktu", "PurchasedProducts": "Zakoupené produkty", "Quantity": "Množství", - "RangeReports": "Upravit rozmezí dní", + "RangeReports": "Vlastní rozsahy dat", "ReadThisToLearnMore": "%1$sPokud se chcete dozvědět více, přečtěte si toto.%2$s", "Recommended": "(doporučuje se)", "RecordsToPlot": "Záznamy k vykreslení", @@ -374,7 +375,7 @@ "ShortMonth_8": "Srp", "ShortMonth_9": "Zář", "Show": "zobrazit", - "SingleWebsitesDashboard": "Nástěnka jedněch stránek", + "SingleWebsitesDashboard": "Nástěnka pro jedny stránek", "SmallTrafficYouCanLeaveDefault": "Pro weby s malým provozem můžete ponechat výchozích %s sekund a uvidíte všechna hlášení v reálném čase", "SmtpEncryption": "SMTP šifrování", "SmtpPassword": "Heslo SMTP", @@ -410,9 +411,9 @@ "View": "Zobrazit", "ViewDocumentationFor": "Zobrazit dokumentaci pro %1$s", "Visit": "Návštěva", - "VisitConvertedGoal": "Návštěva, která převedla alespoň jeden Cíl.", - "VisitConvertedGoalId": "Návštěva, která převedla konkrétní ID Cíl.", - "VisitConvertedNGoals": "Návstěva převedla %s Cílů.", + "VisitConvertedGoal": "Návštěva, která provedla alespoň jednu konverzi Cíle.", + "VisitConvertedGoalId": "Návštěva, která provedla konverzi konkrétního ID Cíle.", + "VisitConvertedNGoals": "Návštěva provedla %s konverzí Cílůb.", "VisitDuration": "Průměrná doba trvání návštěv (v sekundách)", "Visitor": "Návštěvník", "VisitorID": "ID návštěvníka", @@ -420,7 +421,7 @@ "Visitors": "Návštěvníci", "VisitsWith": "Návštěv s %s", "VisitType": "Typ návštěvníka", - "VisitTypeExample": "Například pro výběr všech návštěvníků, kteří se vrátili na stránky včetně těch, co si v předcchozích návštěvách něco koupili, API požadavek by obsahoval %s", + "VisitTypeExample": "Například pro výběr všech návštěvníků, kteří se vrátili na stránky včetně těch, co si v předcchozích návštěvách něco koupili, by API požadavek obsahoval %s", "Warning": "Varování", "WarningFileIntegrityNoManifest": "Test integrity nemůže být proveden z důvodů chybějícího souboru manifest.inc.php.", "WarningFileIntegrityNoManifestDeployingFromGit": "Pokud nasazujete Piwik z Gitu, pak je tato zpráva normální.", diff --git a/lang/en.json b/lang/en.json index 312cb00d46..2a69e3d7e0 100644 --- a/lang/en.json +++ b/lang/en.json @@ -65,6 +65,8 @@ "ColumnNbActionsDocumentation": "The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.", "ColumnNbUniqVisitors": "Unique visitors", "ColumnNbUniqVisitorsDocumentation": "The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.", + "ColumnNbUsers": "Users", + "ColumnNbUsersDocumentation": "The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').", "ColumnNbVisits": "Visits", "ColumnNbVisitsDocumentation": "If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.", "ColumnPageBounceRateDocumentation": "The percentage of visits that started on this page and left the website straight away.", @@ -270,6 +272,7 @@ "NotValid": "%s is not valid", "NSeconds": "%s seconds", "NumberOfVisits": "Number of visits", + "NUsers": "%s users", "NVisits": "%s visits", "Ok": "Ok", "OneAction": "1 action", @@ -405,6 +408,7 @@ "Unknown": "Unknown", "Upload": "Upload", "UsePlusMinusIconsDocumentation": "Use the plus and minus icons on the left to navigate.", + "UserId": "User ID", "Username": "Username", "UseSMTPServerForEmail": "Use SMTP server for e-mail", "Value": "Value", diff --git a/lang/fa.json b/lang/fa.json index ec41926c0e..a4dadb0358 100644 --- a/lang/fa.json +++ b/lang/fa.json @@ -153,8 +153,10 @@ "ExceptionPrivilege": "شما نمی توانید به این منبع دسترسی داشته باشید زیرا این به دسترسی %s نیاز دارد.", "ExceptionPrivilegeAccessWebsite": "شما می توانید به این منبع دسترسی داشته باشید نه به عنوان آن نیاز به %s دسترسی به سایت id = %d.", "ExceptionPrivilegeAtLeastOneWebsite": "شما نمی توانید به این منبع دسترسی پیدا کنید زیرا این حداقل به دسترسی %s برای یک وبسایت نیاز دارید.", + "ExceptionReportNotFound": "گزارش درخواست شده وجود ندارد.", "ExceptionUnableToStartSession": "قادر به شروع جلسه نیست.", "ExceptionUndeletableFile": "غیر قابل حذف %s", + "ExceptionWidgetNotFound": "ویجت درخواست شده وجود ندارد.", "Export": "خروجی گرفتن", "ExportAsImage": "عکس به عنوان خروجی", "ExportThisReport": "این مجموعه داده ها را در قالب های دیگری خروجی بده", @@ -328,6 +330,7 @@ "Seconds": "%sثانیه", "SeeAll": "دیدن همه", "SeeTheOfficialDocumentationForMoreInformation": "برای اطلاعات بیشتر %sمستندات رسمی%s را ببینید.", + "Segment": "سگمنت", "SelectYesIfYouWantToSendEmailsViaServer": "انتخاب \"بله\" اگر شما می خواهید و یا مجبور به ارسال ایمیل از طریق یک سرور به جای تابع ایمیل محلی به نام", "Settings": "تنظيمات", "Shipping": "هزینه پستی", @@ -435,6 +438,7 @@ "ChooseHttpTimeout": "مقدار فاصله را انتخاب کنید HTTP", "ChooseMetric": "معیار را انتخاب کنید", "ChooseReport": "یک گزارش را انتخاب کنید", + "ChooseSegment": "انتخاب سگمنت", "ConfirmRemoveAccount": "آیا شما می خواهیداین حساب را حذف کنید؟", "DefaultReportDate": "تاریخ گزارش", "EmailUs": "به ما ایمیل بزنید", diff --git a/lang/ru.json b/lang/ru.json index f210220727..3cc4177dc2 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -99,7 +99,7 @@ "Date": "Дата", "DateRange": "Временной период:", "DateRangeFrom": "От", - "DateRangeFromTo": "Из %s в %s", + "DateRangeFromTo": "С %s по %s", "DateRangeInPeriodList": "Период", "DateRangeTo": "До", "DayFr": "Пт", diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php index e251e309f7..af9a2d64cd 100644 --- a/libs/PiwikTracker/PiwikTracker.php +++ b/libs/PiwikTracker/PiwikTracker.php @@ -49,8 +49,8 @@ * $t->setIp( "134.10.22.1" ); * $t->setForceVisitDateTime( '2011-04-05 23:55:02' ); * - * // if you wanted to force to record the page view or conversion to a specific visitorId - * // $t->setVisitorId( "33c31e01394bdc63" ); + * // if you wanted to force to record the page view or conversion to a specific User ID + * // $t->setUserId( "username@example.org" ); * // Mandatory: set the URL being tracked * $t->setUrl( $url = 'http://example.org/store/list-category-toys/' ); * @@ -196,6 +196,7 @@ class PiwikTracker $this->configReferralCookieTimeout = 15768000; // 6 months // Visitor Ids in order + $this->userId = false; $this->forcedVisitorId = false; $this->cookieVisitorId = false; $this->randomVisitorId = false; @@ -380,6 +381,7 @@ class PiwikTracker public function setNewVisitorId() { $this->randomVisitorId = substr(md5(uniqid(rand(), true)), 0, self::LENGTH_VISITOR_ID); + $this->userId = false; $this->forcedVisitorId = false; $this->cookieVisitorId = false; } @@ -1020,9 +1022,6 @@ class PiwikTracker * By default, Piwik will create a new visit if the last request by this user was more than 30 minutes ago. * If you call setForceNewVisit() before calling doTrack*, then a new visit will be created for this request. * - * Allowed only for Super User, must be used along with setTokenAuth() - * - * @see setTokenAuth() */ public function setForceNewVisit() { @@ -1042,17 +1041,48 @@ class PiwikTracker } /** - * Forces the requests to be recorded for the specified Visitor ID - * rather than using the heuristics based on IP and other attributes. + * Force the action to be recorded for a specific User. The User ID is a string representing a given user in your system. * - * Allowed only for Admin/Super User, must be used along with setTokenAuth(). + * A User ID can be a username, UUID or an email address, or any number or string that uniquely identifies a user or client. * - * You may set the Visitor ID based on a user attribute, for example the user email: - * $v->setVisitorId( substr(md5( $userEmail ), 0, 16)); + * @param string $userId Any user ID string (eg. email address, ID, username). Must be non empty. Set to false to de-assign a user id previously set. + * @throws Exception + */ + public function setUserId($userId) + { + if($userId === false) { + $this->setNewVisitorId(); + return; + } + if($userId === '') { + throw new Exception("User ID cannot be empty."); + } + $this->userId = $userId; + } + + /** + * Hash function used internally by Piwik to hash a User ID into the Visitor ID. * + * @param $id + * @return string + */ + static public function getUserIdHashed($id) + { + return substr( sha1( $id ), 0, 16); + } + + + /** + * Forces the requests to be recorded for the specified Visitor ID. + * Note: it is recommended to use ->setUserId($userId); instead. + * + * Rather than letting Piwik attribute the user with a heuristic based on IP and other user fingeprinting attributes, + * force the action to be recorded for a particular visitor. + * + * If you use both setVisitorId and setUserId, setUserId will take precedence. * If not set, the visitor ID will be fetched from the 1st party cookie, or will be set to a random UUID. * - * @see setTokenAuth() + * @deprecated We recommend to use ->setUserId($userId). * @param string $visitorId 16 hexadecimal characters visitor ID, eg. "33c31e01394bdc63" * @throws Exception */ @@ -1085,13 +1115,28 @@ class PiwikTracker */ public function getVisitorId() { + if (!empty($this->userId)) { + return $this->getUserIdHashed($this->userId); + } if (!empty($this->forcedVisitorId)) { return $this->forcedVisitorId; - } else if ($this->loadVisitorIdCookie()) { + } + if ($this->loadVisitorIdCookie()) { return $this->cookieVisitorId; - } else { - return $this->randomVisitorId; } + return $this->randomVisitorId; + } + + + /** + * Returns the User ID string, which may have been set via: + * $v->setUserId('username@example.org'); + * + * @return bool + */ + public function getUserId() + { + return $this->userId; } /** @@ -1157,7 +1202,6 @@ class PiwikTracker * The following features require access: * - force the visitor IP * - force the date & time of the tracking requests rather than track for the current datetime - * - force Piwik to track the requests to a specific VisitorId rather than use the standard visitor matching heuristic * * @param string $token_auth token_auth 32 chars token_auth string */ @@ -1404,7 +1448,7 @@ class PiwikTracker // Only allowed for Super User, token_auth required, (!empty($this->ip) ? '&cip=' . $this->ip : '') . - (!empty($this->forcedVisitorId) ? '&cid=' . $this->forcedVisitorId : '&_id=' . $this->getVisitorId()) . + (!empty($this->userId) ? '&uid=' . urlencode($this->userId) : '') . (!empty($this->forcedDatetime) ? '&cdt=' . urlencode($this->forcedDatetime) : '') . (!empty($this->forcedNewVisit) ? '&new_visit=1' : '') . ((!empty($this->token_auth) && !$this->doBulkRequests) ? '&token_auth=' . urlencode($this->token_auth) : '') . @@ -1428,6 +1472,7 @@ class PiwikTracker (!empty($this->pageCustomVar) ? '&cvar=' . urlencode(json_encode($this->pageCustomVar)) : '') . (!empty($this->eventCustomVar) ? '&e_cvar=' . urlencode(json_encode($this->eventCustomVar)) : '') . (!empty($this->generationTime) ? '>_ms=' . ((int)$this->generationTime) : '') . + (!empty($this->forcedVisitorId) ? '&cid=' . $this->forcedVisitorId : '&_id=' . $this->getVisitorId()) . // URL parameters '&url=' . urlencode($this->pageUrl) . diff --git a/misc/composer/build-xhprof.sh b/misc/composer/build-xhprof.sh index 95057dc26e..517d228d0b 100755 --- a/misc/composer/build-xhprof.sh +++ b/misc/composer/build-xhprof.sh @@ -11,6 +11,11 @@ if ! type make &> /dev/null; then exit fi +if ! [ -d "vendor/facebook/xhprof/extension" ]; then + echo "xhprof missing, skipping build" + exit +fi + mkdir -p tmp/xhprof-logs cd vendor/facebook/xhprof/extension diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md index 7842da798a..6c4aadf675 100644 --- a/misc/log-analytics/README.md +++ b/misc/log-analytics/README.md @@ -249,5 +249,19 @@ exec python /path/to/misc/log-analytics/import_logs.py \ --log-format-name=nginx_json - ``` +# regex example for syslog format (centralized logs) + +## log format exemple + +``` +Aug 31 23:59:59 tt-srv-name www.tt.com: 1.1.1.1 - - [31/Aug/2014:23:59:59 +0200] "GET /index.php HTTP/1.0" 200 3838 "http://www.tt.com/index.php" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Firefox/31.0" 365020 www.tt.com +``` + +## Corresponding regex + +``` +--log-format-regex='.* ((?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] "\S+ (?P<path>.*?) \S+" (?P<status>\S+) (?P<length>\S+) "(?P<referrer>.*?)" "(?P<user_agent>.*?)").*' +``` + And that's all ! diff --git a/misc/others/tracker_simpleImageTracker.php b/misc/others/tracker_simpleImageTracker.php index 30f6c2b211..6bcaf21fd1 100644 --- a/misc/others/tracker_simpleImageTracker.php +++ b/misc/others/tracker_simpleImageTracker.php @@ -12,11 +12,11 @@ $trackingURL = Piwik_getUrlTrackPageView($idSite = 16, $customTitle = 'This titl <script type="text/javascript"> var _paq = _paq || []; (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://localhost/piwik-master/"; + var u="//localhost/piwik-master/"; _paq.push(["setTrackerUrl", u+"piwik.php"]); _paq.push(["setSiteId", "16"]); - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; - g.defer=true; g.async=true; g.src=u+"js/piwik.js"; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; + g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code --> diff --git a/misc/package/build.sh b/misc/package/build.sh index 7e3a8557bc..09366b1fa4 100755 --- a/misc/package/build.sh +++ b/misc/package/build.sh @@ -36,15 +36,14 @@ function cleanupWorkspace() { # organize files for packaging function organizePackage() { curl -sS https://getcomposer.org/installer | php - php composer.phar install + php composer.phar install --no-dev cd ../ rm -rf piwik/composer.phar rm -rf piwik/vendor/twig/twig/test/ rm -rf piwik/vendor/twig/twig/doc/ rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Tests rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Resources/bin - rm -rf piwik/vendor/phpunit/ - rm -rf piwik/vendor/sebastian/ + rm -rf piwik/vendor/piwik/device-detector/Tests/ rm -rf piwik/libs/PhpDocumentor-1.3.2/ rm -rf piwik/libs/FirePHPCore/ diff --git a/misc/proxy-hide-piwik-url/README.md b/misc/proxy-hide-piwik-url/README.md index a5344beda3..8c726b20ac 100644 --- a/misc/proxy-hide-piwik-url/README.md +++ b/misc/proxy-hide-piwik-url/README.md @@ -29,11 +29,11 @@ To run this properly you will need ``` [...] (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://trackedsite.com/"; + var u="//trackedsite.com/"; _paq.push(["setTrackerUrl", u+"piwik.php"]); _paq.push(["setSiteId", "trackedsite-id"]); - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; - g.defer=true; g.async=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; + g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code --> @@ -0,0 +1,35 @@ +/*! + * Piwik - free/libre analytics platform + * + * JavaScript tracking client + * + * @link http://piwik.org + * @source https://github.com/piwik/piwik/blob/master/js/piwik.js + * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause + */ +if(typeof JSON2!=="object"){JSON2={}}(function(){function d(f){return f<10?"0"+f:f}function l(n,m){var f=Object.prototype.toString.apply(n);if(f==="[object Date]"){return isFinite(n.valueOf())?n.getUTCFullYear()+"-"+d(n.getUTCMonth()+1)+"-"+d(n.getUTCDate())+"T"+d(n.getUTCHours())+":"+d(n.getUTCMinutes())+":"+d(n.getUTCSeconds())+"Z":null}if(f==="[object String]"||f==="[object Number]"||f==="[object Boolean]"){return n.valueOf()}if(f!=="[object Array]"&&typeof n.toJSON==="function"){return n.toJSON(m)}return n}var c=new RegExp("[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]","g"),e='\\\\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]',i=new RegExp("["+e,"g"),j,b,k={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},h; +function a(f){i.lastIndex=0;return i.test(f)?'"'+f.replace(i,function(m){var n=k[m];return typeof n==="string"?n:"\\u"+("0000"+m.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+f+'"'}function g(s,p){var n,m,t,f,q=j,o,r=p[s];if(r&&typeof r==="object"){r=l(r,s)}if(typeof h==="function"){r=h.call(p,s,r)}switch(typeof r){case"string":return a(r);case"number":return isFinite(r)?String(r):"null";case"boolean":case"null":return String(r);case"object":if(!r){return"null"}j+=b;o=[];if(Object.prototype.toString.apply(r)==="[object Array]"){f=r.length;for(n=0;n<f;n+=1){o[n]=g(n,r)||"null"}t=o.length===0?"[]":j?"[\n"+j+o.join(",\n"+j)+"\n"+q+"]":"["+o.join(",")+"]";j=q;return t}if(h&&typeof h==="object"){f=h.length;for(n=0;n<f;n+=1){if(typeof h[n]==="string"){m=h[n];t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}else{for(m in r){if(Object.prototype.hasOwnProperty.call(r,m)){t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}t=o.length===0?"{}":j?"{\n"+j+o.join(",\n"+j)+"\n"+q+"}":"{"+o.join(",")+"}";j=q; +return t}}if(typeof JSON2.stringify!=="function"){JSON2.stringify=function(o,m,n){var f;j="";b="";if(typeof n==="number"){for(f=0;f<n;f+=1){b+=" "}}else{if(typeof n==="string"){b=n}}h=m;if(m&&typeof m!=="function"&&(typeof m!=="object"||typeof m.length!=="number")){throw new Error("JSON2.stringify")}return g("",{"":o})}}if(typeof JSON2.parse!=="function"){JSON2.parse=function(o,f){var n;function m(s,r){var q,p,t=s[r];if(t&&typeof t==="object"){for(q in t){if(Object.prototype.hasOwnProperty.call(t,q)){p=m(t,q);if(p!==undefined){t[q]=p}else{delete t[q]}}}}return f.call(s,r,t)}o=String(o);c.lastIndex=0;if(c.test(o)){o=o.replace(c,function(p){return"\\u"+("0000"+p.charCodeAt(0).toString(16)).slice(-4)})}if((new RegExp("^[\\],:{}\\s]*$")).test(o.replace(new RegExp('\\\\(?:["\\\\/bfnrt]|u[0-9a-fA-F]{4})',"g"),"@").replace(new RegExp('"[^"\\\\\n\r]*"|true|false|null|-?\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d+)?',"g"),"]").replace(new RegExp("(?:^|:|,)(?:\\s*\\[)+","g"),""))){n=eval("("+o+")"); +return typeof f==="function"?m({"":n},""):n}throw new SyntaxError("JSON2.parse")}}}());if(typeof _paq!=="object"){_paq=[]}if(typeof Piwik!=="object"){Piwik=(function(){var i,a={},s=document,e=navigator,F=screen,C=window,f=C.performance||C.mozPerformance||C.msPerformance||C.webkitPerformance,n=false,A=[],k=C.encodeURIComponent,B=C.decodeURIComponent,g=unescape,G,r,c;function u(R){var Q=typeof R;return Q!=="undefined"}function o(Q){return typeof Q==="function"}function E(Q){return typeof Q==="object"}function l(Q){return typeof Q==="string"||Q instanceof String}function L(){var Q,S,R;for(Q=0;Q<arguments.length;Q+=1){R=arguments[Q];S=R.shift();if(l(S)){G[S].apply(G,R)}else{S.apply(G,R)}}}function O(T,S,R,Q){if(T.addEventListener){T.addEventListener(S,R,Q);return true}if(T.attachEvent){return T.attachEvent("on"+S,R)}T["on"+S]=R}function J(R,U){var Q="",T,S;for(T in a){if(Object.prototype.hasOwnProperty.call(a,T)){S=a[T][R];if(o(S)){Q+=S(U)}}}return Q}function M(){var Q;J("unload");if(i){do{Q=new Date() +}while(Q.getTimeAlias()<i)}}function K(){var Q;if(!n){n=true;J("load");for(Q=0;Q<A.length;Q++){A[Q]()}}return true}function m(){var R;if(s.addEventListener){O(s,"DOMContentLoaded",function Q(){s.removeEventListener("DOMContentLoaded",Q,false);K()})}else{if(s.attachEvent){s.attachEvent("onreadystatechange",function Q(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",Q);K()}});if(s.documentElement.doScroll&&C===C.top){(function Q(){if(!n){try{s.documentElement.doScroll("left")}catch(S){setTimeout(Q,0);return}K()}}())}}}if((new RegExp("WebKit")).test(e.userAgent)){R=setInterval(function(){if(n||/loaded|complete/.test(s.readyState)){clearInterval(R);K()}},10)}O(C,"load",K,false)}function h(S,R){var Q=s.createElement("script");Q.type="text/javascript";Q.src=S;if(Q.readyState){Q.onreadystatechange=function(){var T=this.readyState;if(T==="loaded"||T==="complete"){Q.onreadystatechange=null;R()}}}else{Q.onload=R}s.getElementsByTagName("head")[0].appendChild(Q)}function v(){var Q=""; +try{Q=C.top.document.referrer}catch(S){if(C.parent){try{Q=C.parent.document.referrer}catch(R){Q=""}}}if(Q===""){Q=s.referrer}return Q}function j(Q){var S=new RegExp("^([a-z]+):"),R=S.exec(Q);return R?R[1]:null}function b(Q){var S=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),R=S.exec(Q);return R?R[1]:Q}function D(S,R){var Q="[\\?&#]"+R+"=([^&#]*)";var U=new RegExp(Q);var T=U.exec(S);return T?B(T[1]):""}function q(Q){return g(k(Q))}function N(ag){var S=function(al,W){return(al<<W)|(al>>>(32-W))},ah=function(an){var al="",am,W;for(am=7;am>=0;am--){W=(an>>>(am*4))&15;al+=W.toString(16)}return al},V,aj,ai,R=[],aa=1732584193,Y=4023233417,X=2562383102,U=271733878,T=3285377520,af,ae,ad,ac,ab,ak,Q,Z=[];ag=q(ag);Q=ag.length;for(aj=0;aj<Q-3;aj+=4){ai=ag.charCodeAt(aj)<<24|ag.charCodeAt(aj+1)<<16|ag.charCodeAt(aj+2)<<8|ag.charCodeAt(aj+3);Z.push(ai)}switch(Q&3){case 0:aj=2147483648;break;case 1:aj=ag.charCodeAt(Q-1)<<24|8388608;break;case 2:aj=ag.charCodeAt(Q-2)<<24|ag.charCodeAt(Q-1)<<16|32768; +break;case 3:aj=ag.charCodeAt(Q-3)<<24|ag.charCodeAt(Q-2)<<16|ag.charCodeAt(Q-1)<<8|128;break}Z.push(aj);while((Z.length&15)!==14){Z.push(0)}Z.push(Q>>>29);Z.push((Q<<3)&4294967295);for(V=0;V<Z.length;V+=16){for(aj=0;aj<16;aj++){R[aj]=Z[V+aj]}for(aj=16;aj<=79;aj++){R[aj]=S(R[aj-3]^R[aj-8]^R[aj-14]^R[aj-16],1)}af=aa;ae=Y;ad=X;ac=U;ab=T;for(aj=0;aj<=19;aj++){ak=(S(af,5)+((ae&ad)|(~ae&ac))+ab+R[aj]+1518500249)&4294967295;ab=ac;ac=ad;ad=S(ae,30);ae=af;af=ak}for(aj=20;aj<=39;aj++){ak=(S(af,5)+(ae^ad^ac)+ab+R[aj]+1859775393)&4294967295;ab=ac;ac=ad;ad=S(ae,30);ae=af;af=ak}for(aj=40;aj<=59;aj++){ak=(S(af,5)+((ae&ad)|(ae&ac)|(ad&ac))+ab+R[aj]+2400959708)&4294967295;ab=ac;ac=ad;ad=S(ae,30);ae=af;af=ak}for(aj=60;aj<=79;aj++){ak=(S(af,5)+(ae^ad^ac)+ab+R[aj]+3395469782)&4294967295;ab=ac;ac=ad;ad=S(ae,30);ae=af;af=ak}aa=(aa+af)&4294967295;Y=(Y+ae)&4294967295;X=(X+ad)&4294967295;U=(U+ac)&4294967295;T=(T+ab)&4294967295}ak=ah(aa)+ah(Y)+ah(X)+ah(U)+ah(T);return ak.toLowerCase()}function I(S,Q,R){if(S==="translate.googleusercontent.com"){if(R===""){R=Q +}Q=D(Q,"u");S=b(Q)}else{if(S==="cc.bingj.com"||S==="webcache.googleusercontent.com"||S.slice(0,5)==="74.6."){Q=s.links[0].href;S=b(Q)}}return[S,Q,R]}function w(R){var Q=R.length;if(R.charAt(--Q)==="."){R=R.slice(0,Q)}if(R.slice(0,2)==="*."){R=R.slice(1)}return R}function P(R){R=R&&R.text?R.text:R;if(!l(R)){var Q=s.getElementsByTagName("title");if(Q&&u(Q[0])){R=Q[0].text}}return R}function y(Q,R){if(R){return R}if(Q.slice(-9)==="piwik.php"){Q=Q.slice(0,Q.length-9)}return Q}function x(U){var Q="Piwik_Overlay";var X=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)$");var S=X.exec(s.referrer);if(S){var T=S[1];if(T!==String(U)){return false}var W=S[2],R=S[3];C.name=Q+"###"+W+"###"+R}var V=C.name.split("###");return V.length===3&&V[0]===Q}function H(R,W,T){var V=C.name.split("###"),U=V[1],Q=V[2],S=y(R,W);h(S+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(S,T,U,Q)})}function z(ap,aU){var W=I(s.domain,C.location.href,v()),bf=w(W[0]),bu=W[1],a2=W[2],bv=false,aY="GET",a0=aY,aM="application/x-www-form-urlencoded; charset=UTF-8",av=aM,U=ap||"",am="",aW="",bk=aU||"",au="",aK,az=s.title,aB="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip",aX=[bf],Z=[],aP=[],ao=[],aV=500,aa,aq,ab,ae,aD=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],ay=["pk_kwd","piwik_kwd","utm_term"],bs="_pk_",ag,bt,af=false,bn,aF,aI,al=63072000000,an=1800000,aL=15768000000,aG=true,at=0,aJ=false,Y=false,aj,aQ={},V={},bo=200,a8={},bl={},a5=false,a3=false,a1,aR,ah,aC=N,a4,aH; +function ba(bE,bB,bA,bD,bz,bC){if(af){return}var by;if(bA){by=new Date();by.setTime(by.getTime()+bA)}s.cookie=bE+"="+k(bB)+(bA?";expires="+by.toGMTString():"")+";path="+(bD||"/")+(bz?";domain="+bz:"")+(bC?";secure":"")}function ak(bA){if(af){return 0}var by=new RegExp("(^|;)[ ]*"+bA+"=([^;]*)"),bz=by.exec(s.cookie);return bz?B(bz[2]):0}function bp(by){var bz;if(ab){bz=new RegExp("#.*");return by.replace(bz,"")}return by}function be(bA,by){var bB=j(by),bz;if(bB){return by}if(by.slice(0,1)==="/"){return j(bA)+"://"+b(bA)+by}bA=bp(bA);bz=bA.indexOf("?");if(bz>=0){bA=bA.slice(0,bz)}bz=bA.lastIndexOf("/");if(bz!==bA.length-1){bA=bA.slice(0,bz+1)}return bA+by}function aZ(bB){var bz,by,bA;for(bz=0;bz<aX.length;bz++){by=w(aX[bz].toLowerCase());if(bB===by){return true}if(by.slice(0,1)==="."){if(bB===by.slice(1)){return true}bA=bB.length-by.length;if((bA>0)&&(bB.slice(bA)===by)){return true}}}return false}function bx(by,bA){var bz=new Image(1,1);bz.onload=function(){r=0;if(typeof bA==="function"){bA() +}};bz.src=U+(U.indexOf("?")<0?"?":"&")+by}function bb(by,bB){try{var bA=C.XMLHttpRequest?new C.XMLHttpRequest():C.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;bA.open("POST",U,true);bA.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){bx(by,bB)}else{if(typeof bB==="function"){bB()}}};bA.setRequestHeader("Content-Type",av);bA.send(by)}catch(bz){bx(by,bB)}}function aE(bA,bz,bB){var by=new Date();if(!bn){if(a0==="POST"){bb(bA,bB)}else{bx(bA,bB)}i=by.getTime()+bz}}function a9(by){return bs+by+"."+bk+"."+a4}function X(){if(af){return"0"}if(!u(e.cookieEnabled)){var by=a9("testcookie");ba(by,"1");return ak(by)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function aS(){a4=aC((ag||bf)+(bt||"/")).slice(0,4)}function ai(){var bz=a9("cvar"),by=ak(bz);if(by.length){by=JSON2.parse(by);if(E(by)){return by}}return{}}function T(){if(Y===false){Y=ai()}}function bj(){var by=new Date();a1=by.getTime()}function ad(bC,bz,by,bB,bA,bD){ba(a9("id"),bC+"."+bz+"."+by+"."+bB+"."+bA+"."+bD,al,bt,ag) +}function S(){var bz=new Date(),by=Math.round(bz.getTime()/1000),bB=ak(a9("id")),bA;if(bB){bA=bB.split(".");bA.unshift("0")}else{if(!aH){aH=aC((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bl)+bz.getTime()+Math.random()).slice(0,16)}bA=["1",aH,by,0,by,"",""]}return bA}function R(){var by=ak(a9("ref"));if(by.length){try{by=JSON2.parse(by);if(E(by)){return by}}catch(bz){}}return["","",0,""]}function Q(){var by=af;af=false;ba(a9("id"),"",-86400,bt,ag);ba(a9("ses"),"",-86400,bt,ag);ba(a9("cvar"),"",-86400,bt,ag);ba(a9("ref"),"",-86400,bt,ag);af=by}function bi(bC){if(!bC||!E(bC)){return}var bB=[];var bA;for(bA in bC){if(Object.prototype.hasOwnProperty.call(bC,bA)){bB.push(bA)}}var bD={};bB.sort();var by=bB.length;var bz;for(bz=0;bz<by;bz++){bD[bB[bz]]=bC[bB[bz]]}return bD}function aA(bA,bY,bZ,bB){var bW,bz=new Date(),bI=Math.round(bz.getTime()/1000),b2,bX,bD,bO,bT,bH,bR,bE,bV,bC=1024,b4,bL,bS=Y,bJ=a9("ses"),bK=a9("ref"),b5=a9("cvar"),bP=S(),bN=ak(bJ),bU=R(),b1=aK||bu,bF,by;if(af){Q()}if(bn){return"" +}b2=bP[0];bX=bP[1];bO=bP[2];bD=bP[3];bT=bP[4];bH=bP[5];if(!u(bP[6])){bP[6]=""}bR=bP[6];if(!u(bB)){bB=""}var bM=s.characterSet||s.charset;if(!bM||bM.toLowerCase()==="utf-8"){bM=null}bF=bU[0];by=bU[1];bE=bU[2];bV=bU[3];if(!bN){var b0=an/1000;if(!bH||(bI-bH)>b0){bD++;bH=bT}if(!aI||!bF.length){for(bW in aD){if(Object.prototype.hasOwnProperty.call(aD,bW)){bF=D(b1,aD[bW]);if(bF.length){break}}}for(bW in ay){if(Object.prototype.hasOwnProperty.call(ay,bW)){by=D(b1,ay[bW]);if(by.length){break}}}}b4=b(a2);bL=bV.length?b(bV):"";if(b4.length&&!aZ(b4)&&(!aI||!bL.length||aZ(bL))){bV=a2}if(bV.length||bF.length){bE=bI;bU=[bF,by,bE,bp(bV.slice(0,bC))];ba(bK,JSON2.stringify(bU),aL,bt,ag)}}bA+="&idsite="+bk+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+bz.getHours()+"&m="+bz.getMinutes()+"&s="+bz.getSeconds()+"&url="+k(bp(b1))+(a2.length?"&urlref="+k(bp(a2)):"")+(au.length?"&uid="+k(au):"")+"&_id="+bX+"&_idts="+bO+"&_idvc="+bD+"&_idn="+b2+(bF.length?"&_rcn="+k(bF):"")+(by.length?"&_rck="+k(by):"")+"&_refts="+bE+"&_viewts="+bH+(String(bR).length?"&_ects="+bR:"")+(String(bV).length?"&_ref="+k(bp(bV.slice(0,bC))):"")+(bM?"&cs="+k(bM):""); +for(bW in bl){if(Object.prototype.hasOwnProperty.call(bl,bW)){bA+="&"+bW+"="+bl[bW]}}if(bY){bA+="&data="+k(JSON2.stringify(bY))}else{if(ae){bA+="&data="+k(JSON2.stringify(ae))}}function bG(b6,b7){var b8=JSON2.stringify(b6);if(b8.length>2){return"&"+b7+"="+k(b8)}return""}var b3=bi(aQ);var bQ=bi(V);bA+=bG(b3,"cvar");bA+=bG(bQ,"e_cvar");if(Y){bA+=bG(Y,"_cvar");for(bW in bS){if(Object.prototype.hasOwnProperty.call(bS,bW)){if(Y[bW][0]===""||Y[bW][1]===""){delete Y[bW]}}}if(aJ){ba(b5,JSON2.stringify(Y),an,bt,ag)}}if(aG){if(at){bA+=">_ms="+at}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){bA+=">_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}ad(bX,bO,bD,bI,bH,u(bB)&&String(bB).length?bB:bR);ba(bJ,"*",an,bt,ag);bA+=J(bZ);if(aW.length){bA+="&"+aW}if(o(aj)){bA=aj(bA)}return bA}function bd(bB,bA,bF,bC,by,bI){var bD="idgoal=0",bE,bz=new Date(),bG=[],bH;if(String(bB).length){bD+="&ec_id="+k(bB);bE=Math.round(bz.getTime()/1000)}bD+="&revenue="+bA;if(String(bF).length){bD+="&ec_st="+bF +}if(String(bC).length){bD+="&ec_tx="+bC}if(String(by).length){bD+="&ec_sh="+by}if(String(bI).length){bD+="&ec_dt="+bI}if(a8){for(bH in a8){if(Object.prototype.hasOwnProperty.call(a8,bH)){if(!u(a8[bH][1])){a8[bH][1]=""}if(!u(a8[bH][2])){a8[bH][2]=""}if(!u(a8[bH][3])||String(a8[bH][3]).length===0){a8[bH][3]=0}if(!u(a8[bH][4])||String(a8[bH][4]).length===0){a8[bH][4]=1}bG.push(a8[bH])}}bD+="&ec_items="+k(JSON2.stringify(bG))}bD=aA(bD,ae,"ecommerce",bE);aE(bD,aV)}function bc(by,bC,bB,bA,bz,bD){if(String(by).length&&u(bC)){bd(by,bC,bB,bA,bz,bD)}}function br(by){if(u(by)){bd("",by,"","","","")}}function aO(bB,bC){var by=new Date(),bA=aA("action_name="+k(P(bB||az)),bC,"log");aE(bA,aV);if(aa&&aq&&!a3){a3=true;O(s,"click",bj);O(s,"mouseup",bj);O(s,"mousedown",bj);O(s,"mousemove",bj);O(s,"mousewheel",bj);O(C,"DOMMouseScroll",bj);O(C,"scroll",bj);O(s,"keypress",bj);O(s,"keydown",bj);O(s,"keyup",bj);O(C,"resize",bj);O(C,"focus",bj);O(C,"blur",bj);a1=by.getTime();setTimeout(function bz(){var bD;by=new Date(); +if((a1+aq)>by.getTime()){if(aa<by.getTime()){bD=aA("ping=1",bC,"ping");aE(bD,aV)}setTimeout(bz,aq)}},aq)}}function ac(bA,bC,by,bB,bD){if(String(bA).length===0||String(bC).length===0){return false}var bz=aA("e_c="+k(bA)+"&e_a="+k(bC)+(u(by)?"&e_n="+k(by):"")+(u(bB)?"&e_v="+k(bB):""),bD,"event");aE(bz,aV)}function ax(by,bB,bz,bC){var bA=aA("search="+k(by)+(bB?"&search_cat="+k(bB):"")+(u(bz)?"&search_count="+bz:""),bC,"sitesearch");aE(bA,aV)}function aT(by,bB,bA){var bz=aA("idgoal="+by+(bB?"&revenue="+bB:""),bA,"goal");aE(bz,aV)}function bh(bz,by,bC,bB){var bA=aA(by+"="+k(bp(bz)),bC,"link");aE(bA,(bB?0:aV),bB)}function bm(bz,by){if(bz!==""){return bz+by.charAt(0).toUpperCase()+by.slice(1)}return by}function aw(bD){var bC,by,bB=["","webkit","ms","moz"],bA;if(!aF){for(by=0;by<bB.length;by++){bA=bB[by];if(Object.prototype.hasOwnProperty.call(s,bm(bA,"hidden"))){if(s[bm(bA,"visibilityState")]==="prerender"){bC=true}break}}}if(bC){O(s,bA+"visibilitychange",function bz(){s.removeEventListener(bA+"visibilitychange",bz,false); +bD()});return}bD()}function ar(bA,bz){var bB,by="(^| )(piwik[_-]"+bz;if(bA){for(bB=0;bB<bA.length;bB++){by+="|"+bA[bB]}}by+=")( |$)";return new RegExp(by)}function bg(bB,by,bC){var bA=ar(aP,"download"),bz=ar(ao,"link"),bD=new RegExp("\\.("+aB+")([?&#]|$)","i");return bz.test(bB)?"link":(bA.test(bB)||bD.test(by)?"download":(bC?0:"link"))}function a7(bD){var bB,bz,by;bB=bD.parentNode;while(bB!==null&&u(bB)){bz=bD.tagName.toUpperCase();if(bz==="A"||bz==="AREA"){break}bD=bB;bB=bD.parentNode}if(u(bD.href)){var bE=bD.hostname||b(bD.href),bF=bE.toLowerCase(),bA=bD.href.replace(bE,bF),bC=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bC.test(bA)){by=bg(bD.className,bA,aZ(bF));if(by){bA=g(bA);bh(bA,by)}}}}function bw(by){var bz,bA;by=by||C.event;bz=by.which||by.button;bA=by.target||by.srcElement;if(by.type==="click"){if(bA){a7(bA)}}else{if(by.type==="mousedown"){if((bz===1||bz===2)&&bA){aR=bz;ah=bA}else{aR=ah=null}}else{if(by.type==="mouseup"){if(bz===aR&&bA===ah){a7(bA) +}aR=ah=null}}}}function a6(bz,by){if(by){O(bz,"mouseup",bw,false);O(bz,"mousedown",bw,false)}else{O(bz,"click",bw,false)}}function aN(bz){if(!a5){a5=true;var bA,by=ar(Z,"ignore"),bB=s.links;if(bB){for(bA=0;bA<bB.length;bA++){if(!by.test(bB[bA].className)){a6(bB[bA],bz)}}}}}function bq(){var bz,bA,bB={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"},by=(new RegExp("Mac OS X.*Safari/")).test(e.userAgent)?C.devicePixelRatio||1:1;if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(bz in bB){if(Object.prototype.hasOwnProperty.call(bB,bz)){bA=e.mimeTypes[bB[bz]];bl[bz]=(bA&&bA.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&u(e.javaEnabled)&&e.javaEnabled()){bl.java="1"}if(o(C.GearsFactory)){bl.gears="1"}bl.cookie=X()}bl.res=F.width*by+"x"+F.height*by +}bq();aS();return{getVisitorId:function(){return(S())[1]},getVisitorInfo:function(){return S()},getAttributionInfo:function(){return R()},getAttributionCampaignName:function(){return R()[0]},getAttributionCampaignKeyword:function(){return R()[1]},getAttributionReferrerTimestamp:function(){return R()[2]},getAttributionReferrerUrl:function(){return R()[3]},setTrackerUrl:function(by){U=by},setSiteId:function(by){bk=by},setUserId:function(by){au=by},setCustomData:function(by,bz){if(E(by)){ae=by}else{if(!ae){ae=[]}ae[by]=bz}},getCustomData:function(){return ae},setCustomRequestProcessing:function(by){aj=by},appendToTrackingUrl:function(by){aW=by},getRequest:function(by){return aA(by)},addPlugin:function(by,bz){a[by]=bz},setCustomVariable:function(bz,by,bC,bA){var bB;if(!u(bA)){bA="visit"}if(!u(by)){return}if(!u(bC)){bC=""}if(bz>0){by=!l(by)?String(by):by;bC=!l(bC)?String(bC):bC;bB=[by.slice(0,bo),bC.slice(0,bo)];if(bA==="visit"||bA===2){T();Y[bz]=bB}else{if(bA==="page"||bA===3){aQ[bz]=bB}else{if(bA==="event"){V[bz]=bB +}}}}},getCustomVariable:function(bz,bA){var by;if(!u(bA)){bA="visit"}if(bA==="page"||bA===3){by=aQ[bz]}else{if(bA==="event"){by=V[bz]}else{if(bA==="visit"||bA===2){T();by=Y[bz]}}}if(!u(by)||(by&&by[0]==="")){return false}return by},deleteCustomVariable:function(by,bz){if(this.getCustomVariable(by,bz)){this.setCustomVariable(by,"","",bz)}},storeCustomVariablesInCookie:function(){aJ=true},setLinkTrackingTimer:function(by){aV=by},setDownloadExtensions:function(by){aB=by},addDownloadExtensions:function(by){aB+="|"+by},setDomains:function(by){aX=l(by)?[by]:by;aX.push(bf)},setIgnoreClasses:function(by){Z=l(by)?[by]:by},setRequestMethod:function(by){a0=by||aY},setRequestContentType:function(by){av=by||aM},setReferrerUrl:function(by){a2=by},setCustomUrl:function(by){aK=be(bu,by)},setDocumentTitle:function(by){az=by},setAPIUrl:function(by){am=by},setDownloadClasses:function(by){aP=l(by)?[by]:by},setLinkClasses:function(by){ao=l(by)?[by]:by},setCampaignNameKey:function(by){aD=l(by)?[by]:by},setCampaignKeywordKey:function(by){ay=l(by)?[by]:by +},discardHashTag:function(by){ab=by},setCookieNamePrefix:function(by){bs=by;Y=ai()},setCookieDomain:function(by){ag=w(by);aS()},setCookiePath:function(by){bt=by;aS()},setVisitorCookieTimeout:function(by){al=by*1000},setSessionCookieTimeout:function(by){an=by*1000},setReferralCookieTimeout:function(by){aL=by*1000},setConversionAttributionFirstReferrer:function(by){aI=by},disableCookies:function(){af=true;bl.cookie="0"},deleteCookies:function(){Q()},setDoNotTrack:function(bz){var by=e.doNotTrack||e.msDoNotTrack;bn=bz&&(by==="yes"||by==="1");if(bn){this.disableCookies()}},addListener:function(bz,by){a6(bz,by)},enableLinkTracking:function(by){if(n){aN(by)}else{A.push(function(){aN(by)})}},enableJSErrorTracking:function(){if(bv){return}bv=true;var by=C.onerror;C.onerror=function(bD,bB,bA,bC,bz){aw(function(){var bE="JavaScript Errors";var bF=bB+":"+bA;if(bC){bF+=":"+bC}ac(bE,bF,bD)});if(by){return by(bD,bB,bA,bC,bz)}return false}},disablePerformanceTracking:function(){aG=false},setGenerationTimeMs:function(by){at=parseInt(by,10) +},setHeartBeatTimer:function(bA,bz){var by=new Date();aa=by.getTime()+bA*1000;aq=bz*1000},killFrame:function(){if(C.location!==C.top.location){C.top.location=C.location}},redirectFile:function(by){if(C.location.protocol==="file:"){C.location=by}},setCountPreRendered:function(by){aF=by},trackGoal:function(by,bA,bz){aw(function(){aT(by,bA,bz)})},trackLink:function(bz,by,bB,bA){aw(function(){bh(bz,by,bB,bA)})},trackPageView:function(by,bz){if(x(bk)){aw(function(){H(U,am,bk)})}else{aw(function(){aO(by,bz)})}},trackEvent:function(bz,bB,by,bA){aw(function(){ac(bz,bB,by,bA)})},trackSiteSearch:function(by,bA,bz){aw(function(){ax(by,bA,bz)})},setEcommerceView:function(bB,by,bA,bz){if(!u(bA)||!bA.length){bA=""}else{if(bA instanceof Array){bA=JSON2.stringify(bA)}}aQ[5]=["_pkc",bA];if(u(bz)&&String(bz).length){aQ[2]=["_pkp",bz]}if((!u(bB)||!bB.length)&&(!u(by)||!by.length)){return}if(u(bB)&&bB.length){aQ[3]=["_pks",bB]}if(!u(by)||!by.length){by=""}aQ[4]=["_pkn",by]},addEcommerceItem:function(bC,by,bA,bz,bB){if(bC.length){a8[bC]=[bC,by,bA,bz,bB] +}},trackEcommerceOrder:function(by,bC,bB,bA,bz,bD){bc(by,bC,bB,bA,bz,bD)},trackEcommerceCartUpdate:function(by){br(by)}}}function t(){return{push:L}}O(C,"beforeunload",M,false);m();Date.prototype.getTimeAlias=Date.prototype.getTime;G=new z();var p={setTrackerUrl:1,setAPIUrl:1,setSiteId:1,disableCookies:1};var d;for(r=0;r<_paq.length;r++){d=_paq[r][0];if(p[d]){L(_paq[r]);delete _paq[r];if(p[d]>1){if(console!==undefined&&console&&console.error){console.error("The method "+d+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/api-reference/tracking-javascript#multiple-piwik-trackers')}}p[d]++}}for(r=0;r<_paq.length;r++){if(_paq[r]){L(_paq[r])}}_paq=new t();c={addPlugin:function(Q,R){a[Q]=R},getTracker:function(Q,R){return new z(Q,R)},getAsyncTracker:function(){return G}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit() +}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; +/*! @license-end */ +};
\ No newline at end of file diff --git a/plugins/API/API.php b/plugins/API/API.php index e499a706b7..fd22791a2c 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -154,6 +154,20 @@ class API extends \Piwik\Plugin\API $segments[] = array( 'type' => 'dimension', 'category' => Piwik::translate('General_Visit'), + 'name' => 'General_UserId', + 'segment' => 'userId', + 'acceptedValues' => 'any non empty unique string identifying the user (such as an email address or a username).', + 'sqlSegment' => 'log_visit.idvisitor', + 'sqlFilterValue' => array('Piwik\Common', 'convertUserIdToVisitorIdBin'), + 'permission' => $isAuthenticatedWithViewAccess, + + // TODO specify that this segment is not compatible with some operators +// 'unsupportedOperators' = array(MATCH_CONTAINS, MATCH_DOES_NOT_CONTAIN), + ); + + $segments[] = array( + 'type' => 'dimension', + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_VisitorID', 'segment' => 'visitorId', 'acceptedValues' => '34c31e04394bdc63 - any 16 Hexadecimal chars ID, which can be fetched using the Tracking API function getVisitorId()', @@ -161,6 +175,7 @@ class API extends \Piwik\Plugin\API 'sqlFilterValue' => array('Piwik\Common', 'convertVisitorIdToBin'), 'permission' => $isAuthenticatedWithViewAccess, ); + $segments[] = array( 'type' => 'dimension', 'category' => Piwik::translate('General_Visit'), diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php index 0020ecf1c4..b01c686ac0 100644 --- a/plugins/API/Menu.php +++ b/plugins/API/Menu.php @@ -26,7 +26,7 @@ class Menu extends \Piwik\Plugin\Menu public function configureUserMenu(MenuUser $menu) { - $apiUrlParams = array('module' => 'API', 'action' => 'listAllAPI', 'segment' => false); + $apiUrlParams = $this->urlForAction('listAllAPI', array('segment' => false)); $tooltip = Piwik::translate('API_TopLinkTooltip'); $menu->addPlatformItem('General_API', $apiUrlParams, 6, $tooltip); @@ -45,8 +45,14 @@ class Menu extends \Piwik\Plugin\Menu $ua = new OperatingSystem($_SERVER['HTTP_USER_AGENT']); $ua->setCache(new DeviceDetectorCache('tracker', 86400)); $parsedOS = $ua->parse(); + if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) { - $menu->add('Piwik Mobile App', null, array('module' => 'Proxy', 'action' => 'redirect', 'url' => 'http://piwik.org/mobile/'), true, 4); + + $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'http://piwik.org/mobile/')); + + if ($url) { + $menu->addItem('Piwik Mobile App', null, $url, 4); + } } } diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index e174d3e4a4..418ef4a30a 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -39,8 +39,10 @@ class ProcessedReport foreach ($reportsMetadata as $report) { // See ArchiveProcessor/Aggregator.php - unique visitors are not processed for period != day + // todo: should use SettingsPiwik::isUniqueVisitorsEnabled instead if (($period && $period != 'day') && !($apiModule == 'VisitsSummary' && $apiAction == 'get')) { unset($report['metrics']['nb_uniq_visitors']); + unset($report['metrics']['nb_users']); } if ($report['module'] == $apiModule && $report['action'] == $apiAction diff --git a/plugins/Actions/Menu.php b/plugins/Actions/Menu.php index 8804fabe0d..e9ce436b75 100644 --- a/plugins/Actions/Menu.php +++ b/plugins/Actions/Menu.php @@ -14,16 +14,11 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $urlParams = array( - 'module' => 'Actions', - 'action' => 'menuGetPageUrls' - ); - - $menu->addActionsItem('', $urlParams, 15); + $menu->addActionsItem('', $this->urlForAction('menuGetPageUrls'), 15); $actions = new Actions(); if ($actions->isSiteSearchEnabled()) { - $menu->addActionsItem('Actions_SubmenuSitesearch', array('module' => 'Actions', 'action' => 'indexSiteSearch'), 5); + $menu->addActionsItem('Actions_SubmenuSitesearch', $this->urlForAction('indexSiteSearch'), 5); } } diff --git a/plugins/Actions/lang/cs.json b/plugins/Actions/lang/cs.json index 49e5ab193d..4c07889cd4 100644 --- a/plugins/Actions/lang/cs.json +++ b/plugins/Actions/lang/cs.json @@ -30,7 +30,7 @@ "EntryPageTitles": "Titulky vstupních stránek", "EntryPageTitlesReportDocumentation": "Toto hlášení obsahuje informace o titulcích vstupních stránek, které byly použity v daném období.", "ExitPagesReportDocumentation": "Toto hlášení obsahuje informace o výstupních stránkách, které se vyskytly v daném období. Výstupní stránka je poslední stránkou, kterou uživatel zobrazí během své návštěvy. %s URL výstupních stránek jsou zobrazeny jako strom složek.", - "ExitPageTitles": "Výstupní titulky stránky", + "ExitPageTitles": "Titulky výstupních stránek", "ExitPageTitlesReportDocumentation": "Toto hlášení obsahuje informace o titulcích výstupních stránek za dané období.", "LearnMoreAboutSiteSearchLink": "Zjistěte více o sledování toho, jak návštěvníci používaí váš vyhledávač.", "OneSearch": "1 Vyhledávání", diff --git a/plugins/Actions/lang/ja.json b/plugins/Actions/lang/ja.json index 7a36ada7ca..0319b5aa8a 100644 --- a/plugins/Actions/lang/ja.json +++ b/plugins/Actions/lang/ja.json @@ -1,5 +1,6 @@ { "Actions": { + "AvgGenerationTimeTooltip": "%s ～ %s の間の %s のヒット %s に基づく平均", "ColumnClickedURL": "クリックされた URL", "ColumnClicks": "クリック数", "ColumnClicksDocumentation": "このリンクがクリックされた回数", diff --git a/plugins/Actions/lang/ru.json b/plugins/Actions/lang/ru.json index 58e6c906a3..f47d056517 100644 --- a/plugins/Actions/lang/ru.json +++ b/plugins/Actions/lang/ru.json @@ -42,6 +42,7 @@ "SiteSearchCategories2": "Например, сайты электронной коммерции обычно имеют выбор `Категорий` товаровуслуг, чтобы посетителям было удобно их сортировать и искать.", "SiteSearchFollowingPagesDoc": "Когда посетители ищут что-то на вашем сайте, они хотят найти определенную страницу, контент, продукт или услугу. Этот отчет отображает страницы, по которым посетители кликают наиболее часто при поиске. Иными словами, это список страниц, которые ищутся наиболее часто на вашем сайте.", "SiteSearchIntro": "Отслеживание поиска на вашем сайте - эффективный способ узнать, чем именно интересуется ваша аудитория. Это может помочь найти идеи для нового контента, новых продуктов и улучшить взаимодействие посетителей с вашим сайта в целом.", + "SiteSearchKeyword": "Ключевое слово (поиск по сайту)", "SiteSearchKeywordsDocumentation": "Эти отчет показывает список ключевых слов, которые посетители искали на вашем сайте через ваш поиск.", "SiteSearchKeywordsNoResultDocumentation": "Этот отчет отображает список ключевых слов, по которым не было ничего найдено на вашем сайте: возможно, стоит улучшить поисковый алгоритм на вашем сайте или посетители ищут то, чего на вашем сайте нет?", "SubmenuPagesEntry": "Страницы входа", diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index a150e944c6..6b672d07e8 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -259,11 +259,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin ? $language : LanguagesManager::getLanguageCodeForCurrentUser(); - return $this->renderTemplate('outOut', array( - 'trackVisits' => $trackVisits, - 'nonce' => Nonce::getNonce('Piwik_OptOut', 3600), - 'language' => $lang - )); + // should not use self::renderTemplate since that uses setBasicVariablesView. this will cause + // an error when setBasicVariablesAdminView is called, and MenuTop is requested (the idSite query + // parameter is required) + $view = new View("@CoreAdminHome/optOut"); + $view->setXFrameOptions('allow'); + $view->trackVisits = $trackVisits; + $view->nonce = Nonce::getNonce('Piwik_OptOut', 3600); + $view->language = $lang; + return $view->render(); } public function uploadCustomLogo() diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php index 368a470fff..7926ff9cf5 100644 --- a/plugins/CoreAdminHome/Menu.php +++ b/plugins/CoreAdminHome/Menu.php @@ -27,16 +27,16 @@ class Menu extends \Piwik\Plugin\Menu $menu->addDevelopmentItem(null, "", $order = 15); $menu->addSettingsItem('CoreAdminHome_MenuGeneralSettings', - array('module' => 'CoreAdminHome', 'action' => 'generalSettings'), + $this->urlForAction('generalSettings'), $order = 6); $menu->addManageItem('CoreAdminHome_TrackingCode', - array('module' => 'CoreAdminHome', 'action' => 'trackingCodeGenerator'), + $this->urlForAction('trackingCodeGenerator'), $order = 4); } if (SettingsManager::hasPluginsSettingsForCurrentUser()) { $menu->addSettingsItem('CoreAdminHome_PluginSettings', - array('module' => 'CoreAdminHome', 'action' => 'pluginSettings'), + $this->urlForAction('pluginSettings'), $order = 7); } } diff --git a/plugins/CoreAdminHome/lang/fa.json b/plugins/CoreAdminHome/lang/fa.json index ff0bbcccbf..ca13edcb5b 100644 --- a/plugins/CoreAdminHome/lang/fa.json +++ b/plugins/CoreAdminHome/lang/fa.json @@ -1,6 +1,7 @@ { "CoreAdminHome": { "Administration": "مدیریت", + "ArchivingSettings": "تنظیمات بایگانی", "BrandingSettings": "تنظیمات نام تجاری", "CheckReleaseGetVersion": "زمانی که برای نسخه جدید پیویک چک میکنید , همیشه ان را بگیرید", "ClickHereToOptIn": "اینجا را کلیک کنید تا انتخاب شوید.", @@ -8,6 +9,7 @@ "CustomLogoFeedbackInfo": "اگر شما آرم پیویک را سفارشی کنید , شاید برایتان جالب باشد که لینک %s را در منوی بالایی پنهان کنید.برای این کار شما می توانید افزونه ی بازخورد را در صفحه %sمدیریت افزونه ها%s غیرفعال کنید.", "CustomLogoHelpText": "شما می توانید آرم Piwik سفارشی است که در رابط کاربری و گزارش پست الکترونیک نمایش داده خواهد شد.", "EmailServerSettings": "تنضیمات میل سرور", + "FaviconUpload": "یک Favicon انتخاب کنید تا آپلود شود.", "ForBetaTestersOnly": "فقط برای استفاده کنندهای موقطی", "ImageTracking": "ردیابی تصویر", "ImageTrackingIntro1": "زمانی که مشاهده کنندگان جاوا اسکریپت رو غیر فعال کنند , یا از جاوا اسکریپت استفاده نکنند , شما میتونید از عکس اسفاده کنید و لینک را به یازدید کننده بدهید.", @@ -46,6 +48,7 @@ "PluginSettings": "تنظیمات افزونه ها", "PluginSettingsIntro": "در اینجا شما می توانید تغییراتی در تنظیمات پلاگین های زیر انجام دهید :", "PluginSettingsValueNotAllowed": "مقدار این رشته \"%s\" در پلاگین \"%s\" مورد قبول نیست", + "SendPluginUpdateCommunication": "زمانی که یک بروزرسانی از پلاگین وجود داشت برای من یک ایمیل بفرست", "TrackAGoal": "به دنبال یک هدف", "TrackingCode": "کد ردیابی", "TrustedHostConfirm": "آیا از تغییر نام هاست مورد اعتماد پیویک اطمینان دارید؟", diff --git a/plugins/CoreAdminHome/lang/ja.json b/plugins/CoreAdminHome/lang/ja.json index e86484f3c0..98153e42d2 100644 --- a/plugins/CoreAdminHome/lang/ja.json +++ b/plugins/CoreAdminHome/lang/ja.json @@ -11,6 +11,7 @@ "DevelopmentProcess": "私たちの%s開発プロセス%sは自動化された数千のテストを含んでいますが、ベータテスターはPiwikの\"No bug policy\"達成のための重要な役割を果たしています。", "EmailServerSettings": "メールサーバの設定", "FaviconUpload": "アップロードするファビコンを選択", + "FileUploadDisabled": "PHP の設定で、ファイルのアップロードが有効になっていません。カスタムロゴをアップロードするには、 php.ini で %s を設定し、 Web サーバを再起動してください。", "ForBetaTestersOnly": "ベータテスターのみ", "ImageTracking": "画像によるトラッキング", "ImageTrackingIntro1": "訪問者がJavaScriptを無効にしている、またはJavaScriptを利用できない場合、訪問者を追跡する為に画像でトラッキングするリンクを使うことができます。", @@ -19,6 +20,8 @@ "ImageTrackingLink": "画像によるトラッキングのリンク", "ImportingServerLogs": "サーバーログのインポート", "ImportingServerLogsDesc": "ブラウザ（JavaScriptまたは画像リンクによる）を通して訪問者を追跡するのでは無く、継続的にサーバーのログをインポートします。%1$sサーバーログファイル解析%2$sの詳細はこちら。", + "InvalidPluginsWarning": "以下のプラグインは、 %1$s と互換性がないためロードできませんでした。 :%2$s.", + "InvalidPluginsYouCanUninstall": "これらのプラグインは、 %1$sManage Plugins%2$s ページでアップデートまたはアンインストールすることができます。", "JavaScriptTracking": "JavaScriptトラッキング", "JSTracking_CampaignKwdParam": "キャンペーン用キーワードのパラメーター", "JSTracking_CampaignNameParam": "キャンペーン名のパラメーター", @@ -45,8 +48,10 @@ "JSTrackingIntro5": "ページビューを追跡する以上のことをしたい場合は、%1$sPiwik Javascriptトラッキングドキュメント%2$sの使用可能な機能のリストを参照してください。これらの機能を使って、ゴール（目標）、カスタム変数、eコマース注文、破棄されたショッピングカート等々の追跡が可能です。", "LatestBetaRelease": "最新のベータ版リリース", "LatestStableRelease": "最新の安定版リリース", + "LogoNotWriteableInstruction": "Piwik デフォルトロゴの代わりにカスタムロゴを使用するには、このディレクトリへの書込権限を与えて下さい。 :%1$s ロゴを %2$s ファイルに保存するには、書込アクセスが必要です。", "LogoUpload": "アップロードするロゴを選択", "LogoUploadHelp": "%s ピクセル以上の高さで %s 形式のファイルをアップロードしてください", + "MenuDevelopment": "開発", "MenuDiagnostic": "診断", "MenuGeneralSettings": "全般の設定", "MenuManage": "管理", @@ -57,8 +62,11 @@ "OptOutForYourVisitors": "ビジターの Piwik オプトアウト", "PiwikIsInstalledAt": "Piwikがインストールされているのは", "PluginDescription": "Piwik の管理エリアです。", + "PluginSettingChangeNotAllowed": "\"%s\" プラグインで \"%s\" 設定されている値変更は許可されていません。", + "PluginSettingReadNotAllowed": "\"%s\" プラグインで \"%s\" 設定されている値の読み取りは許可されていません。", "PluginSettings": "プラグインの設定", "PluginSettingsIntro": "ここでは、次のサードパーティのプラグインの設定変更ができます", + "PluginSettingsValueNotAllowed": "\"%s\" プラグインの \"%s\" フィールドの値は許可されていません。", "SendPluginUpdateCommunication": "プラグインのアップデートがあった場合のメール通知", "SendPluginUpdateCommunicationHelp": "使用可能な新しいプラグインのバージョンがある場合、管理者ユーザーへメールが通知されます。", "StableReleases": "Piwikがビジネスの重要な一部である場合、最新の安定版を使用することを推奨します。また、最新のベータ版を使用し、バグを見つけたり、提案があれば、%sこちらをご覧ください%s。", diff --git a/plugins/CoreAdminHome/lang/ru.json b/plugins/CoreAdminHome/lang/ru.json index 08915a2e10..dcf244d77d 100644 --- a/plugins/CoreAdminHome/lang/ru.json +++ b/plugins/CoreAdminHome/lang/ru.json @@ -59,6 +59,8 @@ "OptOutForYourVisitors": "Исключение из политики конфиденциальности Piwik для посетителей", "PiwikIsInstalledAt": "Piwik установлен в", "PluginDescription": "Админпанель Piwik.", + "PluginSettingChangeNotAllowed": "Вам не разрешено менять значение \"%s\" для плагина \"%s\"", + "PluginSettingReadNotAllowed": "Вам не разрешено читать значение \"%s\" плагина \"%s\"", "PluginSettings": "Настройки плагина", "PluginSettingsIntro": "Здесь вы можете изменить настройки для следующих плагинов:", "SendPluginUpdateCommunication": "Отправить мне уведомление по электронной почте, когда есть новое обновление плагина", diff --git a/plugins/CoreConsole/Commands/ClearCaches.php b/plugins/CoreConsole/Commands/ClearCaches.php new file mode 100644 index 0000000000..35d9691706 --- /dev/null +++ b/plugins/CoreConsole/Commands/ClearCaches.php @@ -0,0 +1,37 @@ +<?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\CoreConsole\Commands; + +use Piwik\Filesystem; +use Piwik\Plugin\ConsoleCommand; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +/** + */ +class ClearCaches extends ConsoleCommand +{ + protected function configure() + { + $this->setName('core:clear-caches'); + $this->setDescription('Cleares all caches. This command can be useful for instance after updating Piwik files manually.'); + } + + /** + * Execute command like: ./console core:clear-caches + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + Filesystem::deleteAllCacheOnUpdate(); + + $this->writeSuccessMessage($output, array('Caches cleared')); + } +} diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 1dddca9b65..2c78036be2 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Filesystem; +use Piwik\Version; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -45,7 +46,8 @@ class GeneratePlugin extends GeneratePluginBase $replace = array( 'ExampleTheme' => $pluginName, 'ExampleDescription' => $description, - '0.1.0' => $version + '0.1.0' => $version, + 'PIWIK_VERSION' => Version::VERSION ); $whitelistFiles = array(); @@ -55,7 +57,8 @@ class GeneratePlugin extends GeneratePluginBase $replace = array( 'ExamplePlugin' => $pluginName, 'ExampleDescription' => $description, - '0.1.0' => $version + '0.1.0' => $version, + 'PIWIK_VERSION' => Version::VERSION ); $whitelistFiles = array( '/ExamplePlugin.php', diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 16868d3f98..4ba2607c14 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1415,13 +1415,13 @@ $.extend(DataTable.prototype, UIControl.prototype, { if (!maxWidth[nthChild]) { maxWidth[nthChild] = 0; - rows.find("td:nth-child(" + (nthChild) + ") .column .value").each(function (index, element) { + rows.find("td:nth-child(" + (nthChild) + ").column .value").each(function (index, element) { var width = $(element).width(); if (width > maxWidth[nthChild]) { maxWidth[nthChild] = width; } }); - rows.find("td:nth-child(" + (nthChild) + ") .column .value").each(function (index, element) { + rows.find("td:nth-child(" + (nthChild) + ").column .value").each(function (index, element) { $(element).css({width: maxWidth[nthChild], display: 'inline-block'}); }); } @@ -1512,6 +1512,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { } $(this).next().toggle(); + $(this).toggleClass('expanded'); self.repositionRowActions($(this)); } ).size(); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 7cb2c952e7..c976f2ad3a 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -58,6 +58,7 @@ "UnFlattenDataTable": "The report is flat %s Make it hierarchical", "ViewAllPiwikVideoTutorials": "View all Piwik Video Tutorials", "WebAnalyticsReports": "Web Analytics Reports", - "YouAreUsingTheLatestVersion": "You are using the latest version of Piwik!" + "YouAreUsingTheLatestVersion": "You are using the latest version of Piwik!", + "ClickRowToExpandOrContract": "Click this row to expand or contract the subtable." } }
\ No newline at end of file diff --git a/plugins/CoreHome/lang/fa.json b/plugins/CoreHome/lang/fa.json index d84140b1d8..7f560fd9f5 100644 --- a/plugins/CoreHome/lang/fa.json +++ b/plugins/CoreHome/lang/fa.json @@ -10,6 +10,7 @@ "DonateCall1": "استفاده از پیویک هیچگاه هزینه ای برای شما نخواهد داشت ، اما این به این معنا نیست که ما هم برای تولید آن هزینه ای نمی کنیم.", "DonateCall2": "پیویک به حمایت همیشگی شما برای رشد و پیشرفت نیاز دارد.", "DonateFormInstructions": "با کلیک بر روی نوار لغزنده و انتخاب مقدار کنید، و سپس دکمه ی مشترک به کمک مالی را بزنید", + "ExternalHelp": "راهنما (در tab جدید)", "FlattenDataTable": "این گزارش سلسله مراتبی است %sآن را مسطح کن", "HowMuchIsPiwikWorth": "چقدر پیویک برای شما ارزش دارد؟", "InjectedHostEmailBody": "درود، من امروز برای دسترسی به پیویک تلاش کردم و هشدار نام هاست نامشخص را دریافت کردم.", @@ -19,6 +20,7 @@ "MakeADifference": "یک تفاوت ایجاد کنید: %1$sبه پیویک هدیه بدهید%2$s تا در پیویک 2.0 سرمایه گذاری کنیم!", "MakeOneTimeDonation": "یک بار کمک مالی انجام دهید.", "NoPrivilegesAskPiwikAdmin": "شما به عنوان %s وارد شده اید , اما به نظر می رسد که شما اجازه دسترسی به هیچ بخشی از پیویک را ندارید. %s از مدیریت پیویک تان بخواهید (برای ارسال ایمیل کلیک کنید)%s تا به شما دسترسی \"مشاهده\" یک وبسایت را بدهد.", + "OnlyForSuperUserAccess": "این ویجت فقط برای کاربران با دسترسی ابرکاربر قابل مشاهده است.", "PageOf": "%1$s از %2$s", "PeriodDay": "روز", "PeriodDays": "روزها", diff --git a/plugins/CoreHome/lang/ja.json b/plugins/CoreHome/lang/ja.json index 96caf85b30..0c3b569570 100644 --- a/plugins/CoreHome/lang/ja.json +++ b/plugins/CoreHome/lang/ja.json @@ -11,6 +11,7 @@ "Default": "デフォルト", "DonateCall1": "Piwik を使用するのに費用はかかりません。しかし、 Piwik の制作に費用がかかっていないと言う意味ではありません", "DonateCall2": "Piwik が成長し、成功するには、あなたの継続的なサポートが必要です", + "DonateCall3": "もし Piwik が少しでもあなたの事業の推進や成功に役に立ったと実感して頂けたら、 %1$splease consider donating!%2$s", "DonateFormInstructions": "スライダで寄付する金額を選択して寄付するをクリック", "ExcludeRowsWithLowPopulation": "全ての行を表示 %s 少ない数の行を除く", "ExternalHelp": "ヘルプ（新しいタブで開きます）", @@ -18,8 +19,14 @@ "HowMuchIsPiwikWorth": "あなたにとって Piwik の価値はどのくらいですか？", "IncludeRowsWithLowPopulation": "数が少ない行は非表示 %s 全ての行を表示", "InjectedHostEmailBody": "お知らせします。本日 Piwik へアクセスしたら、未知のホスト名の警告が発生しました。", + "InjectedHostEmailSubject": "Piwik が未知のホスト名にアクセスされました :%s", + "InjectedHostNonSuperUserWarning": "%1$sClick here to access Piwik safely%2$s この警告を削除して下さい。またこの問題を Piwik 管理者に通知することができます。 (%3$sclick here to email%4$s).", + "InjectedHostSuperUserWarning": "Piwik が誤って構成された可能性があります。( Piwik が最近新しいサーバーや URL に移動された等) 有効な Piwik ホスト名 (信用できる場合) として、%1$sclick here and add %2$s %3$s, または、 %4$sclick here and go to %5$s to access Piwik safely%6$s 。", + "InjectedHostWarningIntro": "現在 %1$s から Piwik にアクセスしていますが、 Piwik は以下のアドレスで実行するように設定されています。: %2$s", "JavascriptDisabled": "Piwik を標準ビューで使用するには JavaScript が有効である必要がありますが、<br \/>あなたのブラウザでは無効になっているか、サポートされないようです。<br \/>標準ビューで使用するために、ブラウザのオプションを変更して JavaScript を有効にしてから<br \/>%1$s再試行してください%2$s。<br \/>", "LongMonthFormat": "%longYear% 年 %longMonth%", + "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%", + "MakeADifference": "ぜひ、新しい変化を生み出してください : Piwik 2.0 基金に %1$sDonate now%2$s !", "MakeOneTimeDonation": "代わりに寄与をする", "NoPrivilegesAskPiwikAdmin": "'%s'としてログインしていますが、権限が設定されていないようです。 %s Piwikの管理者(クリックしてEメール)%s に'表示'の権限を与えてもらってください。", "OnlyForSuperUserAccess": "このウィジェットは、スーパーユーザのアクセス権を持つユーザにのみ表示されます", @@ -36,12 +43,15 @@ "PluginDescription": "ウェブ解析リポートのストラクチャーです。", "ReportGeneratedOn": "%s に生成されたリポート", "ReportGeneratedXAgo": "%s 前に生成されたリポート", + "SharePiwikLong": "素晴らしい無償ソフトウェアが見つかりました ! : Piwik です! Piwik はあなたのウェブサイト訪問者を無料で追跡します。要チェック !", "SharePiwikShort": "Piwik ！フリーでオープンソースのウェブ解析、あなたのデータを所有できます", "ShareThis": "共有する", "ShortDateFormat": "%shortMonth%%day%日%shortDay%", "ShortDateFormatWithYear": "%shortYear% %shortMonth% %day%", "ShortMonthFormat": "%longYear% %shortMonth%", + "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%", "ShowJSCode": "挿入する javascript コードを表示", + "SubscribeAndBecomePiwikSupporter": "Piwik サポーターになるには、安全なクレジットカード決済 ( Paypal ) ページにお進みください !", "SupportPiwik": "Piwik をサポート！", "TableNoData": "このテーブルにはデータがありません", "ThereIsNoDataForThisReport": "このリポートのデータがありません。", diff --git a/plugins/CoreHome/lang/nl.json b/plugins/CoreHome/lang/nl.json index ab06504d23..64de484c76 100644 --- a/plugins/CoreHome/lang/nl.json +++ b/plugins/CoreHome/lang/nl.json @@ -29,6 +29,7 @@ "MakeADifference": "Maak een verschil: %1$sDoneer nu%2$s om Piwik 2.0 te steunen!", "MakeOneTimeDonation": "Doe een eennmalige donatie in de plaats.", "NoPrivilegesAskPiwikAdmin": "U bent aangemeld as '%s'. Maar het lijkt er op dat u geen rechten hebt op Piwik te bezoeken. %sVraag aan uw webmaster (klik hier voor e-mail)%s of hij u de juiste rechten wilt geven om de statistieken te bekijken.", + "OnlyForSuperUserAccess": "Deze widget wordt alleen getoond aan superusers.", "PageOf": "%1$s of %2$s", "PeriodDay": "Dag", "PeriodDays": "dagen", diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php index b9238fd158..3b876131cf 100644 --- a/plugins/CorePluginsAdmin/Marketplace.php +++ b/plugins/CorePluginsAdmin/Marketplace.php @@ -110,18 +110,15 @@ class Marketplace try { $pluginsHavingUpdate = $this->client->getInfoOfPluginsHavingUpdate($loadedPlugins, $themesOnly); - } catch (\Exception $e) { $pluginsHavingUpdate = array(); } foreach ($pluginsHavingUpdate as &$updatePlugin) { foreach ($loadedPlugins as $loadedPlugin) { - if (!empty($updatePlugin['name']) && $loadedPlugin->getPluginName() == $updatePlugin['name'] ) { - $updatePlugin['currentVersion'] = $loadedPlugin->getVersion(); $updatePlugin['isActivated'] = $pluginManager->isPluginActivated($updatePlugin['name']); $updatePlugin = $this->addMissingRequirements($updatePlugin); @@ -130,6 +127,15 @@ class Marketplace } } + // remove plugins that have updates but for some reason are not loaded + foreach ($pluginsHavingUpdate as $key => $updatePlugin) { + if (empty($updatePlugin['currentVersion']) + || empty($updatePlugin['isActivated']) + ) { + unset($pluginsHavingUpdate[$key]); + } + } + return $pluginsHavingUpdate; } diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php index cd056720d5..8279afcc73 100644 --- a/plugins/CorePluginsAdmin/Menu.php +++ b/plugins/CorePluginsAdmin/Menu.php @@ -46,16 +46,16 @@ class Menu extends \Piwik\Plugin\Menu if ($hasSuperUserAcess) { $menu->addPlatformItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage, - array('module' => 'CorePluginsAdmin', 'action' => 'plugins', 'activated' => ''), + $this->urlForAction('plugins', array('activated' => '')), $order = 1); $menu->addPlatformItem(Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage, - array('module' => 'CorePluginsAdmin', 'action' => 'themes', 'activated' => ''), + $this->urlForAction('themes', array('activated' => '')), $order = 3); } if ($this->isAllowedToSeeMarketPlace()) { $menu->addPlatformItem('CorePluginsAdmin_Marketplace', - array('module' => 'CorePluginsAdmin', 'action' => 'extend', 'activated' => ''), + $this->urlForAction('extend', array('activated' => '')), $order = 5); } @@ -73,8 +73,8 @@ class Menu extends \Piwik\Plugin\Menu { if ($this->isAllowedToSeeMarketPlace()) { $menu->addPlatformItem('CorePluginsAdmin_Marketplace', - array('module' => 'CorePluginsAdmin', 'action' => 'browsePlugins', 'activated' => ''), - $order = 5); + $this->urlForAction('browsePlugins', array('activated' => '')), + $order = 5); } } } diff --git a/plugins/CorePluginsAdmin/lang/ja.json b/plugins/CorePluginsAdmin/lang/ja.json index f9607c1d89..accf6c7ef9 100644 --- a/plugins/CorePluginsAdmin/lang/ja.json +++ b/plugins/CorePluginsAdmin/lang/ja.json @@ -14,17 +14,27 @@ "BackToExtendPiwik": "マーケットプレイスへ戻る", "BeCarefulUsingPlugins": "Piwik チームが作成していないプラグインは注意して使用して下さい：私たちはそれらを確認していません", "BeCarefulUsingThemes": "Piwik チームが作成していないテーマは注意して使用して下さい：私たちはそれらを確認していません", + "ByDesigningOwnTheme": "by %sdesigning your own theme%s", + "ByInstallingNewPluginFromMarketplace": "by %sinstalling a new plugin from the Marketplace%s", + "ByInstallingNewThemeFromMarketplace": "by %sinstalling a new theme from the Marketplace%s", + "ByWritingOwnPlugin": "by %swriting your own plugin%s", "ByXDevelopers": "%s の開発者", "Changelog": "変更履歴", + "ChangeSettingsPossible": "このプラグインのために、 %ssettings%s を変更できます。", "CorePluginTooltip": "コアプラグインは、 Piwik と一緒に配布されているため、バージョンはありません", "Deactivate": "無効化", "Developer": "開発者", "DoMoreContactPiwikAdmins": "新しいプラグインやテーマをインストールするには、 Piwik の管理者に連絡をしてください", + "DownloadAndInstallPluginsFromMarketplace": "%sMarketplace%s から新しいプラグインを自動的にダウンロードし、インストールすることができます。", + "EmailToEnquireUpdatedVersion": "%1$s をメールで送付の上、%2$s の最新バージョンをお問い合わせください。", "EnjoyAnotherLookAndFeelOfThemes": "別の外観と操作感をお楽しみください", "FeaturedPlugin": "注目のプラグイン", + "GetEarlyAccessForPaidPlugins": "注 : 現在、全てのプラグインは無料で利用できます。今後マーケットプレイスでは有料プラグインが有効になります。 (有料プラグインについて、誰よりも早く知りたい方は、%scontact us%s )", "GetNewFunctionality": "新しい機能の取得", "History": "履歴", "Inactive": "無効", + "InfoPluginUpdateIsRecommended": "最新の改良による恩恵を受けるには、今すぐプラグインをアップデートしてください。", + "InfoThemeIsUsedByOtherUsersAsWell": "注 : Piwikに登録されている他の %1$s のユーザーは、テーマ %2$s も使用しています。", "InfoThemeUpdateIsRecommended": "最新バージョンを使用するするためにテーマを更新します。", "InstallingPlugin": "%s のインストール", "InstallNewPlugins": "新しいプラグインをインストール", @@ -36,18 +46,28 @@ "Marketplace": "マーケットプレイス", "MarketplaceSellPluginSubject": "マーケットプレイス - プラグインの販売", "MenuPlatform": "プラットフォーム", + "MissingRequirementsNotice": "%1$s %3$s が必要です。 %1$s %2$s を最新バージョンにアップデートしてください。", "NoPluginsFound": "プラグインは見つかりませんでした", + "NotAllowedToBrowseMarketplacePlugins": "Piwik プラットフォームのカスタマイズまたは拡張のために、インストール可能なプラグインのリストを閲覧することができます。もしこれらのいづれかのインストールが必要な場合は、管理者にお問い合わせください。", + "NotAllowedToBrowseMarketplaceThemes": "Piwik プラットフォームの外観をカスタマイズするのにインストール可能な Piwik テーマのリストをご確認ください。これらのいづれかをインストールしたい場合は、管理者にお問い合わせください。", "NoThemesFound": "テーマは見つかりませんでした", "NoZipFileSelected": "ZIP ファイルを選択してください。", "NumDownloadsLatestVersion": "最新バージョン：%s のダウンロード", "NumUpdatesAvailable": "%s アップデートがあります", + "OrByUploadingAPlugin": "または、by %suploading a plugin%s", + "OrByUploadingATheme": "または、by %suploading a plugin%s", "Origin": "開発元", "OriginCore": "コア", "OriginThirdParty": "サードパーティ", "PluginDescription": "プラグイン管理のインターフェースです。", "PluginHomepage": "プラグインのホームページ", "PluginKeywords": "キーワード", + "PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.", + "PluginNotWorkingAlternative": "このプラグインを以前から使用している場合、マーケットプレイス上で、より最新のバージョンを見つけることができます。使用していない場合、アンインストールすることをお勧めします。", + "PluginRequirement": "%1$s requires %2$s.", "PluginsManagement": "プラグインの管理", + "PluginUpdateAvailable": "あなたは現在、バージョン %s を使用しています。新しいバージョン %s が利用可能です。", + "PluginVersionInfo": "%1$s from %2$s", "PluginWebsite": "プラグインのウェブサイト", "Screenshots": "スクリーンショット", "SortByAlpha": "アルファ", @@ -56,10 +76,15 @@ "Status": "状態", "StepDownloadingPluginFromMarketplace": "マーケットプレイスからプラグインをダウンロード", "StepDownloadingThemeFromMarketplace": "マーケットプレイスからテーマをダウンロード", + "StepPluginSuccessfullyInstalled": "プラグイン %1$s %2$s のインストールに成功しました。", + "StepPluginSuccessfullyUpdated": "プラグイン %1$s %2$s のアップデートに成功しました。", "StepReplaceExistingPlugin": "既存のプラグインを置き換える", "StepReplaceExistingTheme": "既存のテーマを置き換える", + "StepThemeSuccessfullyInstalled": "テーマ %1$s %2$s のインストールに成功しました。", + "StepThemeSuccessfullyUpdated": "テーマ %1$s %2$s のアップデートに成功しました。", "StepUnzippingPlugin": "プラグインを解凍", "StepUnzippingTheme": "テーマを解凍", + "SuccessfullyActicated": "<strong> %s <\/strong> の有効化に成功しました。", "Support": "サポート", "TeaserExtendPiwik": "Piwik のプラグインとテーマを拡張", "TeaserExtendPiwikByPlugin": "新しいプラグインをインストールして Piwik を拡張", @@ -69,7 +94,9 @@ "Themes": "テーマ", "ThemesDescription": "テーマは Piwik ユーザインターフェイスの外観を変更するだけでなく、解析レポートを楽しむ新しいビジュアルを備えています", "ThemesManagement": "テーマの管理", + "UninstallConfirm": "プラグイン %s をアンインストールしようとしています。実行されると、プラグインは完全にプラットフォームから削除され、回復できなくなります。本当にアンインストールを実行してもよろしいですか？", "Updated": "更新済", + "UpdatingPlugin": "%s のアップデート", "UploadZipFile": "ZIPファイルをアップロード", "Version": "バージョン", "ViewRepositoryChangelog": "変更内容を表示", diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index d67d348c92..8c057ed06f 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -13,7 +13,7 @@ </thead> <tbody id="plugins"> {% for name,plugin in pluginsHavingUpdate %} - <tr {% if plugin.isActivated %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}> + <tr {% if plugin.isActivated|default(false) %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}> <td class="name"> <a href="javascript:void(0);" data-pluginName="{{ plugin.name|e('html_attr') }}"> {{ plugin.name }} diff --git a/plugins/CoreUpdater/lang/cs.json b/plugins/CoreUpdater/lang/cs.json index 6a92dbd511..576d0cf93b 100644 --- a/plugins/CoreUpdater/lang/cs.json +++ b/plugins/CoreUpdater/lang/cs.json @@ -1,6 +1,6 @@ { "CoreUpdater": { - "ClickHereToViewSqlQueries": "Klikněte zde, abyste viděli a zkopírovali SQL dotazy, které mají být spuštěny", + "ClickHereToViewSqlQueries": "Klikněte zde pro zobrazení SQL dotazů s možností je zkopírovat, které mají být spuštěny", "CreatingBackupOfConfigurationFile": "Vytvářím zálohu konfiguračního souboru v %s", "CriticalErrorDuringTheUpgradeProcess": "Při aktualizaci nastala kritická chyba:", "DatabaseUpgradeRequired": "Vyžadováno povýšení databáze", @@ -20,13 +20,13 @@ "ExceptionArchiveIncompatible": "Nekompatibilní archiv: %s", "ExceptionArchiveIncomplete": "Archiv je nekompletní: některé soubory chybí (např.: %s).", "FeedbackRequest": "Zde můžete s týmem Piwiku sdílet nápady a návrhy:", - "HelpMessageContent": "Zkontrolujte %1$s Piwik FAQ %2$s , který vysvětluje nejčastějsí chybi při aktualizaci. %3$s Požádejte vašeho systémového administrátora - může vám pomoct s chybou, která je nejčastěji způsobena nastavením serveru MySQL.", + "HelpMessageContent": "Zkontrolujte %1$s Piwik FAQ %2$s , kde jsou vysvětleny nejčastější chybi při aktualizaci. %3$s Požádejte vašeho systémového administrátora - může vám pomoct s chybou, která je nejčastěji způsobena nastavením serveru MySQL.", "HelpMessageIntroductionWhenError": "Níže je hlavní chybová hláška. Pomůže vám zjistit příčinu, ale pokud budete potřebovat další pomoc:", "HelpMessageIntroductionWhenWarning": "Aktualizace proběhla v pořádku, ale byly zaznamenány problémy. Prosím přečtěte si jejich popis výše. Pro další pomoc:", "HighTrafficPiwikServerEnableMaintenance": "Pokud provozujete Piwik server s velkým provozem, doporučujeme %sna chvíli zakázat sledování návštěvníků a přepnout uživatelské rozhraní do režimu údržby%s.", "IncompatbilePluginsWillBeDisabledInfo": "Poznámka: Některé zásuvné moduly nejsou kompatibilní s Piwikem %s. Budou zakázány při aktualizaci:", "InstallingTheLatestVersion": "Instaluji poslední verzi", - "MajorUpdateWarning1": "Toto je důležitá aktualizace! Zabere více času, než obvykle.", + "MajorUpdateWarning1": "Toto je velká aktualizace! Zabere více času, než obvykle.", "MajorUpdateWarning2": "Následující doporučení je především důležité pro velké instalace.", "NoteForLargePiwikInstances": "Důležitá poznámka pro rozsáhlé instalace Piwiku", "NoteItIsExpectedThatQueriesFail": "Poznámka: Pokud budete SQL dotazy spouštět ručně, některé z nich selžou. V tom případě chyby jednoduše ignorujte a spusťte další dotazy", @@ -47,8 +47,8 @@ "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "Aktualizace databáze může chvíli trvat, buďte prosím trpěliví.", "UnpackingTheUpdate": "Rozbaluji aktualizaci", "UpdateAutomatically": "Aktualizovat automaticky", - "UpdateHasBeenCancelledExplanation": "One Click aktualizace Piwiku byla stornována. Pokud nemůžete opravit chybu je doporučeno Piwik aktualizovat manuálně. %1$s Prosím zkontrolujte pro začátek %2$sDokumentaci k aktualizaci%3$s!", - "UpdateTitle": "Piwik › Update", + "UpdateHasBeenCancelledExplanation": "One Click aktualizace Piwiku byla zrušena. Pokud nemůžete opravit chybu je doporučeno Piwik aktualizovat manuálně. %1$s Prosím zkontrolujte nejdříve %2$sdokumentaci k aktualizaci%3$s!", + "UpdateTitle": "Aktualizovat", "UpgradeComplete": "Aktualizace je kompletní!", "UpgradePiwik": "Aktualizovat Piwik", "VerifyingUnpackedFiles": "Ověřuji rozbalené soubory", @@ -57,6 +57,6 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "Můžete aktualizovat na verzi %s automaticky, nebo si stáhněte balíček a nainstalujte jej manuálně:", "YouCouldManuallyExecuteSqlQueries": "Pokud nemůžete použít aktualizaci z příkazového řádku a Piwik nelze aktualizovat (díky vypršení časového limitu v databázi, prohlížeči, nebo z jakéhokoliv jiného důvodu), můžete spustit SQL dotazy ručně", "YouMustDownloadPackageOrFixPermissions": "Piwik nemůže přepsat Vaši stávající instalaci. Můžete buď opravit oprávnění k adresářům\/souborům, nebo stáhnout balíček a nainstalovat verzi %s ručně", - "YourDatabaseIsOutOfDate": "Vaše databáze Piwiku je zastaralá a musí být aktualizována než budete pokračovat." + "YourDatabaseIsOutOfDate": "Vaše databáze Piwiku je zastaralá a musí být aktualizována, než budete pokračovat." } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/lang/fa.json b/plugins/CoreUpdater/lang/fa.json index fa35c9e499..7d78145a07 100644 --- a/plugins/CoreUpdater/lang/fa.json +++ b/plugins/CoreUpdater/lang/fa.json @@ -25,6 +25,9 @@ "MajorUpdateWarning2": "توصیه ای که در ادامه می آید به طور ویژه برای نصب های بزرگ مهم می باشد.", "NoteForLargePiwikInstances": "نکات مهم برای نصب های بزرگ پیویک", "NoteItIsExpectedThatQueriesFail": "توجه: اگر شما این پرس و جو ها را دستی انجام داده اید , انتظار می رود که بعضی از آنها به شکست بیانجامد. در این مورد , به سادگی از خطاها رد شوید و بعدی را اجرا کنید.", + "NotificationClickToUpdatePlugins": "برای بروزرسانی پلاگین ها اینجا کلیک کنید:", + "NotificationClickToUpdateThemes": "برای بروزرسانی قالب ها اینجا کلیک کنید:", + "NotificationSubjectAvailablePluginUpdate": "بروزرسانی های موجود برای پلاگین های پیویک", "PiwikHasBeenSuccessfullyUpgraded": "پیویک با موفقیت به روزرسانی شد!", "PiwikUpdatedSuccessfully": "پیویک با موفقیت به روز رسانی شد!", "PiwikWillBeUpgradedFromVersionXToVersionY": "پایگاه داده ی پیویک از نسخه ی %1$s به نسخه ی %2$s ارتقا پیدا خواهد کرد.", diff --git a/plugins/CoreUpdater/lang/ja.json b/plugins/CoreUpdater/lang/ja.json index 8554962870..6e2aa2f923 100644 --- a/plugins/CoreUpdater/lang/ja.json +++ b/plugins/CoreUpdater/lang/ja.json @@ -4,6 +4,7 @@ "CreatingBackupOfConfigurationFile": "%s の設定ファイルのバックアップを作成中", "CriticalErrorDuringTheUpgradeProcess": "アップグレード処理中の致命的なエラー：", "DatabaseUpgradeRequired": "データベースのアップグレードが必要", + "DisablingIncompatiblePlugins": "互換性のないプラグインを無効にします: %s", "DownloadingUpdateFromX": "%s からアップデートをダウンロード中", "DownloadX": "ダウンロード %s", "EmptyDatabaseError": "データベース %s は空です。 Piwik 設定ファイルを編集または削除する必要があります。", @@ -18,19 +19,29 @@ "ExceptionArchiveEmpty": "空のアーカイブです。", "ExceptionArchiveIncompatible": "互換性のないアーカイブ： %s", "ExceptionArchiveIncomplete": "アーカイブが不完全です：いくつかのファイルが不足しています（%s など）。", + "FeedbackRequest": "あなたのアイデアや提案を、ここで Piwik チームにシェアしてください :", "HelpMessageContent": "アップグレードの間、最も一般的なエラーを説明している %1$s Piwik FAQ %2$sをチェックしてください。%3$s システム管理者にお尋ねください － 彼らはたいていの場合、サーバや MySQL のセットアップに関係するエラーについて、あなたの手助けができるでしょう。", "HelpMessageIntroductionWhenError": "上記はコアのエラーメッセージです。 原因の説明に役立つはずですが、さらなるヘルプが必要であればこちらをどうぞ：", "HelpMessageIntroductionWhenWarning": "アップグレードは正常に完了しましたが、処理中に問題がありました。 詳細は上記の説明をお読みください。 さらなるヘルプ：", + "HighTrafficPiwikServerEnableMaintenance": "高トラフィックの Piwik サーバーを管理する場合、 %smomentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode%s をお勧めします。", + "IncompatbilePluginsWillBeDisabledInfo": "注 : 一部のプラグインは、Piwik %s に互換性がありません。アップグレード時に、これらのプラグインは無効になります。", "InstallingTheLatestVersion": "最新バージョンをインストール中", "MajorUpdateWarning1": "これは最新版へのアップデートです！通常よりも時間がかかります", + "MajorUpdateWarning2": "以下のアドバイスは、特に大規模なインストールの際、重要です。", "NoteForLargePiwikInstances": "Piwik のデータベースが大きい場合の重要注意", "NoteItIsExpectedThatQueriesFail": "注意： これらのクエリーを手作業で実行する場合、クエリーのいくつかは失敗することが予想されます。 その場合は単にエラーを無視し、リスト内の次のクエリーを実行してください。", + "NotificationClickToUpdatePlugins": "お使いのプラグインを今すぐアップデートするにはここをクリック:", + "NotificationClickToUpdateThemes": "お使いのテーマを今すぐアップデートするにはここをクリック:", + "NotificationSubjectAvailableCoreUpdate": "新しい Piwik %s が利用可能です。", + "NotificationSubjectAvailablePluginUpdate": "お使いの Piwik プラグインのアップデートが可能です。", "PiwikHasBeenSuccessfullyUpgraded": "Piwik は正常にアップグレードされました！", "PiwikUpdatedSuccessfully": "Piwik は正常にアップデートされました！", "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik データベースが %1$s から新バージョン %2$s にアップグレードされます。", "PluginDescription": "Piwik アップデートメカニズム", "ReadyToGo": "実行してもよろしいですか？", + "TheFollowingDimensionsWillBeUpgradedX": "以下の範囲をアップデートします: %s", "TheFollowingPluginsWillBeUpgradedX": "次のプラグインはアップグレードされます： %s", + "ThereIsNewPluginVersionAvailableForUpdate": "お使いのいくつかのプラグインは、マーケットプレイス上でアップデートされています:", "ThereIsNewVersionAvailableForUpdate": "アップデート可能な Piwik の新バージョンがあります。", "TheUpgradeProcessMayFailExecuteCommand": "Piwik のデータベースが大きい場合、ブラウザでのアップデートの実行には長い時間がかかる場合があります。 このような場合、コマンドラインからアップデートを実行することができます： %s", "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "アップグレード処理には時間がかかる場合がありますが、しばらくお待ちください。", diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index b3e8a5f6fa..dbb1942d2a 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -135,7 +135,7 @@ abstract class Graph extends Visualization // set default selectable columns, if none specified $selectableColumns = $this->config->selectable_columns; if (false === $selectableColumns) { - $selectableColumns = array('nb_visits', 'nb_actions', 'nb_uniq_visitors'); + $selectableColumns = array('nb_visits', 'nb_actions', 'nb_uniq_visitors', 'nb_users'); if ($this->config->show_goals) { $goalMetrics = array('nb_conversions', 'revenue'); diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 9f31098946..2ccd5a9e01 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -43,6 +43,10 @@ class AllColumns extends HtmlTable $columnsToDisplay[] = 'nb_uniq_visitors'; } + if (in_array('nb_users', $dataTable->getColumns())) { + $columnsToDisplay[] = 'nb_users'; + } + $columnsToDisplay = array_merge( $columnsToDisplay, array('nb_actions', 'nb_actions_per_visit', 'avg_time_on_site', 'bounce_rate') ); diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index a0f8682881..50d4981bb2 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -28,7 +28,8 @@ {% if showRow %} <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %} - class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}"> + class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}" + title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"> {% for column in properties.columns_to_display %} <td> {% include "@CoreHome/_dataTableCell.twig" with properties %} diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject c467c059942e0c4331e79d547c4e3acb4bbd0fa +Subproject 643984c1bab2bc48f120e3cb83fac39b270d948 diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml index 8747fe2b5c..ca0c9fc4d5 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml +++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml @@ -1,379 +1,395 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row> - <label>Name_PAGE_1</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_2</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_3</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE3</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_4</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE4</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_5</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_6</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE6</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_7</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE7</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_PAGE_8</label> - <nb_actions>1</nb_actions> - <subtable> - <row> - <label>Val_PAGE8</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_3</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT3</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_4</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT4</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_6</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT6</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_7</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT7</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> - <row> - <label>Name_VISIT_8</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - <subtable> - <row> - <label>Val_VISIT8</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>4</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>0</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>0</revenue> - </row> - </subtable> - </row> + <row> + <label>Name_PAGE_1</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_2</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE2</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_3</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE3</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_4</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE4</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_5</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE5</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_6</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE6</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_7</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE7</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_PAGE_8</label> + <nb_actions>1</nb_actions> + <subtable> + <row> + <label>Val_PAGE8</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_2</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT2</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_3</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT3</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_4</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT4</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_5</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT5</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_6</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT6</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_7</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT7</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> + <row> + <label>Name_VISIT_8</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + <subtable> + <row> + <label>Val_VISIT8</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>1</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>4</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>0</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>0</revenue> + </row> + </subtable> + </row> </result>
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index 463462262e..5d1eec5750 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index 463462262e..5d1eec5750 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/plugins/DBStats/Menu.php b/plugins/DBStats/Menu.php index 50f7b8a047..a52b9bd2fd 100644 --- a/plugins/DBStats/Menu.php +++ b/plugins/DBStats/Menu.php @@ -19,7 +19,7 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::hasUserSuperUserAccess()) { $menu->addDiagnosticItem('DBStats_DatabaseUsage', - array('module' => 'DBStats', 'action' => 'index'), + $this->urlForAction('index'), $order = 6); } } diff --git a/plugins/DBStats/lang/cs.json b/plugins/DBStats/lang/cs.json index a74efdea5c..d6504b9f1f 100644 --- a/plugins/DBStats/lang/cs.json +++ b/plugins/DBStats/lang/cs.json @@ -7,9 +7,9 @@ "IndexSize": "Velikost indexu", "LearnMore": "Abyste lépe zjistili, jak Piwik zpracovává data a jak jej nastavit pro weby se středním a velkým provozem, podívejte se do dokumentace %s.", "MainDescription": "Piwik ukládá všechny vaše data webové analýzy v MySQL databázi. Nyní tabulky Piwiku využívají %s.", - "MetricDataByYear": "Měření tabulek za rok", - "MetricTables": "Měřené tabulky", - "OtherTables": "Osttaní tabulky", + "MetricDataByYear": "Tabulky metrik za rok", + "MetricTables": "Tabulky metrik", + "OtherTables": "Ostatní tabulky", "PluginDescription": "Tento zásuvný modul hlásí využití databáze MySQL tabulkami Piwiku", "ReportDataByYear": "Hlášení tabulek za rok", "ReportTables": "Hlášení tabulek", diff --git a/plugins/Dashboard/Menu.php b/plugins/Dashboard/Menu.php index 2549021fc7..2ee0521623 100644 --- a/plugins/Dashboard/Menu.php +++ b/plugins/Dashboard/Menu.php @@ -21,7 +21,7 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->add('Dashboard_Dashboard', '', array('module' => 'Dashboard', 'action' => 'embeddedIndex', 'idDashboard' => 1), true, 5); + $menu->addItem('Dashboard_Dashboard', '', $this->urlForAction('embeddedIndex', array('idDashboard' => 1)), 5); if (!Piwik::isUserIsAnonymous()) { $login = Piwik::getCurrentUserLogin(); @@ -31,7 +31,7 @@ class Menu extends \Piwik\Plugin\Menu $pos = 0; foreach ($dashboards as $dashboard) { - $menu->add('Dashboard_Dashboard', $dashboard['name'], array('module' => 'Dashboard', 'action' => 'embeddedIndex', 'idDashboard' => $dashboard['iddashboard']), true, $pos); + $menu->addItem('Dashboard_Dashboard', $dashboard['name'], $this->urlForAction('embeddedIndex', array('idDashboard' => $dashboard['iddashboard'])), $pos); $pos++; } } @@ -44,13 +44,9 @@ class Menu extends \Piwik\Plugin\Menu $tooltip = Piwik::translate('Dashboard_TopLinkTooltip', Site::getNameFor($idSite)); - $urlParams = array( - 'module' => 'CoreHome', - 'action' => 'index', - 'idSite' => $idSite, - ); + $urlParams = $this->urlForModuleAction('CoreHome', 'index', array('idSite' => $idSite)) ; - $menu->add('Dashboard_Dashboard', null, $urlParams, true, 1, $tooltip); + $menu->addItem('Dashboard_Dashboard', null, $urlParams, 1, $tooltip); } } diff --git a/plugins/Dashboard/lang/cs.json b/plugins/Dashboard/lang/cs.json index deac55f05b..bbca664ea2 100644 --- a/plugins/Dashboard/lang/cs.json +++ b/plugins/Dashboard/lang/cs.json @@ -6,28 +6,28 @@ "CopyDashboardToUser": "Zkopírovat přehled uživateli", "CreateNewDashboard": "Vytvořit novou nástěnku", "Dashboard": "Nástěnka", - "DashboardCopied": "Přehled byl úspěšně nakopírován vybranému uživateli.", + "DashboardCopied": "Přehled byl úspěšně zkopírován vybranému uživateli.", "DashboardEmptyNotification": "Vaše nástěnka neobsahuje žádné widgety. Nějaké přidejte, nebo obnovte výchozí výběr widgetů na nástěnce.", "DashboardName": "Jméno nástěnky:", "DashboardOf": "Nástěnka %s", "DefaultDashboard": "Výchozí nástěnka - používáte výchozí rozvržení nástěnky", - "DeleteWidgetConfirm": "Jste si jistí, že chcete odstranit tento widget z nástěnky?", + "DeleteWidgetConfirm": "Opravdu chcete odstranit tento widget z nástěnky?", "EmptyDashboard": "Prázdná nástěnka - vyberte si své oblíbené widgety", "LoadingWidget": "Načítám widget, prosím čekejte...", "ManageDashboard": "Správa nástěnky", "Maximise": "Maximalizovat", "Minimise": "Minimalizovat", - "NotUndo": "Nemůžete vrátit zpět tuto operaci.", - "PluginDescription": "Váše nástěnka analýzy Web stránek. Můžete si jí upravit: přidat nové widgety, změnit jejich pořadí. Každý uživatel přistupuje ke své vlastní nástěncei", + "NotUndo": "Tuto operaci nemůžete vrátit zpět.", + "PluginDescription": "Vaše nástěnka webové analýzy. Můžete si ji upravit: přidat nové widgety, změnit jejich pořadí. Každý uživatel přistupuje ke své vlastní nástěnce.", "RemoveDashboard": "Odstranit nástěnku", "RemoveDashboardConfirm": "Opravdu chcete odstranit nástěnku: %s?", "RenameDashboard": "Přejmenovat nástěnku", "ResetDashboard": "Obnovit nástěnku", "ResetDashboardConfirm": "Opravdu chcete obnovit nastavení nástěnky do továrního stavu?", - "SelectDashboardLayout": "Prosím vyberte nové rozvržení návštěnky", + "SelectDashboardLayout": "Prosím vyberte nové rozvržení nástěnky", "SelectWidget": "Zvolte widget pro přidání na nástěnku", "SetAsDefaultWidgets": "Nastavit výchozí výběr widgetů", - "SetAsDefaultWidgetsConfirm": "Opravdu chcete nastavit toto rozvržení widgetů jako výchozí rozvržení?", + "SetAsDefaultWidgetsConfirm": "Opravdu chcete nastavit toto rozvržení widgetů jako výchozí?", "SetAsDefaultWidgetsConfirmHelp": "Tyto widgety a jejich rozvržení budou použity vždy, když někdo vytvoří novou nástěnku nebo použije vlastnost %s.", "TopLinkTooltip": "Zobraz analytické hlášení webu pro %s.", "WidgetNotFound": "Widget nenalezen", diff --git a/plugins/DevicesDetection/Menu.php b/plugins/DevicesDetection/Menu.php index e37c62e75f..797f988624 100644 --- a/plugins/DevicesDetection/Menu.php +++ b/plugins/DevicesDetection/Menu.php @@ -20,13 +20,13 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::isUserHasSomeAdminAccess()) { $menu->addDiagnosticItem('DevicesDetection_DeviceDetection', - array('module' => 'DevicesDetection', 'action' => 'deviceDetection'), + $this->urlForAction('deviceDetection'), $order = 40); } } public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('DevicesDetection_submenu', array('module' => 'DevicesDetection', 'action' => 'index')); + $menu->addVisitorsItem('DevicesDetection_submenu', $this->urlForAction('index')); } } diff --git a/plugins/DevicesDetection/lang/cs.json b/plugins/DevicesDetection/lang/cs.json index 381ca725d2..a15d7cac58 100644 --- a/plugins/DevicesDetection/lang/cs.json +++ b/plugins/DevicesDetection/lang/cs.json @@ -5,7 +5,7 @@ "CarBrowser": "Prohlížeč v autě", "Console": "Konzole", "dataTableLabelBrands": "Značka", - "dataTableLabelBrowserFamily": "Rodina prohlížeče", + "dataTableLabelBrowserFamily": "Rodina prohlížečů", "dataTableLabelModels": "Model", "dataTableLabelSystemVersion": "Verze operačního systému", "dataTableLabelTypes": "Typ", @@ -18,7 +18,7 @@ "FeaturePhone": "Ukázkový telefon", "OperatingSystemFamilies": "Rodiny operačních systémů", "OperatingSystemVersions": "Verze operačního systému", - "PluginDescription": "Tento zásuvný modul poskytuje rozšířené informace o mobilních iařízeních, jako např. výrobce, model (verze zařízení), vylepšenou detekci typu zařízení (TV, konzole, Chytré telefony, PC) a další. Tento zásuvný modul přidává nové hlášení v sekci návštěvníci > zařízení.", + "PluginDescription": "Tento zásuvný modul poskytuje rozšířené informace o mobilních zařízeních, jako např. výrobce, model (verze zařízení), vylepšenou detekci typu zařízení (TV, konzole, Chytré telefony, PC) a další. Tento zásuvný modul přidává nové hlášení v sekci návštěvníci > zařízení.", "SmartDisplay": "Chytrý displej", "Smartphone": "Chytrý telefon", "submenu": "Zařízení", diff --git a/plugins/Events/Menu.php b/plugins/Events/Menu.php index 01c60cabe6..440a35978e 100644 --- a/plugins/Events/Menu.php +++ b/plugins/Events/Menu.php @@ -16,6 +16,6 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addActionsItem('Events_Events', array('module' => 'Events', 'action' => 'index'), 30); + $menu->addActionsItem('Events_Events', $this->urlForAction('index'), 30); } } diff --git a/plugins/Events/lang/fa.json b/plugins/Events/lang/fa.json index a71de29afd..24c823ac96 100644 --- a/plugins/Events/lang/fa.json +++ b/plugins/Events/lang/fa.json @@ -1,10 +1,13 @@ { "Events": { + "AvgValue": "میانگین", "Event": "رویداد", "EventAction": "اقدامات رویداد", "EventCategory": "دسته رویداد", "EventName": "نام رویداد", "Events": "رویداد ها", - "EventValue": "ارزش رویداد" + "EventValue": "ارزش رویداد", + "MaxValue": "بیشترین", + "MinValue": "کمترین" } }
\ No newline at end of file diff --git a/plugins/Events/lang/ru.json b/plugins/Events/lang/ru.json index c0dac419b0..61d63e59c4 100644 --- a/plugins/Events/lang/ru.json +++ b/plugins/Events/lang/ru.json @@ -1,5 +1,6 @@ { "Events": { + "Event": "Событие", "MaxValue": "Максимальное значение", "MaxValueDocumentation": "Максимальное значения для этого события", "MinValue": "Минимальное значение", diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 4a2c3507b9..a496e40ed9 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -11,17 +11,19 @@ namespace Piwik\Plugins\ExamplePlugin; use Piwik\View; /** - * + * A controller let's you for example create a page that can be added to a menu. For more information read our guide + * http://developer.piwik.org/guides/mvc-in-piwik or have a look at the our API references for controller and view: + * http://developer.piwik.org/api-reference/Piwik/Plugin/Controller and + * http://developer.piwik.org/api-reference/Piwik/View */ class Controller extends \Piwik\Plugin\Controller { public function index() { - $view = new View('@ExamplePlugin/index.twig'); - $this->setBasicVariablesView($view); - $view->answerToLife = '42'; - - return $view->render(); + // Render the Twig template templates/index.twig and assign the view variable answerToLife to the view. + return $this->renderTemplate('index', array( + 'answerToLife' => 42 + )); } } diff --git a/plugins/ExamplePlugin/Menu.php b/plugins/ExamplePlugin/Menu.php index 2a3ed266f2..3fd347aee1 100644 --- a/plugins/ExamplePlugin/Menu.php +++ b/plugins/ExamplePlugin/Menu.php @@ -22,34 +22,37 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - // with custom category 'UI Framework' - // $menu->add('UI Framework', '', array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30); - // $menu->add('UI Framework', 'Report 1', array('module' => 'ExamplePlugin', 'action' => 'report1'), true, $orderId = 30); - // or reusing an existing category - // $menu->addVisitorsItem('Report 1', array('module' => 'ExamplePlugin', 'action' => 'report1'), $orderId = 30); - // $menu->addActionsItem('Report 1', array('module' => 'ExamplePlugin', 'action' => 'report1'), $orderId = 30); + // reuse an existing category. Execute the showList() method within the controller when menu item was clicked + // $menu->addVisitorsItem('Report 1', $this->urlForAction('showList'), $orderId = 30); + // $menu->addActionsItem('Report 1', $this->urlForAction('showList'), $orderId = 30); + + // or create a custom category 'UI Framework' + // $menu->addItem('UI Framework', '', $this->urlForDefaultAction(), $orderId = 30); + // $menu->addItem('UI Framework', 'Report 1', $this->urlForAction('showList'), $orderId = 30); } public function configureAdminMenu(MenuAdmin $menu) { - // with custom category - // $menu->add('General_Settings', 'My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30); - // or reusing an existing category - // $menu->addSettingsItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30); - // $menu->addPlatformItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30); + // reuse an existing category + // $menu->addSettingsItem('My Admin Item', $this->urlForDefaultAction(), $orderId = 30); + // $menu->addPlatformItem('My Admin Item', $this->urlForDefaultAction(), $orderId = 30); + + // or create a custom category + // $menu->addItem('General_Settings', 'My Admin Item', $this->urlForDefaultAction(), $orderId = 30); } public function configureTopMenu(MenuTop $menu) { - // $menu->add('My Top Item', null, array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30); + // $menu->addItem('My Top Item', null, $this->urlForDefaultAction(), $orderId = 30); } public function configureUserMenu(MenuUser $menu) { - // with custom category - // $menu->add('CoreAdminHome_MenuManage', 'My User Item', array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30); - // or reusing an existing category - // $menu->addManageItem('My User Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30); - // $menu->addPlatformItem('My User Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30); + // reuse an existing category. Execute the showList() method within the controller when menu item was clicked + // $menu->addManageItem('My User Item', $this->urlForAction('showList'), $orderId = 30); + // $menu->addPlatformItem('My User Item', $this->urlForDefaultAction(), $orderId = 30); + + // or create a custom category + // $menu->addItem('CoreAdminHome_MenuManage', 'My User Item', $this->urlForDefaultAction(), $orderId = 30); } } diff --git a/plugins/ExamplePlugin/plugin.json b/plugins/ExamplePlugin/plugin.json index b6328199ce..d3b8257e4d 100644 --- a/plugins/ExamplePlugin/plugin.json +++ b/plugins/ExamplePlugin/plugin.json @@ -3,6 +3,9 @@ "version": "0.1.0", "description": "ExampleDescription", "theme": false, + "require": { + "piwik": ">=PIWIK_VERSION" + }, "authors": [ { "name": "Piwik", diff --git a/plugins/ExamplePlugin/templates/index.twig b/plugins/ExamplePlugin/templates/index.twig index d8c940d0fc..c322e32785 100644 --- a/plugins/ExamplePlugin/templates/index.twig +++ b/plugins/ExamplePlugin/templates/index.twig @@ -1,4 +1,8 @@ -<strong>Hello world!</strong> -<br/> +{% extends 'dashboard.twig' %} -The answer to life is {{ answerToLife }}
\ No newline at end of file +{% block content %} + <strong>Hello world!</strong> + <br/> + + The answer to life is {{ answerToLife }} +{% endblock %}
\ No newline at end of file diff --git a/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml b/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml index dafbedb6e4..d077554ef8 100644 --- a/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml +++ b/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml @@ -2,7 +2,8 @@ <result> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> - <nb_actions>4</nb_actions> + <nb_users>1</nb_users> + <nb_actions>4</nb_actions> <max_actions>2</max_actions> <bounce_rate>0%</bounce_rate> <nb_actions_per_visit>2</nb_actions_per_visit> diff --git a/plugins/ExampleUI/Menu.php b/plugins/ExampleUI/Menu.php index 8b5f1bcfea..66a0b7041a 100644 --- a/plugins/ExampleUI/Menu.php +++ b/plugins/ExampleUI/Menu.php @@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->add('UI Framework', '', array('module' => 'ExampleUI', 'action' => 'dataTables'), true, 30); + $menu->addItem('UI Framework', '', $this->urlForAction('dataTables'), 30); $this->addSubMenu($menu, 'Data tables', 'dataTables', 1); $this->addSubMenu($menu, 'Bar graph', 'barGraph', 2); @@ -34,12 +34,11 @@ class Menu extends \Piwik\Plugin\Menu public function configureUserMenu(MenuUser $menu) { - $urlParams = array('module' => 'ExampleUI', 'action' => 'notifications'); - $menu->addPlatformItem('UI Notifications', $urlParams, $order = 3); + $menu->addPlatformItem('UI Notifications', $this->urlForAction('notifications'), $order = 3); } private function addSubMenu(MenuReporting $menu, $subMenu, $action, $order) { - $menu->add('UI Framework', $subMenu, array('module' => 'ExampleUI', 'action' => $action), true, $order); + $menu->addItem('UI Framework', $subMenu, $this->urlForAction($action), $order); } } diff --git a/plugins/Feedback/Menu.php b/plugins/Feedback/Menu.php index aa1156bc52..acfd55dab1 100644 --- a/plugins/Feedback/Menu.php +++ b/plugins/Feedback/Menu.php @@ -15,11 +15,10 @@ class Menu extends \Piwik\Plugin\Menu { public function configureUserMenu(MenuUser $menu) { - $menu->add( + $menu->addItem( 'General_Help', null, - array('module' => 'Feedback', 'action' => 'index', 'segment' => false), - true, + $this->urlForAction('index', array('segment' => false)), $order = 99, $tooltip = Piwik::translate('Feedback_TopLinkTooltip') ); diff --git a/plugins/Feedback/lang/cs.json b/plugins/Feedback/lang/cs.json index f1cf4788c1..10e558ad3d 100644 --- a/plugins/Feedback/lang/cs.json +++ b/plugins/Feedback/lang/cs.json @@ -17,9 +17,9 @@ "SendFeedback": "Odeslat odezvu", "SpecialRequest": "Máte speciální požadavek na tým Piwiku?", "ThankYou": "Děkujeme vám, že pomáháte Piwik dělat lepším!", - "TopLinkTooltip": "Řekni co si myslíš, nebo pořádek pomoc profesionála.", + "TopLinkTooltip": "Řekni co si myslíš, nebo požádej o pomoc profesionála.", "ViewAnswersToFAQ": "Zobrazit odpovědi na %sčasto kladené otázky%s", - "ViewUserGuides": "eNaučte se jak konfigurovat Piwik a efektivně analyzovat data s našimi %1$suživatelskými příručkami%2$s", + "ViewUserGuides": "Naučte se, jak konfigurovat Piwik a efektivně analyzovat data s našimi %1$suživatelskými příručkami%2$s", "VisitTheForums": "Navštivte %s forum%s", "WantToThankConsiderDonating": "Myslíte si, že je Piwik úžasný a chcete nám poděkovat?" } diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php index 62608d8729..46b394b067 100644 --- a/plugins/Goals/Menu.php +++ b/plugins/Goals/Menu.php @@ -29,41 +29,40 @@ class Menu extends \Piwik\Plugin\Menu $site = new Site($idSite); if (count($goals) == 0) { + $action = $site->isEcommerceEnabled() ? 'ecommerceReport' : 'addNewGoal'; + $url = $this->urlForAction($action, array( + 'idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null + ))); - $menu->add($mainGoalMenu, '', array('module' => 'Goals', - 'action' => ($site->isEcommerceEnabled() ? 'ecommerceReport' : 'addNewGoal'), - 'idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null)), - true, - 25); + $menu->addItem($mainGoalMenu, '', $url, 25); if ($site->isEcommerceEnabled()) { - $menu->add($mainGoalMenu, 'Goals_Ecommerce', array('module' => 'Goals', 'action' => 'ecommerceReport', 'idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER), true, 1); + $menu->addItem($mainGoalMenu, 'Goals_Ecommerce', $this->urlForAction('ecommerceReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)), 1); } - $menu->add($mainGoalMenu, 'Goals_AddNewGoal', array('module' => 'Goals', 'action' => 'addNewGoal')); + $menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $this->urlForAction('addNewGoal')); } else { - $menu->add($mainGoalMenu, '', array('module' => 'Goals', - 'action' => ($site->isEcommerceEnabled() ? 'ecommerceReport' : 'index'), - 'idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null)), - true, - 25); + $action = $site->isEcommerceEnabled() ? 'ecommerceReport' : 'index'; + $url = $this->urlForAction($action, array('idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null))); + + $menu->addItem($mainGoalMenu, '', $url, 25); if ($site->isEcommerceEnabled()) { - $menu->add($mainGoalMenu, 'Goals_Ecommerce', array('module' => 'Goals', 'action' => 'ecommerceReport', 'idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER), true, 1); + $menu->addItem($mainGoalMenu, 'Goals_Ecommerce', $this->urlForAction('ecommerceReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)), 1); } - $menu->add($mainGoalMenu, 'Goals_GoalsOverview', array('module' => 'Goals', 'action' => 'index'), true, 2); + $menu->addItem($mainGoalMenu, 'Goals_GoalsOverview', array('module' => 'Goals', 'action' => 'index'), 2); $group = new Group(); foreach ($goals as $goal) { $subMenuName = str_replace('%', '%%', Translate::clean($goal['name'])); - $params = array('module' => 'Goals', 'action' => 'goalReport', 'idGoal' => $goal['idgoal']); + $params = $this->urlForAction('goalReport', array('idGoal' => $goal['idgoal'])); $tooltip = sprintf('%s (id = %d)', $subMenuName, $goal['idgoal']); if (count($goals) <= 3) { - $menu->add($mainGoalMenu, $subMenuName, $params, true, 50, $tooltip); + $menu->addItem($mainGoalMenu, $subMenuName, $params, 50, $tooltip); } else { $group->add($subMenuName, $params, $tooltip); } diff --git a/plugins/Goals/lang/cs.json b/plugins/Goals/lang/cs.json index a712c6c39a..71ba5995ba 100644 --- a/plugins/Goals/lang/cs.json +++ b/plugins/Goals/lang/cs.json @@ -60,6 +60,7 @@ "GoalX": "Cíl: %s", "HelpOneConversionPerVisit": "Pokud byla stránka odpovídající cíli při návštěvě obnovena nebo zobrazena vícekrát, bude cíl započítán pouze jednou a to při prvním zobrazení.", "IsExactly": "je přesně %s", + "LearnMoreAboutGoalTrackingDocumentation": "Více o %s sledování cílů %s se dozvíte v uživatelské dokumentaci Piwiku.", "LeftInCart": "%s Zbylo v košíku", "Manually": "ručně", "ManuallyTriggeredUsingJavascriptFunction": "Cíl je ručně zaznamenáván pomocí JavaScriptového API trackGoal()", @@ -81,6 +82,7 @@ "Products": "Produktů", "ProductSKU": "SKU produktu", "ReturningVisitorsConversionRateIs": "Poměr konverze navracejících se uživatelů je %s", + "SendEvent": "Poslat událost", "SingleGoalOverviewDocumentation": "Toto je přehled konverzí jednoho cíle. %s Linky lze zvětšit kliknutím na ně.", "UpdateGoal": "Aktualizovat cíl", "URL": "URL", diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index b23e697dff..d9aeeabe67 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -14,7 +14,7 @@ use pData; use pImage; use Piwik\Piwik; use Piwik\SettingsPiwik; -use Piwik\Factory; +use Piwik\BaseFactory; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pDraw.class.php"; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pImage.class.php"; @@ -24,7 +24,7 @@ require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pData.class.php"; * The StaticGraph abstract class is used as a base class for different types of static graphs. * */ -abstract class StaticGraph extends Factory +abstract class StaticGraph extends BaseFactory { const GRAPH_TYPE_BASIC_LINE = "evolution"; const GRAPH_TYPE_VERTICAL_BAR = "verticalBar"; diff --git a/plugins/Insights/lang/fa.json b/plugins/Insights/lang/fa.json new file mode 100644 index 0000000000..cf80b66dec --- /dev/null +++ b/plugins/Insights/lang/fa.json @@ -0,0 +1,13 @@ +{ + "Insights": { + "DayComparedToPreviousDay": "روز گذشته", + "DayComparedToPreviousWeek": "همان روز در هفته گذشته", + "DayComparedToPreviousYear": "همان روز در سال گذشته", + "Filter": "فیلتر", + "FilterOnlyNew": "فقط جدید", + "MonthComparedToPreviousMonth": "ماه گذشته", + "MonthComparedToPreviousYear": "همان ماه در سال گذشته", + "WeekComparedToPreviousWeek": "هفته گذشته", + "YearComparedToPreviousYear": "سال گذشته" + } +}
\ No newline at end of file diff --git a/plugins/Installation/Menu.php b/plugins/Installation/Menu.php index 7ae25c8d79..fd57fab75c 100644 --- a/plugins/Installation/Menu.php +++ b/plugins/Installation/Menu.php @@ -17,7 +17,7 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::hasUserSuperUserAccess()) { $menu->addSettingsItem('Installation_SystemCheck', - array('module' => 'Installation', 'action' => 'systemCheckPage'), + $this->urlForAction('systemCheckPage'), $order = 15); } } diff --git a/plugins/Installation/lang/fa.json b/plugins/Installation/lang/fa.json index 56ea3eb2d2..0d0b538952 100644 --- a/plugins/Installation/lang/fa.json +++ b/plugins/Installation/lang/fa.json @@ -1,5 +1,6 @@ { "Installation": { + "CannotConnectToDb": "نمیتوان با پایگاه داده ارتباط برقرار کرد", "CollaborativeProject": "پیویک یک پروژه گروهی است که با عشق و علاقه توسط افرادی از سراسر دنیا ساخته شده است.", "ConfigurationHelp": "فایل پیکربندی Piwik شما به نظر می رسد بد باشد. شما هم می توانید پیکربندی \/ config.ini.php و حذف از سر نصب و راه اندازی و یا اصلاح تنظیمات اتصال پایگاه داده.", "ConfirmDeleteExistingTables": "آیا شما مطمئن هستید که می خواهید این جدول ها را : %s از پایگاه داده تان حذف کنید؟ هشدار : داده های این جدول ها قابل بازیابی نخواهد بود!", @@ -29,6 +30,7 @@ "NfsFilesystemWarningSuffixAdmin": "این به آن معنا است که پیویک بسیار کند خواهد بود هنگامی که از فایل مبتنی بر نشست ها(session) استفاده می کند.", "NfsFilesystemWarningSuffixInstall": "استفاده از نشست های مبتنی بر فایل با NFS بسیار کند است، بنابراین پیویک نشست های مبتنی بر پایگاه داده را به کار خواهد برد. اگر شما کاربران همزمان بسیاری دارید ، احتمالا نیاز به افزایش تعداد اتصالات کاربر(Client Connection) به پایگاه داده دارید.", "NoConfigFound": "Piwik فایل پیکربندی را می توان یافت نمی شود و شما در حال تلاش برای دسترسی به یک صفحه Piwik. <br\/><B> »می تواند href='index.php'> <a نصب Piwik در حال حاضر <\/a> <\/B> <br \/> <small> اگر شما نصب Piwik قبل و برخی از جداول در پایگاه داده خود را داشته باشند، نگران نباشید، شما می توانید جداول و استفاده مجدد از داده های موجود خود را حفظ کنید <\/small>", + "NotSupported": "پشتیبانی نمیشود", "Optional": "اختیاری", "Password": "کلمه عبور", "PasswordDoNotMatch": "کلمه عبور یکی نیست", diff --git a/plugins/LanguagesManager/Menu.php b/plugins/LanguagesManager/Menu.php index 1b53892a94..a51250d944 100644 --- a/plugins/LanguagesManager/Menu.php +++ b/plugins/LanguagesManager/Menu.php @@ -28,7 +28,7 @@ class Menu extends \Piwik\Plugin\Menu { if (Development::isEnabled() && Piwik::isUserHasSomeAdminAccess()) { $menu->addDevelopmentItem('LanguagesManager_TranslationSearch', - array('module' => 'LanguagesManager', 'action' => 'searchTranslation')); + $this->urlForAction('searchTranslation')); } } } diff --git a/plugins/LanguagesManager/lang/fa.json b/plugins/LanguagesManager/lang/fa.json index c868f3b1a3..b8dc955a53 100644 --- a/plugins/LanguagesManager/lang/fa.json +++ b/plugins/LanguagesManager/lang/fa.json @@ -1,6 +1,7 @@ { "LanguagesManager": { "AboutPiwikTranslations": "درباره ترجمه های پیویک", - "PluginDescription": "این پلاگین یک لیست از زبانهای در دسترس برای رابط Piwik را نمایش می دهد. زبان انتخاب شده در تنظیمات برای هر کاربر ذخیره خواهد شد." + "PluginDescription": "این پلاگین یک لیست از زبانهای در دسترس برای رابط Piwik را نمایش می دهد. زبان انتخاب شده در تنظیمات برای هر کاربر ذخیره خواهد شد.", + "TranslationSearch": "جستجوی ترجمه" } }
\ No newline at end of file diff --git a/plugins/LeftMenu/lang/tr.json b/plugins/LeftMenu/lang/tr.json new file mode 100644 index 0000000000..ab8dbb51d8 --- /dev/null +++ b/plugins/LeftMenu/lang/tr.json @@ -0,0 +1,5 @@ +{ + "LeftMenu": { + "UserSettingTitle": "Sol raporlama menüsünü etkinleştir" + } +}
\ No newline at end of file diff --git a/plugins/Live/API.php b/plugins/Live/API.php index b18dedf598..c2acabb619 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -382,6 +382,8 @@ class API extends \Piwik\Plugin\API $visit->setColumn('serverDateTimePrettyFirstAction', $dateTimePretty); } + $result['userId'] = $visit->getColumn('userId'); + // get visitor IDs that are adjacent to this one in log_visit // TODO: make sure order of visitor ids is not changed if a returning visitor visits while the user is // looking at the popup. diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index b03d37e650..d9bb556efd 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -39,6 +39,7 @@ class Visitor implements VisitorInterface 'idSite' => $this->getIdSite(), 'idVisit' => $this->getIdVisit(), 'visitIp' => $this->getIp(), + 'userId' => $this->getUserId(), 'visitorId' => $this->getVisitorId(), // => false are placeholders to be filled in API later @@ -84,6 +85,15 @@ class Visitor implements VisitorInterface return false; } + function getUserId() + { + if (isset($this->details['user_id']) + && !is_null($this->details['user_id'])) { + return $this->details['user_id']; + } + return false; + } + function getVisitServerHour() { return date('G', strtotime($this->details['visit_last_action_time'])); @@ -134,6 +144,7 @@ class Visitor implements VisitorInterface $toUnset = array('config_id'); if (Piwik::isUserIsAnonymous()) { $toUnset[] = 'idvisitor'; + $toUnset[] = 'user_id'; $toUnset[] = 'location_ip'; } foreach ($toUnset as $keyName) { diff --git a/plugins/Live/lang/cs.json b/plugins/Live/lang/cs.json index 539045b8f7..90799cd357 100644 --- a/plugins/Live/lang/cs.json +++ b/plugins/Live/lang/cs.json @@ -32,7 +32,7 @@ "VisitorLog": "Pohled na návštěvníky", "VisitorLogDocumentation": "Tato tabulka zobrazuje poslední návštěvy v daném období. Najetím na datum návštěvy zobrazíte čas, kdy tento návštěvník navštívil stránky naposledy. %s Pokud období zahrnuje dnešek, můžete vidět návštěvníky v reálném čase! %s Zde zobrazovaná data jsou vždy živá bez ohledu na to, jak a kdy probíhá archivační cron úloha.", "VisitorProfile": "Profil návštěvníka", - "VisitorsInRealTime": "Návstěv v reálném čase", + "VisitorsInRealTime": "Návštěvníci v reálném čase", "VisitorsLastVisit": "K poslední návštěvě tohoto návštěvníka došlo před %s dny.", "VisitsFrom": "%1$s%2$s návštěv%3$s z", "VisitSummary": "Strávil celkem %1$s%2$s na stránkách%3$s a %4$szobrazil %5$s stránek za %6$s návštěv.%7$s" diff --git a/plugins/Live/lang/tr.json b/plugins/Live/lang/tr.json index 6ea54bcf09..6b6a0328ce 100644 --- a/plugins/Live/lang/tr.json +++ b/plugins/Live/lang/tr.json @@ -1,10 +1,24 @@ { "Live": { + "ConvertedNGoals": "Dönüştürülen %s Hedef", + "FirstVisit": "İlk ziyaret", "GoalType": "Tür", + "HideMap": "haritayı gizle", + "LastHours": "Son %s saat", "LastMinutes": "Son %s dakika", + "LastVisit": "Son ziyaret", "LinkVisitorLog": "Ayrıntılı ziyaretçi kayitlari", + "LoadMoreVisits": "Daha fazla ziyaretçi yükle", + "NbVisitor": "1 ziyaretçi", + "NbVisitors": "%s ziyaretçi", + "NextVisitor": "Sonraki ziyaretçi", + "NoMoreVisits": "Bu ziyaretçi için daha fazla ziyaret bilgisi yok.", "PluginDescription": "Ziyaretçilerinizi gözleyin, canlı, gerçek zamanlı!", + "PreviousVisitor": "Önceki ziyaretçi", + "RealTimeVisitorCount": "Gerçek Zamanlı Ziyaretçi Sayacı", "Referrer_URL": "Yönlendirme Siteleri", + "ViewVisitorProfile": "Ziyaretçi profiline bak", + "VisitedPages": "Ziyaret edilmiş sayfalar", "VisitorLog": "Ziyaretçi kayıtları", "VisitorsInRealTime": "Gerçek Zamanlı Ziyaretçiler" } diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index f4389cdd29..17b762f603 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -118,13 +118,18 @@ {% if isWidget %}<br/>{% else %}-{% endif %} {{ visitor.getColumn('serverTimePrettyFirstAction') }}</strong> {% if visitor.getColumn('visitIp') is not empty %} <br/> - <span title="{% if visitor.getColumn('visitorId') is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitor.getColumn('visitorId') }}{% endif -%} - {%- if visitor.getColumn('latitude') or visitor.getColumn('longitude') %} + <span title="{% if visitor.getColumn('userId') is not empty %}{{ 'General_UserId'|translate }}: {{ visitor.getColumn('userId')|raw }}{% endif %} + +{% if visitor.getColumn('visitorId') is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitor.getColumn('visitorId') }}{% endif -%} +{%- if visitor.getColumn('latitude') or visitor.getColumn('longitude') %} {{ visitor.getColumn('location') }} GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longitude') }}{% endif %}"> - IP: {{ visitor.getColumn('visitIp') }}</span>{% endif %} + IP: {{ visitor.getColumn('visitIp') }} + {% if visitor.getColumn('userId') is not empty %}<br/><br/>{{ visitor.getColumn('userId')|raw }}{% endif %} + + </span>{% endif %} {% if visitor.getColumn('provider') and visitor.getColumn('providerName')!='IP' %} <br/> @@ -171,7 +176,8 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit <div class="visitor-log-page-list"> {% if visitor.getColumn('visitorId') is not empty %} <a class="visitor-log-visitor-profile-link" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}"> - <img src="plugins/Live/images/visitorProfileLaunch.png"/> <span>{{ 'Live_ViewVisitorProfile'|translate }}</span> + <img src="plugins/Live/images/visitorProfileLaunch.png"/> <span>{{ 'Live_ViewVisitorProfile'|translate }} + {%- if visitor.getColumn('userId') is not empty %}: {{ visitor.getColumn('userId')|raw }}{% endif %}</span> </a> {% endif %} <strong> diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index a165112f50..b37949e7ea 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -27,8 +27,10 @@ - <img src="{{ visitor.visitorTypeIcon }}" title="{{ 'General_ReturningVisitor'|translate }}"/> {% endif %} {% if visitor.visitorId|default(false) is not empty %} - <a class="visits-live-launch-visitor-profile rightLink" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.visitorId }}"> + <a class="visits-live-launch-visitor-profile rightLink" title="{{ 'Live_ViewVisitorProfile'|translate }} {% if visitor.userId is not empty %}{{ visitor.userId|raw }}{% endif %}" data-visitor-id="{{ visitor.visitorId }}"> + {% if visitor.userId is not empty %}<br/>{% endif %} <img src="plugins/Live/images/visitorProfileLaunch.png"/> + {{ visitor.userId|default('')|raw }} </a> {% endif %} {% if visitor.visitIp %}- <span title="{% if visitor.visitorId is not empty %}{{ 'General_VisitorID'|translate }}: {{ visitor.visitorId }}{% endif %}"> diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index aa378a6ccd..9206c5ac51 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -35,6 +35,7 @@ </div> </li> {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_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) -%} <li> diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index afeac813a1..9e68dde96b 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -22,7 +22,10 @@ <div> <div class="visitor-profile-header"> {% if visitorData.previousVisitorId is not empty %}<a class="visitor-profile-prev-visitor" href="#" title="{{ 'Live_PreviousVisitor'|translate }}">←</a>{% endif %} - <h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/></h1> + <h1>{{ 'Live_VisitorProfile'|translate }} + {%- if visitorData.userId is not empty %}: <span title="{{'General_UserId'|translate}}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span>{% endif -%} + <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/> + </h1> <a href="http://piwik.org/docs/user-profile/" class="reportDocumentationIcon" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"></a> {% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" href="#" title="{{ 'Live_NextVisitor'|translate }}">→</a>{% endif %} </div> diff --git a/plugins/MobileMessaging/Menu.php b/plugins/MobileMessaging/Menu.php index 4dea3c329d..e810e99744 100644 --- a/plugins/MobileMessaging/Menu.php +++ b/plugins/MobileMessaging/Menu.php @@ -14,10 +14,6 @@ class Menu extends \Piwik\Plugin\Menu { public function configureAdminMenu(MenuAdmin $menu) { - $menu->addSettingsItem( - 'MobileMessaging_SettingsMenu', - array('module' => 'MobileMessaging', 'action' => 'index'), - $order = 12 - ); + $menu->addSettingsItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 12); } } diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index 0019a1ad58..c9212971e2 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -10,13 +10,13 @@ namespace Piwik\Plugins\MobileMessaging; use Exception; use Piwik\Piwik; -use Piwik\Factory; +use Piwik\BaseFactory; /** * The SMSProvider abstract class is used as a base class for SMS provider implementations. * */ -abstract class SMSProvider extends Factory +abstract class SMSProvider extends BaseFactory { const MAX_GSM_CHARS_IN_ONE_UNIQUE_SMS = 160; const MAX_GSM_CHARS_IN_ONE_CONCATENATED_SMS = 153; diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less index 3c7eef2b2b..53743c3aa0 100644 --- a/plugins/Morpheus/stylesheets/theme.less +++ b/plugins/Morpheus/stylesheets/theme.less @@ -223,19 +223,10 @@ table.entityTable tr td a:hover { padding: 8px 10px 8px 10px; .border-radius(0px); .segmentationTitle { - background: none; + background: url(plugins/Morpheus/images/segment-users.png) no-repeat right 0; text-transform: uppercase; .font-default(10px, 12px); position: relative; - &:after { - content: ''; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 5px solid @theme-color-brand; - position: absolute; - top: 3px; - right: 0; - } } .dropdown-body { background:#fff; @@ -465,6 +456,28 @@ table.dataTable { } } +div.dataTableVizHtmlTable:not(.dataTableActions) { + tr.subDataTable > td:first-child:before { + display: inline-block; + float: left; + top: 0; + width: 12px; + height: 12px; + margin-left:-.5em; + margin-top:4px; + margin-right:8px; + content: ''; + } + + tr.subDataTable:not(.expanded) > td:first-child:before { + background-image: url(plugins/Morpheus/images/plus.png); + } + + tr.subDataTable.expanded > td:first-child:before { + background-image: url(plugins/Morpheus/images/minus.png); + } +} + table.dataTable tr.subDataTable:hover > td, table.dataTable tr.subDataTable:hover > td .dataTableRowActions { background-color: #d9d9d9; } diff --git a/plugins/Morpheus/templates/_piwikTag.twig b/plugins/Morpheus/templates/_piwikTag.twig index 98581d9ac5..84a459deb3 100644 --- a/plugins/Morpheus/templates/_piwikTag.twig +++ b/plugins/Morpheus/templates/_piwikTag.twig @@ -22,8 +22,8 @@ _paq.push(['enableJSErrorTracking']); (function() { - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src='js/piwik.js'; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src='js/piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code --> diff --git a/plugins/Morpheus/templates/javascriptCode.tpl b/plugins/Morpheus/templates/javascriptCode.tpl index 488f39d00c..344e6d0311 100644 --- a/plugins/Morpheus/templates/javascriptCode.tpl +++ b/plugins/Morpheus/templates/javascriptCode.tpl @@ -7,9 +7,9 @@ {$setTrackerUrl} _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', {$idSite}]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="http://{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> diff --git a/plugins/MultiSites/Menu.php b/plugins/MultiSites/Menu.php index 0cbee0d89b..5059cfc09d 100644 --- a/plugins/MultiSites/Menu.php +++ b/plugins/MultiSites/Menu.php @@ -15,7 +15,7 @@ class Menu extends \Piwik\Plugin\Menu { public function configureTopMenu(MenuTop $menu) { - $urlParams = array('module' => 'MultiSites', 'action' => 'index', 'segment' => false); + $urlParams = $this->urlForAction('index', array('segment' => false)); $tooltip = Piwik::translate('MultiSites_TopLinkTooltip'); $menu->add('General_MultiSitesSummary', null, $urlParams, true, 3, $tooltip); diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index f238b2adc2..35b6f5a793 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -79,7 +79,7 @@ class Controller extends \Piwik\Plugin\Controller $row = $dataTable->getFirstRow(); $translations = Metrics::getDefaultMetricTranslations(); - $showMetrics = array('nb_hits', 'nb_visits', 'nb_uniq_visitors', + $showMetrics = array('nb_hits', 'nb_visits', 'nb_users', 'nb_uniq_visitors', 'bounce_rate', 'exit_rate', 'avg_time_on_page'); foreach ($showMetrics as $metric) { diff --git a/plugins/PrivacyManager/Menu.php b/plugins/PrivacyManager/Menu.php index 5eee77622c..33c7aa55a2 100644 --- a/plugins/PrivacyManager/Menu.php +++ b/plugins/PrivacyManager/Menu.php @@ -17,7 +17,7 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::isUserHasSomeAdminAccess()) { $menu->addSettingsItem('PrivacyManager_MenuPrivacySettings', - array('module' => 'PrivacyManager', 'action' => 'privacySettings'), + $this->urlForAction('privacySettings'), $order = 7); } } diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index c5b1da1687..b96cc7beed 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -351,7 +351,7 @@ class PrivacyManager extends \Piwik\Plugin */ private static function getMetricsToKeep() { - return array('nb_uniq_visitors', 'nb_visits', 'nb_actions', 'max_actions', + return array('nb_uniq_visitors', 'nb_visits', 'nb_users', 'nb_actions', 'max_actions', 'sum_visit_length', 'bounce_count', 'nb_visits_converted', 'nb_conversions', 'revenue', 'quantity', 'price', 'orders'); } diff --git a/plugins/PrivacyManager/lang/cs.json b/plugins/PrivacyManager/lang/cs.json index 12f2d404b4..f5a1a6dd3c 100644 --- a/plugins/PrivacyManager/lang/cs.json +++ b/plugins/PrivacyManager/lang/cs.json @@ -4,16 +4,16 @@ "AnonymizeIpInlineHelp": "Skryje poslední byte IP adresy návštěvníka, aby souhlasila se zákony vaší země.", "AnonymizeIpMaskLengtDescription": "Zvolte, kolik bitů z návštěvníkovy IP adresy má být maskováno.", "AnonymizeIpMaskLength": "%s bitů - např. %s", - "CannotLockSoDeleteLogActions": "Tabulka log_action nebude vyprázdněn: adejte Mysql uživateli %s privilegium LOCK TABLES.", + "CannotLockSoDeleteLogActions": "Tabulka log_action nebude vyprázdněna: dejte Mysql uživateli %s privilegium LOCK TABLES.", "ClickHereSettings": "Pro přístup k nastavení %s klikněte zde.", "CurrentDBSize": "Aktuální velikost databáze", "DBPurged": "Databáze vyprázdněna.", "DeleteBothConfirm": "Chystáte se povolit mazání dat logů i mazání dat hlášení. Tato operace trvale odstraní stará data. Opravdu to chcete provést?", - "DeleteDataDescription": "Můžete Piwik nastavit tak, aby po určitém čase mazal data rá stalogů nebo zpracovaná data hlášení. To pomáhá udržet malou databázi.", - "DeleteDataDescription2": "Pokud si to přejete, zpracovaných hlášení mohou zůstat a budou odstraněnajen data logů (zobrazení stránek, návštěvy a konverze) budou smazána. Nebo mohou být smazána hlášení a data logů mohou být zachována.", + "DeleteDataDescription": "Můžete Piwik nastavit tak, aby po určitém čase mazal stará data logů nebo zpracovaná data hlášení. To pomáhá udržet malou databázi.", + "DeleteDataDescription2": "Pokud si to přejete, zpracovaná hlášení mohou zůstat a budou odstraněna jen data logů (zobrazení stránek (návštěvy a konverze). Nebo mohou být smazána hlášení a data logů mohou být zachována.", "DeleteDataInterval": "Smazat stará data každých", "DeleteDataSettings": "Smazat staré logy návštěvníků a hlášení", - "DeleteLogDescription2": "Pokud povolíte automatické mazání logů, musíte zajistit, že jsou zpracovány všechna denní hlášení, aby nedošlo ke ztrátě dat.", + "DeleteLogDescription2": "Pokud povolíte automatické mazání logů, musíte zajistit, že jsou zpracována všechna denní hlášení, aby nedošlo ke ztrátě dat.", "DeleteLogInfo": "Logy z následujících tabulek budou smazány: %s", "DeleteLogsConfirm": "Chystáte se povolit mazání dat logů. Pokud budou odstraněna stará data logů a nebyla vytvořena historická hlášení, nebudete schopen zobrazit stará analytická data. Oprav", "DeleteLogsOlderThan": "Vymazat logy starší než", @@ -28,7 +28,7 @@ "DeleteSchedulingSettings": "Nastavení plánování", "DoNotTrack_Description": "Do not track je návrh technologie a politiky, která umožňuje uživatelům indikovat, že si nepřejí být stránkami, které navštěvují a to včetně služeb webové analýzi, reklamních služeb a sociálních platforem.", "DoNotTrack_Disable": "Zakázat podporu Do not track", - "DoNotTrack_Disabled": "Pivik sleduje všechny návštěvníky včetně těch, kteří v možnostech svého webového prohlížeče nastavili, že si nepřejí být sledováni.", + "DoNotTrack_Disabled": "Piwik sleduje všechny návštěvníky včetně těch, kteří v možnostech svého webového prohlížeče nastavili, že si nepřejí být sledováni.", "DoNotTrack_DisabledMoreInfo": "Doporučujeme respektovat soukromí vašich návštěvníků a podporu Do not track povolit.", "DoNotTrack_Enable": "Povolit podporu Do not track", "DoNotTrack_Enabled": "Aktuálně respektujete soukromí vašich návštěvníků, víborně!", @@ -38,7 +38,7 @@ "EstimatedSpaceSaved": "Odhadované ušetřené místo", "GeolocationAnonymizeIpNote": "Poznámka: Geolokace bude mít přibližně stejnou přesnost, když je anonymizován 1 bit. Pokud jsou anonymizovány 2 bity a více, geolokace bude nepřesná.", "GetPurgeEstimate": "Získat odhad po vyprázdnění", - "KeepBasicMetrics": "Uchovat základní měření (návštěvy, zobrazení stránek, odchody, cíle, atd.)", + "KeepBasicMetrics": "Uchovat základní metriky (návštěvy, zobrazení stránek, odchody, cíle, atd.)", "KeepDataFor": "Uchovávat všechna data po", "KeepReportSegments": "Pro výše uchovávaná data také zachovat segmentovaná hlášení", "LastDelete": "Poslední mazání bylo v", diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 26286810fa..e683cb7f9e 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -208,8 +208,9 @@ class Controller extends \Piwik\Plugin\Controller } // configure selectable columns + // todo: should use SettingsPiwik::isUniqueVisitorsEnabled if (Common::getRequestVar('period', false) == 'day') { - $selectable = array('nb_visits', 'nb_uniq_visitors', 'nb_actions'); + $selectable = array('nb_visits', 'nb_uniq_visitors', 'nb_users', 'nb_actions'); } else { $selectable = array('nb_visits', 'nb_actions'); } diff --git a/plugins/Referrers/Menu.php b/plugins/Referrers/Menu.php index 60768d7c2f..835ae15f78 100644 --- a/plugins/Referrers/Menu.php +++ b/plugins/Referrers/Menu.php @@ -14,9 +14,9 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addReferrersItem('', array('module' => 'Referrers', 'action' => 'index'), 20); - $menu->addReferrersItem('General_Overview', array('module' => 'Referrers', 'action' => 'index'), 1); - $menu->addReferrersItem('Referrers_SubmenuSearchEngines', array('module' => 'Referrers', 'action' => 'getSearchEnginesAndKeywords'), 2); - $menu->addReferrersItem('Referrers_SubmenuWebsites', array('module' => 'Referrers', 'action' => 'indexWebsites'), 3); + $menu->addReferrersItem('', $this->urlForAction('index'), 20); + $menu->addReferrersItem('General_Overview', $this->urlForAction('index'), 1); + $menu->addReferrersItem('Referrers_SubmenuSearchEngines', $this->urlForAction('getSearchEnginesAndKeywords'), 2); + $menu->addReferrersItem('Referrers_SubmenuWebsites', $this->urlForAction('indexWebsites'), 3); } } diff --git a/plugins/ScheduledReports/Menu.php b/plugins/ScheduledReports/Menu.php index 26aafad2ad..6c0111ff23 100644 --- a/plugins/ScheduledReports/Menu.php +++ b/plugins/ScheduledReports/Menu.php @@ -24,10 +24,10 @@ class Menu extends \Piwik\Plugin\Menu \Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging') ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip'); - $menu->addManageItem(null, array('module' => '', 'action' => '', 'segment' => false), 10); + $menu->addManageItem(null, $this->urlForDefaultAction(array('segment' => false)), 10); $menu->addManageItem( $this->getTopMenuTranslationKey(), - array('module' => 'ScheduledReports', 'action' => 'index', 'segment' => false), + $this->urlForAction('index', array('segment' => false)), 13, $tooltip ); diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index 301fe44a50..98b752cc2a 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -115,7 +115,13 @@ class API extends \Piwik\Plugin\API protected function checkUserCanAddNewSegment($idSite) { - if(!$this->isUserCanAddNewSegment($idSite)) { + if (empty($idSite) + && !SegmentEditor::isAddingSegmentsForAllWebsitesEnabled() + ) { + throw new Exception(Piwik::translate('SegmentEditor_AddingSegmentForAllWebsitesDisabled')); + } + + if (!$this->isUserCanAddNewSegment($idSite)) { throw new Exception(Piwik::translate('SegmentEditor_YouDontHaveAccessToCreateSegments')); } } diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index a79cc0be24..bd957c54c0 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\SegmentEditor; +use Piwik\Config; use Piwik\Db; use Piwik\DbHelper; use Piwik\Version; @@ -98,4 +99,14 @@ class SegmentEditor extends \Piwik\Plugin { $stylesheets[] = "plugins/SegmentEditor/stylesheets/segmentation.less"; } + + /** + * Returns whether adding segments for all websites is enabled or not. + * + * @return bool + */ + public static function isAddingSegmentsForAllWebsitesEnabled() + { + return Config::getInstance()->General['allow_adding_segments_for_all_websites'] == 1; + } } diff --git a/plugins/SegmentEditor/SegmentSelectorControl.php b/plugins/SegmentEditor/SegmentSelectorControl.php index bb58caa297..4e88d2191f 100644 --- a/plugins/SegmentEditor/SegmentSelectorControl.php +++ b/plugins/SegmentEditor/SegmentSelectorControl.php @@ -37,6 +37,8 @@ class SegmentSelectorControl extends UIControl $this->selectedSegment = Common::getRequestVar('segment', false, 'string'); + $this->isAddingSegmentsForAllWebsitesEnabled = SegmentEditor::isAddingSegmentsForAllWebsitesEnabled(); + $segments = APIMetadata::getInstance()->getSegmentsMetadata($this->idSite); $segmentsByCategory = array(); diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json index 999b0d41bb..a3f03751d8 100644 --- a/plugins/SegmentEditor/lang/en.json +++ b/plugins/SegmentEditor/lang/en.json @@ -24,6 +24,7 @@ "VisibleToMe": "me", "YouMayChangeSetting": "Alternatively you may change the setting in the config file (%s), or edit this Segment and choose '%s'.", "YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments.", - "YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments." + "YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments.", + "AddingSegmentForAllWebsitesDisabled": "Adding segments for all websites has been disabled." } }
\ No newline at end of file diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index ab96ba4e09..f7f27d94e0 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -569,7 +569,7 @@ div.scrollable { span.segmentationTitle { background: url(plugins/Morpheus/images/sort_subtable_desc.png) no-repeat right 0; padding-right: 20px; - width: 160px; + min-width: 160px; display: block; cursor: pointer; } diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index 89c8a314bf..1d1b2275d8 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -122,7 +122,7 @@ {{ 'SegmentEditor_SegmentIsDisplayedForWebsite'|translate }}<span class="visible_to_website"><strong> <select class="visible_to_website_select"> <option selected="" value="{{ idSite }}">{{ 'SegmentEditor_SegmentDisplayedThisWebsiteOnly'|translate }}</option> - <option value="0">{{ 'SegmentEditor_SegmentDisplayedAllWebsites'|translate }}</option> + {% if isAddingSegmentsForAllWebsitesEnabled %}<option value="0">{{ 'SegmentEditor_SegmentDisplayedAllWebsites'|translate }}</option>{% endif %} </select> </strong></span> {{ 'General_And'|translate }} <span class="auto_archive"><strong> diff --git a/plugins/SitesManager/Menu.php b/plugins/SitesManager/Menu.php index 017690f442..3f4d1b02ad 100644 --- a/plugins/SitesManager/Menu.php +++ b/plugins/SitesManager/Menu.php @@ -17,7 +17,7 @@ class Menu extends \Piwik\Plugin\Menu { if (Piwik::isUserHasSomeAdminAccess()) { $menu->addManageItem('SitesManager_Sites', - array('module' => 'SitesManager', 'action' => 'index'), + $this->urlForAction('index'), $order = 1); } } diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index 3785e7492e..52e20800f6 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -100,7 +100,7 @@ DataTable_RowActions_Registry.register({ }, isAvailableOnRow: function (dataTableParams, tr) { - if (tr.attr('id')) { + if (tr.hasClass('subDataTable')) { // not available on groups (i.e. folders) return false; } diff --git a/plugins/UserCountry/Menu.php b/plugins/UserCountry/Menu.php index 41e259a618..9305ab23fa 100644 --- a/plugins/UserCountry/Menu.php +++ b/plugins/UserCountry/Menu.php @@ -18,13 +18,13 @@ class Menu extends \Piwik\Plugin\Menu { if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) { $menu->addSettingsItem('UserCountry_Geolocation', - array('module' => 'UserCountry', 'action' => 'adminIndex'), + $this->urlForAction('adminIndex'), $order = 8); } } public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('UserCountry_SubmenuLocations', array('module' => 'UserCountry', 'action' => 'index')); + $menu->addVisitorsItem('UserCountry_SubmenuLocations', $this->urlForAction('index')); } } diff --git a/plugins/UserCountry/lang/cs.json b/plugins/UserCountry/lang/cs.json index db4bd145a5..37cc8685b7 100644 --- a/plugins/UserCountry/lang/cs.json +++ b/plugins/UserCountry/lang/cs.json @@ -12,7 +12,7 @@ "CityAndCountry": "%1$s, %2$s", "Continent": "Kontinent", "continent_afr": "Afrika", - "continent_amc": "Středná Amerika", + "continent_amc": "Střední Amerika", "continent_amn": "Jižní Amerika", "continent_ams": "Severní a střední Amerika", "continent_ant": "Antarktida", @@ -21,7 +21,7 @@ "continent_oce": "Oceanie", "Country": "Státy", "country_a1": "Anonymní proxy", - "country_a2": "Staelitní poskytovatel", + "country_a2": "Satelitní poskytovatel", "country_ac": "Ascension Islands", "country_ad": "Andorra", "country_ae": "United Arab Emirates", diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 13eaf49150..b25ea22011 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -73,7 +73,8 @@ class Controller extends \Piwik\Plugin\Controller 'avg_time_on_site' => Piwik::translate('VisitsSummary_AverageVisitDuration'), 'and_n_others' => Piwik::translate('UserCountryMap_AndNOthers'), 'no_data' => Piwik::translate('CoreHome_ThereIsNoDataForThisReport'), - 'nb_uniq_visitors' => Piwik::translate('VisitsSummary_NbUniqueVisitors') + 'nb_uniq_visitors' => Piwik::translate('VisitsSummary_NbUniqueVisitors'), + 'nb_users' => Piwik::translate('VisitsSummary_NbUsers'), )); $view->reqParamsJSON = $this->getEnrichedRequest($params = array( @@ -224,6 +225,7 @@ class Controller extends \Piwik\Plugin\Controller $metrics = array(); foreach ($metaData[0]['metrics'] as $id => $val) { + // todo: should use SettingsPiwik::isUniqueVisitorsEnabled ? if (Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') { $metrics[] = array($id, $val); } diff --git a/plugins/UserCountryMap/Menu.php b/plugins/UserCountryMap/Menu.php index fa32a8f9b7..88108e3f4d 100644 --- a/plugins/UserCountryMap/Menu.php +++ b/plugins/UserCountryMap/Menu.php @@ -17,7 +17,7 @@ class Menu extends \Piwik\Plugin\Menu { if (PluginManager::getInstance()->isPluginActivated('UserCountry')) { $menu->addVisitorsItem('UserCountryMap_RealTimeMap', - array('module' => 'UserCountryMap', 'action' => 'realtimeWorldMap'), + $this->urlForAction('realtimeWorldMap'), $order = 70); } } diff --git a/plugins/UserSettings/Menu.php b/plugins/UserSettings/Menu.php index 5b442e5e09..c194ea20fb 100644 --- a/plugins/UserSettings/Menu.php +++ b/plugins/UserSettings/Menu.php @@ -14,6 +14,6 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('General_Settings', array('module' => 'UserSettings', 'action' => 'index')); + $menu->addVisitorsItem('General_Settings', $this->urlForAction('index')); } } diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/UserSettings/images/os/W81.gif Binary files differnew file mode 100644 index 0000000000..76ffe21587 --- /dev/null +++ b/plugins/UserSettings/images/os/W81.gif diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index fa87ec92e9..791f7e8f51 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -125,7 +125,7 @@ "Language_mt": "Maltese", "Language_my": "Burmese", "Language_na": "Nauru", - "Language_nb": "Norwegian Bokma\u00b0l", + "Language_nb": "Norwegian Bokm\u00e5l", "Language_nd": "North Ndebele", "Language_ne": "Nepali", "Language_ng": "Ndonga", diff --git a/plugins/UsersManager/Menu.php b/plugins/UsersManager/Menu.php index 494d09542c..8335d97305 100644 --- a/plugins/UsersManager/Menu.php +++ b/plugins/UsersManager/Menu.php @@ -16,12 +16,8 @@ class Menu extends \Piwik\Plugin\Menu public function configureAdminMenu(MenuAdmin $menu) { if (Piwik::isUserHasSomeAdminAccess()) { - $menu->addManageItem('UsersManager_MenuUsers', - array('module' => 'UsersManager', 'action' => 'index'), - $order = 2); - $menu->addManageItem('UsersManager_MenuUserSettings', - array('module' => 'UsersManager', 'action' => 'userSettings'), - $order = 3); + $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 2); + $menu->addManageItem('UsersManager_MenuUserSettings', $this->urlForAction('userSettings'), $order = 3); } } } diff --git a/plugins/UsersManager/lang/fa.json b/plugins/UsersManager/lang/fa.json index cd5cd32e9b..6761bde40e 100644 --- a/plugins/UsersManager/lang/fa.json +++ b/plugins/UsersManager/lang/fa.json @@ -27,6 +27,7 @@ "ForAnonymousUsersReportDateToLoadByDefault": "برای کاربران ناشناس، تاریخ گزارش به طور پیش فرض باز", "IfYouWouldLikeToChangeThePasswordTypeANewOne": "اگر می خواهید از نوع رمز عبور را تغییر جدید است. در غیر این صورت این قسمت را خالی بگذارید.", "InjectedHostCannotChangePwd": "شما هم اکنون در حال بازدید توسط یک میزبان ناشناخته هستید(%1$s). شما نمی توانید رمز عبورتان را تغییر دهید تا زمانی که این مشکل را حل نکرده اید.", + "LastSeen": "آخرین بازدید", "MainDescription": "تصمیم بگیرید که کاربران که دسترسی Piwik را روی وب سایت خود را دارند. شما همچنین می توانید مجوز در تمام وب سایت در یک بار تنظیم شده است.", "ManageAccess": "مدیریت دسترسی", "MenuAnonymousUserSettings": "تنظیمات کاربران ناشناس", diff --git a/plugins/VisitFrequency/Menu.php b/plugins/VisitFrequency/Menu.php index 8759cf751d..e858bd2f76 100644 --- a/plugins/VisitFrequency/Menu.php +++ b/plugins/VisitFrequency/Menu.php @@ -14,7 +14,6 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('VisitFrequency_SubmenuFrequency', - array('module' => 'VisitFrequency', 'action' => 'index'), $order = 55); + $menu->addVisitorsItem('VisitFrequency_SubmenuFrequency', $this->urlForAction('index'), $order = 55); } } diff --git a/plugins/VisitTime/Menu.php b/plugins/VisitTime/Menu.php index db221a4eda..ffa3a5b015 100644 --- a/plugins/VisitTime/Menu.php +++ b/plugins/VisitTime/Menu.php @@ -14,7 +14,6 @@ class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('VisitTime_SubmenuTimes', - array('module' => 'VisitTime', 'action' => 'index'), $order = 65); + $menu->addVisitorsItem('VisitTime_SubmenuTimes', $this->urlForAction('index'), $order = 65); } } diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index e89113eed2..8012de8f50 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -95,7 +95,7 @@ class API extends \Piwik\Plugin\API 'max_actions' ); if (SettingsPiwik::isUniqueVisitorsEnabled($period)) { - $columns = array_merge(array('nb_uniq_visitors'), $columns); + $columns = array_merge(array('nb_uniq_visitors', 'nb_users'), $columns); } $columns = array_values($columns); return $columns; @@ -116,7 +116,16 @@ class API extends \Piwik\Plugin\API public function getUniqueVisitors($idSite, $period, $date, $segment = false) { - return $this->getNumeric($idSite, $period, $date, $segment, 'nb_uniq_visitors'); + $metric = 'nb_uniq_visitors'; + $this->checkUniqueIsEnabledOrFail($period, $metric); + return $this->getNumeric($idSite, $period, $date, $segment, $metric); + } + + public function getUsers($idSite, $period, $date, $segment = false) + { + $metric = 'nb_users'; + $this->checkUniqueIsEnabledOrFail($period, $metric); + return $this->getNumeric($idSite, $period, $date, $segment, $metric); } public function getActions($idSite, $period, $date, $segment = false) @@ -155,4 +164,19 @@ class API extends \Piwik\Plugin\API } return $table; } + + /** + * @param $period + * @param $metric + * @throws \Exception + */ + private function checkUniqueIsEnabledOrFail($period, $metric) + { + if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) { + throw new \Exception( + "The metric " . $metric . " is not enabled for the requested period. " . + "Please see this FAQ: http://piwik.org/faq/how-to/faq_113/" + ); + } + } } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 1919fd325b..903b2477cf 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -60,6 +60,9 @@ class Controller extends \Piwik\Plugin\Controller . '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> ' . Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />' + . '<b>' . Piwik::translate('General_ColumnNbUsers') . ':</b> ' + . Piwik::translate('General_ColumnNbUsersDocumentation') . ' (<a target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />' + . '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> ' . Piwik::translate('General_ColumnActionsPerVisitDocumentation'); @@ -67,6 +70,7 @@ class Controller extends \Piwik\Plugin\Controller // columns from VisitsSummary.get 'nb_visits', 'nb_uniq_visitors', + 'nb_users', 'avg_time_on_site', 'bounce_rate', 'nb_actions_per_visit', @@ -124,6 +128,7 @@ class Controller extends \Piwik\Plugin\Controller protected function setSparklinesAndNumbers($view) { $view->urlSparklineNbVisits = $this->getUrlSparkline('getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('nb_visits', 'nb_uniq_visitors') : array('nb_visits'))); + $view->urlSparklineNbUsers = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_users'))); $view->urlSparklineNbPageviews = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews'))); $view->urlSparklineNbDownloads = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads'))); $view->urlSparklineNbOutlinks = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks'))); @@ -144,6 +149,7 @@ class Controller extends \Piwik\Plugin\Controller $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow(); $view->nbUniqVisitors = (int)$dataRow->getColumn('nb_uniq_visitors'); + $view->nbUsers = (int)$dataRow->getColumn('nb_users'); $nbVisits = (int)$dataRow->getColumn('nb_visits'); $view->nbVisits = $nbVisits; diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php index 926967875a..82a21f1cc9 100644 --- a/plugins/VisitsSummary/Reports/Get.php +++ b/plugins/VisitsSummary/Reports/Get.php @@ -22,6 +22,7 @@ class Get extends \Piwik\Plugin\Report $this->metrics = array( 'nb_uniq_visitors', 'nb_visits', + 'nb_users', 'nb_actions', 'nb_actions_per_visit', 'bounce_rate', diff --git a/plugins/VisitsSummary/lang/cs.json b/plugins/VisitsSummary/lang/cs.json index d4cd9aa258..6c191f1c2b 100644 --- a/plugins/VisitsSummary/lang/cs.json +++ b/plugins/VisitsSummary/lang/cs.json @@ -12,7 +12,7 @@ "NbOutlinksDescription": "%s externích odkazů", "NbPageviewsDescription": "%s zobrazení", "NbSearchesDescription": "Celkem %s vyhledávání na vašich stránkách", - "NbUniqueDownloadsDescription": "%s unikátních stražení", + "NbUniqueDownloadsDescription": "%s unikátních stažení", "NbUniqueOutlinksDescription": "%s unikátních externích odkazů", "NbUniquePageviewsDescription": "%s unikátních zobrazení", "NbUniqueVisitors": "%s unikátních návštěvníků", diff --git a/plugins/VisitsSummary/templates/_sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig index 24c5ad4a74..fd58642ad2 100644 --- a/plugins/VisitsSummary/templates/_sparklines.twig +++ b/plugins/VisitsSummary/templates/_sparklines.twig @@ -4,6 +4,13 @@ {{ 'General_NVisits'|translate("<strong>"~nbVisits~"</strong>")|raw }}{% if displayUniqueVisitors %}, {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"~nbUniqVisitors~"</strong>")|raw }}{% endif %} </div> + {% if nbUsers > 0 %} + {# Most of users will not have used `setUserId` so this would be confusingly zero #} + <div class="sparkline"> + {{ sparkline(urlSparklineNbUsers)|raw }} + {{ 'General_NUsers'|translate("<strong>"~nbUsers~"</strong>")|raw }} + </div> + {% endif %} <div class="sparkline"> {{ sparkline(urlSparklineAvgVisitDuration)|raw }} {% set averageVisitDuration=averageVisitDuration|sumtime %} diff --git a/plugins/Widgetize/Menu.php b/plugins/Widgetize/Menu.php index 954df309e5..f796faf57e 100644 --- a/plugins/Widgetize/Menu.php +++ b/plugins/Widgetize/Menu.php @@ -16,7 +16,7 @@ class Menu extends \Piwik\Plugin\Menu public function configureUserMenu(MenuUser $menu) { $tooltip = Piwik::translate('Widgetize_TopLinkTooltip'); - $urlParams = array('module' => 'Widgetize', 'action' => 'index', 'segment' => false); + $urlParams = $this->urlForAction('index', array('segment' => false)); $menu->addPlatformItem(null, $urlParams, 50, $tooltip); $menu->addPlatformItem('General_Widgets', $urlParams, 5, $tooltip); diff --git a/plugins/ZenMode/lang/fa.json b/plugins/ZenMode/lang/fa.json new file mode 100644 index 0000000000..d221d07b56 --- /dev/null +++ b/plugins/ZenMode/lang/fa.json @@ -0,0 +1,5 @@ +{ + "ZenMode": { + "SearchForAnything": "جستجوی همه" + } +}
\ No newline at end of file diff --git a/plugins/ZenMode/lang/ru.json b/plugins/ZenMode/lang/ru.json new file mode 100644 index 0000000000..e941f5c672 --- /dev/null +++ b/plugins/ZenMode/lang/ru.json @@ -0,0 +1,5 @@ +{ + "ZenMode": { + "Activated": "Режим Дзен активирован" + } +}
\ No newline at end of file diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 46243ef340..afa0a6a4bc 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -47,7 +47,6 @@ class Piwik_LocalTracker extends PiwikTracker Cache::$trackerCache = null; Tracker::setForceIp(null); Tracker::setForceDateTime(null); - Tracker::setForceVisitorId(null); // save some values $plugins = Config::getInstance()->Plugins['Plugins']; diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php index ce496684ba..47bbddb2d2 100644 --- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php @@ -29,6 +29,8 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase $validTill = '2014-10-15'; $this->assertDeprecatedMethodIsRemoved('\Piwik\SettingsPiwik', 'rewriteTmpPathWithHostname', $validTill); + + $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add'); } private function assertDeprecatedMethodIsRemoved($className, $method, $removalDate) @@ -49,4 +51,22 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase $errorMessage = $className . '::' . $method . ' should be removed as the method is deprecated but it is not.'; $this->assertFalse($methodExists, $errorMessage); } + + private function assertDeprecatedMethodIsRemovedInPiwik3($className, $method) + { + $version = \Piwik\Version::VERSION; + + $class = new ReflectionClass($className); + $methodExists = $class->hasMethod($method); + + if (-1 === version_compare($version, '3.0.0')) { + + $errorMessage = $className . '::' . $method . ' should still exists until 3.0 although it is deprecated.'; + $this->assertTrue($methodExists, $errorMessage); + return; + } + + $errorMessage = $className . '::' . $method . ' should be removed as the method is deprecated but it is not.'; + $this->assertFalse($methodExists, $errorMessage); + } }
\ No newline at end of file diff --git a/tests/PHPUnit/Core/FactoryTest.php b/tests/PHPUnit/Core/FactoryTest.php index dfa6cbdb7a..d85efcc2ce 100644 --- a/tests/PHPUnit/Core/FactoryTest.php +++ b/tests/PHPUnit/Core/FactoryTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Factory; +use Piwik\BaseFactory; /** * @group Core @@ -16,7 +16,7 @@ class FactoryTest extends PHPUnit_Framework_TestCase { public function testCreatingExistingClassSucceeds() { - $instance = Factory::factory("Piwik\\Timer"); + $instance = BaseFactory::factory("Piwik\\Timer"); $this->assertNotNull($instance); $this->assertInstanceOf("Piwik\\Timer", $instance); @@ -28,6 +28,6 @@ class FactoryTest extends PHPUnit_Framework_TestCase */ public function testCreatingInvalidClassThrows() { - Factory::factory("This\\Class\\Does\\Not\\Exist"); + BaseFactory::factory("This\\Class\\Does\\Not\\Exist"); } }
\ No newline at end of file diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Core/MetricsTest.php index 735905b052..76ae1aa521 100644 --- a/tests/PHPUnit/Core/MetricsTest.php +++ b/tests/PHPUnit/Core/MetricsTest.php @@ -19,6 +19,7 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase $expectedNames = array(
1 => 'nb_uniq_visitors',
2 => 'nb_visits',
+ 39 => 'nb_users',
3 => 'nb_actions',
4 => 'max_actions',
5 => 'sum_visit_length',
@@ -41,11 +42,13 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase 'max_actions' => 4,
'sum_visit_length' => 5,
'bounce_count' => 6,
+ 'nb_users' => 39,
'nb_visits_converted' => 7,
'nb_conversions' => 8,
'revenue' => 23,
'goals' => 10,
'sum_daily_nb_uniq_visitors' => 11,
+ 'sum_daily_nb_users' => 40,
'nb_hits' => 12,
'sum_time_spent' => 13,
'sum_time_generation' => 30,
@@ -94,7 +97,7 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase $actual = Metrics::isLowerValueBetter($column);
$this->assertEquals($expected, $actual);
}
- +
public function getUnitColumns()
{
return array(
@@ -123,5 +126,5 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase $actual = Metrics::getUnit($column, 1);
$this->assertEquals($expected, $actual);
}
- +
}
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php deleted file mode 100644 index 8d895228b4..0000000000 --- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php +++ /dev/null @@ -1,95 +0,0 @@ -<?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\Tests\Fixtures; - -use Piwik\Date; -use Piwik\Tracker\Visit; -use Piwik\Tests\Fixture; -use PiwikTracker; -use Exception; - -/** - * Adds one site and tracks a couple visits using a custom visitor ID. - */ -class FewVisitsWithSetVisitorId extends Fixture -{ - public $idSite = 1; - public $dateTime = '2010-03-06 11:22:33'; - - public function setUp() - { - $this->setUpWebsitesAndGoals(); - $this->trackVisits(); - } - - public function tearDown() - { - // empty - } - - private function setUpWebsitesAndGoals() - { - // tests run in UTC, the Tracker in UTC - if (!self::siteCreated($idSite = 1)) { - self::createWebsite($this->dateTime); - } - } - - private function trackVisits() - { - $dateTime = $this->dateTime; - $idSite = $this->idSite; - - $t = self::getTracker($idSite, $dateTime, $defaultInit = true); - - // First, some basic tests - self::settingInvalidVisitorIdShouldThrow($t); - - // We create VISITOR A - $t->setUrl('http://example.org/index.htm'); - $t->setVisitorId(Visit::generateUniqueVisitorId()); - self::checkResponse($t->doTrackPageView('incredible title!')); - - // VISITOR B: few minutes later, we trigger the same tracker but with a custom visitor ID, - // => this will create a new visit B - $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.05)->getDatetime()); - $t->setUrl('http://example.org/index2.htm'); - $t->setVisitorId(Visit::generateUniqueVisitorId()); - self::checkResponse($t->doTrackPageView('incredible title!')); - - // This new visit B will have 2 page views - $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); - $t->setUrl('http://example.org/index3.htm'); - self::checkResponse($t->doTrackPageView('incredible title!')); - - // total = 2 visitors, 3 page views - - } - - private static function settingInvalidVisitorIdShouldThrow(PiwikTracker $t) - { - try { - $t->setVisitorId('test'); - $this->fail('should throw'); - } catch (Exception $e) { - //OK - } - try { - $t->setVisitorId('61e8'); - $this->fail('should throw'); - } catch (Exception $e) { - //OK - } - try { - $t->setVisitorId('61e8cc2d51fea26dabcabcabc'); - $this->fail('should throw'); - } catch (Exception $e) { - //OK - } - } -}
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php new file mode 100644 index 0000000000..30accf676d --- /dev/null +++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php @@ -0,0 +1,219 @@ +<?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\Tests\Fixtures; + +use Piwik\Date; +use Piwik\Plugins\Goals\API; +use Piwik\Tracker\Visit; +use Piwik\Tests\Fixture; +use PiwikTracker; +use Exception; + +/** + * Adds one site and tracks a couple visits using a custom visitor ID. + */ +class FewVisitsWithSetVisitorId extends Fixture +{ + public $idSite = 1; + public $idGoal = 1; + public $dateTime = '2010-03-06 11:22:33'; + + const USER_ID_EXAMPLE_COM = 'email@example.com'; + + public function setUp() + { + $this->setUpWebsitesAndGoals(); + $this->trackVisits_setVisitorId(); + $this->trackVisits_setUserId(); + + // generate data for the period = week, month, year use cases + $this->trackVisits_oneWeekLater_setUserId(); + } + + public function tearDown() + { + // empty + } + + private function setUpWebsitesAndGoals() + { + // tests run in UTC, the Tracker in UTC + if (!self::siteCreated($this->idSite)) { + self::createWebsite($this->dateTime); + } + if (!self::goalExists($this->idSite, $this->idGoal)) { + API::getInstance()->addGoal($this->idSite, 'triggered js', 'manually', '', ''); + } + } + + private function trackVisits_setVisitorId() + { + // total = 2 visitors, 3 page views + $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + + // First, some basic tests + $this->settingInvalidVisitorIdShouldThrow($t); + + // We create VISITOR A + $t->setUrl('http://example.org/index.htm'); + $t->setVisitorId('a13b7c5a62f72dea'); + self::checkResponse($t->doTrackPageView('incredible title!')); + + // VISITOR B: few minutes later, we trigger the same tracker but with a custom visitor ID, + // => this will create a new visit B + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.05)->getDatetime()); + $t->setUrl('http://example.org/index2.htm'); + $t->setVisitorId('f66bc315f2a01a79'); + self::checkResponse($t->doTrackPageView('incredible title!')); + + // This new visit B will have 2 page views + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.1)->getDatetime()); + $t->setUrl('http://example.org/index3.htm'); + self::checkResponse($t->doTrackPageView('incredible title!')); + + } + + private function trackVisits_setUserId() + { + // total = 2 visitors, 3 page views + $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + + // First, some basic tests + $this->settingInvalidUserIdShouldThrow($t); + + // A NEW VISIT + // Setting both Visitor ID and User ID + // -> User ID takes precedence + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2)->getDatetime()); + $t->setUrl('http://example.org/index.htm'); + + // Set Visitor ID first. + $generatedVisitorId = '6ccebef4faef4969'; + $t->setVisitorId($generatedVisitorId); + $this->assertEquals($generatedVisitorId, $t->getVisitorId()); + + // Set User ID + $userId = self::USER_ID_EXAMPLE_COM; + $t->setUserId($userId); + $this->assertEquals($userId, $t->getUserId()); + + // User ID takes precedence over any previously set Visitor ID + $hashUserId = $t->getUserIdHashed($userId); + $this->assertEquals($hashUserId, $t->getVisitorId()); + + // Track a pageview with this user id + self::checkResponse($t->doTrackPageView('incredible title!')); + + // Track another pageview + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.1)->getDatetime()); + self::checkResponse($t->doTrackPageView('second page')); + + + // A NEW VISIT WITH A SET USER ID + // Change User ID -> This will create a new visit + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.2)->getDatetime()); + $t->setNewVisitorId(); + $secondUserId = 'new-email@example.com'; + $t->setUserId($secondUserId); + self::checkResponse($t->doTrackPageView('a new user id was set -> new visit')); + + // A NEW VISIT BY THE SAME USER + // Few hours later, the same user ID comes in from a different place and computer + $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(5)->getDatetime()); + // Make sure the computer and IP look really different from previous visit + $t->setIp('67.51.31.21'); + $t->setUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 (.NET CLR 3.5.30729)"); + $t->setBrowserLanguage('fr'); + $t->setUserId($secondUserId); + $t->setUrl('http://example.org/home'); + self::checkResponse($t->doTrackPageView('same user id was set -> this is the same unique user')); + + // Do not pass User ID in this request, it should still attribute to previous visit + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(5.1)->getDatetime()); + self::checkResponse($t->doTrackPageView('second pageview - by this user id')); + + // Request from a different computer not yet logged in, this should not be added to our User ID session + $t->setUserId(false); + // make sure the Id is not so random as to not fail the test + $t->randomVisitorId = '5e15b4d842cc294d'; + + $t->setIp('1.2.4.7'); + $t->setUserAgent("New unique device"); + self::checkResponse($t->doTrackPageView('pageview - should not be tracked by our user id but in a new visit')); + + // User has now logged in so we measure her interactions to her User ID + $t->setUserId($secondUserId); + + // Trigger a goal conversion + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(5.2)->getDatetime()); + self::checkResponse($t->doTrackGoal(1)); + + // An ecommerce add to cart + // (helpful to test that &segment=userId==x will return all items purchased by a specific user ID + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(5.3)->getDatetime()); + $t->setUrl('http://nsa.gov/buy/prism'); + $t->addEcommerceItem('sku-007-PRISM', 'My secret spy tech', 'Surveillance', '10000000000'); + $t->doTrackEcommerceCartUpdate(10000000000 + 500 /* add some for shipping PRISM */); + + } + + private function trackVisits_oneWeekLater_setUserId() + { + $oneWeekLater = Date::factory($this->dateTime)->addDay(8); + + // Set User ID to a known user id + $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + $t->setForceVisitDateTime($oneWeekLater->getDatetime()); + $t->setUrl('http://example.org/index.htm'); + $t->setUserId(self::USER_ID_EXAMPLE_COM); + self::checkResponse($t->doTrackPageView('Page view by ' . self::USER_ID_EXAMPLE_COM)); + + // Set a new User ID not set before + $t->setForceVisitDateTime($oneWeekLater->addHour(0.4)->getDatetime()); + $t->setUrl('http://example.org/index.htm'); + $userId = 'new-user-id@one-weeklater'; + $t->setUserId($userId); + $t->setVisitorId('6ccebef4faef4969'); // this should be ignored and User ID prevail + self::checkResponse($t->doTrackPageView('A page view by ' . $userId)); + $t->setForceVisitDateTime($oneWeekLater->addHour(0.8)->getDatetime()); + + } + + private function settingInvalidVisitorIdShouldThrow(PiwikTracker $t) + { + try { + $t->setVisitorId('test'); + $this->fail('should throw'); + } catch (Exception $e) { + //OK + } + try { + $t->setVisitorId('61e8'); + $this->fail('should throw'); + } catch (Exception $e) { + //OK + } + try { + $t->setVisitorId('61e8cc2d51fea26dabcabcabc'); + $this->fail('should throw'); + } catch (Exception $e) { + //OK + } + } + + private function settingInvalidUserIdShouldThrow(PiwikTracker $t) + { + try { + $t->setUserId(''); + $this->fail('should throw'); + } catch (Exception $e) { + //OK + } + } +}
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index c6d131b061..2d7620f4fe 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -179,6 +179,7 @@ class ManyVisitsWithGeoIP extends Fixture $t->setTokenAuth(self::getTokenAuth()); $t->setForceVisitDateTime(Date::factory($dateTime)->addDay(20)->getDatetime()); $t->setIp('194.57.91.215'); + $t->setUserId('userid.email@example.org'); $t->setCountry('us'); $t->setRegion('CA'); $t->setCity('not a city'); diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithSharedVisitors.php b/tests/PHPUnit/Fixtures/ThreeSitesWithSharedVisitors.php new file mode 100644 index 0000000000..267e848fde --- /dev/null +++ b/tests/PHPUnit/Fixtures/ThreeSitesWithSharedVisitors.php @@ -0,0 +1,84 @@ +<?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\Tests\Fixtures; + +use Piwik\Common; +use Piwik\Date; +use Piwik\Db; +use Piwik\Tests\Fixture; + +/** + * Adds three sites and tracks some visits w/ visitors that visit each site. + */ +class ThreeSitesWithSharedVisitors extends Fixture +{ + public $idSite = 1; + public $idSite1 = 2; + public $idSite2 = 3; + public $dateTime = '2010-03-06 11:22:33'; + + public function setUp() + { + $this->setUpWebsitesAndGoals(); + $this->trackVisits(); + } + + public function tearDown() + { + // empty + } + + private function setUpWebsitesAndGoals() + { + if (!self::siteCreated($this->idSite)) { + self::createWebsite($this->dateTime); + } + + if (!self::siteCreated($this->idSite1)) { + self::createWebsite($this->dateTime); + } + + if (!self::siteCreated($this->idSite2)) { + self::createWebsite($this->dateTime); + } + } + + private function trackVisits() + { + $dateTime = $this->dateTime; + $idSite = $this->idSite; + + // two visits to site 1 & 3 + $visitor1 = self::getTracker($idSite, $dateTime, $defaultInit = true); + $visitor1->setForceVisitDateTime(Date::factory($this->dateTime)->getDatetime()); + $visitor1->setUrl('http://helios.org/alpha'); + $visitor1->doTrackPageView("page title"); + + $visitor1->setIdSite($this->idSite2); + $visitor1->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(1)->getDatetime()); + $visitor1->setUrl('http://taura.org/'); + $visitor1->doTrackPageView("page title"); + + // one visit to site 1 + $visitor2 = self::getTracker($idSite, $dateTime, $defaultInit = true); + $visitor2->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2)->getDatetime()); + $visitor2->setUrl('http://helios.org/beta'); + $visitor2->doTrackPageView("page title 2"); + + // two visits to site 2 and 3 + $visitor3 = self::getTracker($this->idSite1, $dateTime, $defaultInit = true); + $visitor3->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(3)->getDatetime()); + $visitor3->setUrl('http://virgon.org/'); + $visitor3->doTrackPageView("page title 2"); + + $visitor3->setIdSite($this->idSite2); + $visitor3->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(4)->getDatetime()); + $visitor3->setUrl('http://taura.org/'); + $visitor3->doTrackPageView("page title"); + } +}
\ No newline at end of file diff --git a/tests/PHPUnit/Impl/ApiTestConfig.php b/tests/PHPUnit/Impl/ApiTestConfig.php index ecb778f536..a2dfab24d4 100644 --- a/tests/PHPUnit/Impl/ApiTestConfig.php +++ b/tests/PHPUnit/Impl/ApiTestConfig.php @@ -176,7 +176,7 @@ class ApiTestConfig public $xmlFieldsToRemove = false; /** - * If true, XML fields that change on each request for Live API methods are retained. + * If true, Date times XML fields that change on each request for Live API methods are retained. * Normally, they are removed before comparing the API response w/ expected. * * @param bool @@ -184,6 +184,14 @@ class ApiTestConfig public $keepLiveDates = false; /** + * If true, ID visitors/User ID/other IDs that change on each request for Live API methods are retained. + * Normally, they are removed before comparing the API response w/ expected. + * + * @param bool + */ + public $keepLiveIds = false; + + /** * Constructor. Sets class properties using an associative array mapping property names w/ values. * * @param array $params eg, `array('idSite' => 1, 'date' => '2012-01-01', ...)` diff --git a/tests/PHPUnit/Impl/TestRequestResponse.php b/tests/PHPUnit/Impl/TestRequestResponse.php index 9ce1a3da76..1f4bae3ebb 100644 --- a/tests/PHPUnit/Impl/TestRequestResponse.php +++ b/tests/PHPUnit/Impl/TestRequestResponse.php @@ -81,6 +81,10 @@ class TestRequestResponse private function normalizeApiResponse($apiResponse) { + if ($this->shouldDeleteLiveIds()) { + $apiResponse = $this->removeAllIdsFromXml($apiResponse); + } + if ($this->shouldDeleteLiveDates()) { $apiResponse = $this->removeAllLiveDatesFromXml($apiResponse); } else if ($this->requestHasNonDeterministicDate()) { @@ -123,6 +127,17 @@ class TestRequestResponse return preg_replace("/idSubtable=[0-9]+/", 'idSubtable=', $apiResponse); } + private function removeAllIdsFromXml($apiResponse) + { + $toRemove = array( + 'visitorId', + 'nextVisitorId', + 'previousVisitorId', + ); + + return $this->removeXmlFields($apiResponse, $toRemove); + } + private function removeAllLiveDatesFromXml($apiResponse) { $toRemove = array( @@ -137,9 +152,6 @@ class TestRequestResponse 'serverTimePrettyFirstAction', 'goalTimePretty', 'serverTimePretty', - 'visitorId', - 'nextVisitorId', - 'previousVisitorId', 'visitServerHour', 'date', 'prettyDate', @@ -211,6 +223,11 @@ class TestRequestResponse || strpos($dateTime, 'now') !== false; } + private function shouldDeleteLiveIds() + { + return empty($this->params['keepLiveIds']); + } + private function shouldDeleteLiveDates() { return empty($this->params['keepLiveDates']) diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php index a24c507877..8e68ab6610 100644 --- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php @@ -30,6 +30,9 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase { parent::setUpBeforeClass(); + // note: not sure why I have to manually install plugin + \Piwik\Plugin\Manager::getInstance()->loadPlugin('CustomAlerts')->install(); + $result = Fixture::updateDatabase(); if ($result === false) { throw new \Exception("Failed to update pre-2.0 database (nothing to update)."); @@ -60,6 +63,12 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase */ public function testApi($api, $params) { + // note: not sure why I have to manually activate plugin in order for `./console tests:run BackwardsCompatibility1XTest` to work + try { + \Piwik\Plugin\Manager::getInstance()->activatePlugin('DevicesDetection'); + } catch(\Exception $e) { + } + $this->runApiTests($api, $params); } @@ -87,7 +96,10 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase array('all', array('idSite' => $idSite, 'date' => $dateTime, 'compareAgainst' => 'OneVisitorTwoVisits', 'disableArchiving' => true, - 'apiNotToCall' => $apiNotToCall)), + 'apiNotToCall' => $apiNotToCall, + 'otherRequestParameters' => array( + 'hideColumns' => 'nb_users', + ))), array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03', 'setDateLastN' => true, 'disableArchiving' => true, 'testSuffix' => '_multipleDates')), diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php index ebf606de72..3ec353b2f2 100644 --- a/tests/PHPUnit/Integration/Core/PiwikTest.php +++ b/tests/PHPUnit/Integration/Core/PiwikTest.php @@ -52,14 +52,14 @@ class Core_PiwikTest extends DatabaseTestCase _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://localhost/piwik/"; + var u="//localhost/piwik/"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', 1]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="http://localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; diff --git a/tests/PHPUnit/Integration/Core/ReportTest.php b/tests/PHPUnit/Integration/Core/ReportTest.php index 495a76ef0c..084f422035 100644 --- a/tests/PHPUnit/Integration/Core/ReportTest.php +++ b/tests/PHPUnit/Integration/Core/ReportTest.php @@ -324,11 +324,13 @@ class Plugin_ReportTest extends DatabaseTestCase 'nb_visits' => 'General_ColumnNbVisits', 'nb_uniq_visitors' => 'General_ColumnNbUniqVisitors', 'nb_actions' => 'General_ColumnNbActions', + 'nb_users' => 'General_ColumnNbUsers' ), 'metricsDocumentation' => array( 'nb_visits' => 'General_ColumnNbVisitsDocumentation', 'nb_uniq_visitors' => 'General_ColumnNbUniqVisitorsDocumentation', 'nb_actions' => 'General_ColumnNbActionsDocumentation', + 'nb_users' => 'General_ColumnNbUsersDocumentation' ), 'processedMetrics' => array( 'nb_actions_per_visit' => 'General_ColumnActionsPerVisit', @@ -336,7 +338,7 @@ class Plugin_ReportTest extends DatabaseTestCase 'bounce_rate' => 'General_ColumnBounceRate', 'conversion_rate' => 'General_ColumnConversionRate', ), - 'order' => '20' + 'order' => 20 ) ), $reports); } diff --git a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php new file mode 100644 index 0000000000..06c366dbe5 --- /dev/null +++ b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php @@ -0,0 +1,60 @@ +<?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\Tests\Integration; + +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Tests\Fixture; +use Piwik\Tests\Fixtures\ThreeSitesWithSharedVisitors; +use Piwik\Tests\IntegrationTestCase; + +/** + * @group Integration + * @group MultipleSitesArchivingTest + */ +class MultipleSitesArchivingTest extends IntegrationTestCase +{ + public static $fixture = null; // initialized below class definition + + public static function setUpBeforeClass() + { + parent::setUpBeforeClass(); + + $extraSite = Fixture::createWebsite(self::$fixture->dateTime, $ecommerce = 1, "the site"); + + Piwik::addAction("ArchiveProcessor.Parameters.getIdSites", function (&$sites, $period) use ($extraSite) { + if (reset($sites) == $extraSite) { + $sites = array(1, 2, 3); + } + }); + + Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] = 0; + } + + public function getApiForTesting() + { + $dateTime = self::$fixture->dateTime; + + return array( + array('VisitsSummary.get', array('idSite' => 4, + 'date' => $dateTime, + 'periods' => array('day', 'month'), + 'testSuffix' => '_sitesGroup')), + ); + } + + /** + * @dataProvider getApiForTesting + */ + public function testApi($api, $params) + { + $this->runApiTests($api, $params); + } +} + +MultipleSitesArchivingTest::$fixture = new ThreeSitesWithSharedVisitors();
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php index af0fd8de44..d8b211e6f9 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php @@ -67,7 +67,7 @@ class OneVisitorTwoVisitsTest extends IntegrationTestCase $enExtraParam = array('expanded' => 1, 'flat' => 1, 'include_aggregate_rows' => 0, - 'translateColumnNames' => 1 + 'translateColumnNames' => 1, ); $bulkUrls = array( // Testing with several days @@ -79,7 +79,12 @@ class OneVisitorTwoVisitsTest extends IntegrationTestCase $url = urlencode($url); } return array( - array('all', array('idSite' => $idSite, 'date' => $dateTime)), + array('all', array('idSite' => $idSite, + 'date' => $dateTime, + 'otherRequestParameters' => array( + 'hideColumns' => 'nb_users', + ) + )), // test API.get (for bug that incorrectly reorders columns of CSV output) // note: bug only affects rows after first diff --git a/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php b/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php deleted file mode 100644 index 86885f513d..0000000000 --- a/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php +++ /dev/null @@ -1,59 +0,0 @@ -<?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\Tests\Integration; - -use Piwik\API\Proxy; -use Piwik\Tests\IntegrationTestCase; -use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId; - -/** - * This test tests that when using &cid=, the visitor ID is enforced - * - * @group TrackingAPISetVisitorIdTest - * @group Integration - */ -class TrackingAPISetVisitorIdTest extends IntegrationTestCase -{ - public static $fixture = null; // initialized below class definition - - public function setUp() - { - Proxy::getInstance()->setHideIgnoredFunctions(false); - } - - public function tearDown() - { - Proxy::getInstance()->setHideIgnoredFunctions(true); - } - - public static function getOutputPrefix() - { - return "TrackingAPI_SetVisitorId"; - } - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - return array( - array('VisitsSummary.get', array('idSite' => self::$fixture->idSite, - 'date' => self::$fixture->dateTime, - 'periods' => 'day', - 'testSuffix' => '', - )) - ); - } -} - -TrackingAPISetVisitorIdTest::$fixture = new FewVisitsWithSetVisitorId();
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php index 50c76d3a16..e2328fbc2a 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php @@ -77,21 +77,21 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends Integratio // ) 'archive_blob_2010_01' => 28, // This contains all 'last N' weeks & days, - // (1 metrics + // (2 metrics // + 2 referrer metrics // + 3 done flag ) // * 2 segments // + 1 Done flag per Plugin, for each "Last N" date - 'archive_numeric_2010_01' => 142, + 'archive_numeric_2010_01' => 144, // 2) CHECK 'week' archive stored in December (week starts the month before) // We expect 2 segments * (1 custom variable name + 2 ref metrics + 5 subtable for the values of the name + 5 referrers blob) 'archive_blob_2009_12' => 28, - // 6 metrics, + // 7 metrics, // 2 Referrer metrics (Referrers_distinctSearchEngines/Referrers_distinctKeywords), // 3 done flag (referrers, CustomVar, VisitsSummary), // X * 2 segments - 'archive_numeric_2009_12' => (6 + 2 + 3) * 2, + 'archive_numeric_2009_12' => (7 + 2 + 3) * 2, ); foreach ($tests as $table => $expectedRows) { $sql = "SELECT count(*) FROM " . Common::prefixTable($table); diff --git a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php new file mode 100644 index 0000000000..0b140f3360 --- /dev/null +++ b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php @@ -0,0 +1,93 @@ +<?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\Tests\Integration; + +use Piwik\API\Proxy; +use Piwik\Tests\IntegrationTestCase; +use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId; + +/** + * This test tests that when using &cid=, the visitor ID is enforced + * + * @group UserIdAndVisitorIdTest + * @group Integration + */ +class UserIdAndVisitorIdTest extends IntegrationTestCase +{ + public static $fixture = null; // initialized below class definition + + public function setUp() + { + Proxy::getInstance()->setHideIgnoredFunctions(false); + } + + public function tearDown() + { + Proxy::getInstance()->setHideIgnoredFunctions(true); + } + + public static function getOutputPrefix() + { + return "UserId_VisitorId"; + } + + /** + * @dataProvider getApiForTesting + */ + public function testApi($api, $params) + { + $this->runApiTests($api, $params); + } + + public function getApiForTesting() + { + return array( + array(array('VisitsSummary.get', 'VisitsSummary.getUsers'), + array('idSite' => self::$fixture->idSite, + 'date' => self::$fixture->dateTime, + 'periods' => array( 'day', 'month', 'week', 'year' ), + 'testSuffix' => '', + )), + + array('Live.getLastVisitsDetails', + array('idSite' => self::$fixture->idSite, + 'date' => self::$fixture->dateTime, + 'periods' => 'month', + 'keepLiveIds' => true, + 'keepLiveDates' => true, + 'otherRequestParameters' => array( + 'showColumns' => 'idVisit,visitorId,userId,lastActionDateTime,actions,actionDetails', + 'filter_sort_column' => 'idVisit', + 'filter_sort_order' => 'asc', + ) + )), + + // Testing userId segment matches both log_visits and log_conversion + array(array('VisitsSummary.get', 'Goals.get'), + array('idSite' => self::$fixture->idSite, + 'date' => self::$fixture->dateTime, + 'periods' => 'day', + 'segment' => 'userId==' . urlencode('new-email@example.com'), + 'testSuffix' => '_segmentUserId', + )), + + array('Goals.getItemsName', + array('idSite' => self::$fixture->idSite, + 'date' => self::$fixture->dateTime, + 'periods' => 'day', + 'segment' => 'visitEcommerceStatus==abandonedCart;userId==' . urlencode('new-email@example.com'), + 'testSuffix' => '_segmentUserIdAndCartAbandoned_getAbandonedCartItems', + 'otherRequestParameters' => array( + 'abandonedCarts' => 1 + ), + )), + ); + } +} + +UserIdAndVisitorIdTest::$fixture = new FewVisitsWithSetVisitorId();
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt index a8bd83cb53..afc6e909b1 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -1,48 +1,73 @@ -INFO [2014-03-25 15:36:04] --------------------------- -INFO [2014-03-25 15:36:04] INIT -INFO [2014-03-25 15:36:04] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php -INFO [2014-03-25 15:36:04] Running Piwik 2.1.1-b6 as Super User: superUserLogin -INFO [2014-03-25 15:36:05] --------------------------- -INFO [2014-03-25 15:36:05] NOTES -INFO [2014-03-25 15:36:05] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2014-03-25 15:36:05] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2014-03-25 15:36:05] - Reports for today will be processed at most every 10 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2014-03-25 15:36:05] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO [2014-03-25 15:36:05] - Will process 0 websites with new visits since 7 days 0 hours -INFO [2014-03-25 15:36:05] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2 -INFO [2014-03-25 15:36:05] --------------------------- -INFO [2014-03-25 15:36:05] START -INFO [2014-03-25 15:36:05] Starting Piwik reports archiving... -INFO [2014-03-25 15:36:10] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -INFO [2014-03-25 15:36:15] Archived website id = 1, period = day, Time elapsed: 9.940s -INFO [2014-03-25 15:36:15] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IEssssss -Error here -INFO [2014-03-25 15:36:59] Archived website id = 1, period = week, 0 visits, Time elapsed: 43.889s -INFO [2014-03-25 15:36:59] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -INFO [2014-03-25 15:37:18] Archived website id = 1, period = month, 12 visits, Time elapsed: 19.324s -INFO [2014-03-25 15:37:18] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -INFO [2014-03-25 15:37:25] Archived website id = 1, period = year, 12 visits, Time elapsed: 6.948s -INFO [2014-03-25 15:37:25] Archived website id = 1, today = 0 visits, 8 API requests, Time elapsed: 80.110s [1/2 done] -INFO [2014-03-25 15:37:29] Archived website id = 2, period = day, Time elapsed: 3.916s -INFO [2014-03-25 15:38:13] Archived website id = 2, period = week, 0 visits, Time elapsed: 44.420s -INFO [2014-03-25 15:38:26] Archived website id = 2, period = month, 0 visits, Time elapsed: 13.246s -INFO [2014-03-25 15:38:29] Archived website id = 2, period = year, 0 visits, Time elapsed: 2.541s -INFO [2014-03-25 15:38:29] Archived website id = 2, today = 0 visits, 4 API requests, Time elapsed: 64.131s [2/2 done] -INFO [2014-03-25 15:38:29] Done archiving! -INFO [2014-03-25 15:38:29] --------------------------- -INFO [2014-03-25 15:38:29] SUMMARY -INFO [2014-03-25 15:38:29] Total daily visits archived: 0 -INFO [2014-03-25 15:38:29] Archived today's reports for 2 websites -INFO [2014-03-25 15:38:29] Archived week/month/year for 2 websites -INFO [2014-03-25 15:38:29] Skipped 0 websites: no new visit since the last script execution -INFO [2014-03-25 15:38:29] Skipped 0 websites day archiving: existing daily reports are less than 10 seconds old -INFO [2014-03-25 15:38:29] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old -INFO [2014-03-25 15:38:29] Total API requests: 12 -INFO [2014-03-25 15:38:29] done: 2/2 100%, 0 v, 2 wtoday, 2 wperiods, 12 req, 144344 ms, no error -INFO [2014-03-25 15:38:29] Time elapsed: 144.344s -INFO [2014-03-25 15:38:29] --------------------------- -INFO [2014-03-25 15:38:29] SCHEDULED TASKS -INFO [2014-03-25 15:38:29] Starting Scheduled tasks... -INFO [2014-03-25 15:38:30] No task to run -INFO [2014-03-25 15:38:30] done -INFO [2014-03-25 15:38:30] ---------------------------
\ No newline at end of file + +------------------------------------------------------- +Using this 'archive.php' script is no longer recommended. +Please use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead. +To get help use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help' +See also: http://piwik.org/docs/setup-auto-archiving/ + +If you cannot use the console because it requires CLI +try 'php archive.php -- url=http://your.piwik/path' +------------------------------------------------------- + + +INFO CoreConsole[2014-09-09 01:46:27] --------------------------- +INFO CoreConsole[2014-09-09 01:46:27] INIT +INFO CoreConsole[2014-09-09 01:46:27] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php +INFO CoreConsole[2014-09-09 01:46:27] Running Piwik 2.7.0-b2 as Super User +DEBUG CoreConsole[2014-09-09 01:46:27] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.getDefaultMetricTranslations&format=original&serialize=1&trigger=archivephp&testmode=1&pid=2e1e341f728109bd9f2aa50667ff5ebd1334473b8e8026e85ab7850d28c9a2de11be5a02bbded91d38aab2870492ef77ebdd0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/2e1e341f728109bd9f2aa50667ff5ebd1334473b8e8026e85ab7850d28c9a2de11be5a02bbded91d38aab2870492ef77ebdd0.output 2>&1 & +INFO CoreConsole[2014-09-09 01:46:28] --------------------------- +INFO CoreConsole[2014-09-09 01:46:28] NOTES +INFO CoreConsole[2014-09-09 01:46:28] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO CoreConsole[2014-09-09 01:46:28] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO CoreConsole[2014-09-09 01:46:28] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO CoreConsole[2014-09-09 01:46:28] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO CoreConsole[2014-09-09 01:46:28] - Will process 0 websites with new visits since 7 days 0 hours +INFO CoreConsole[2014-09-09 01:46:28] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2 +INFO CoreConsole[2014-09-09 01:46:28] --------------------------- +INFO CoreConsole[2014-09-09 01:46:28] START +INFO CoreConsole[2014-09-09 01:46:28] Starting Piwik reports archiving... +DEBUG CoreConsole[2014-09-09 01:46:28] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=85cfb29c2e26e4c8440e7e33d55e413d39509345117eb194d4ba3b2459213c11737c71fb534b13d060ee3a51686d040bcd780' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/85cfb29c2e26e4c8440e7e33d55e413d39509345117eb194d4ba3b2459213c11737c71fb534b13d060ee3a51686d040bcd780.output 2>&1 & +INFO CoreConsole[2014-09-09 01:46:29] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-09 01:46:29] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=e517450ff87813ef3b86a502f8e864d00e86570c4a62df480ab1e2c7d3e6233ca2de3e34d74a5f4601857ba97241fa7469ad0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/e517450ff87813ef3b86a502f8e864d00e86570c4a62df480ab1e2c7d3e6233ca2de3e34d74a5f4601857ba97241fa7469ad0.output 2>&1 & +INFO CoreConsole[2014-09-09 01:46:31] Archived website id = 1, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 3.438s +INFO CoreConsole[2014-09-09 01:46:31] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-09 01:46:31] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=064eca2df6d0757ed6c729255a072f39dddcfb7132eede4fb060f3c000aaf06abc5b8d1e6a1d7f5a75191665e2ee17322fff0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/064eca2df6d0757ed6c729255a072f39dddcfb7132eede4fb060f3c000aaf06abc5b8d1e6a1d7f5a75191665e2ee17322fff0.output 2>&1 & +DEBUG CoreConsole[2014-09-09 01:46:31] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=05b992fcb7f031578d525e2a1f4f50c50ac40c0ca149c7c17243a57a96530a80c0d774430ed783c3bcb4ef9f1fc78b6054ce1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/05b992fcb7f031578d525e2a1f4f50c50ac40c0ca149c7c17243a57a96530a80c0d774430ed783c3bcb4ef9f1fc78b6054ce1.output 2>&1 & +INFO CoreConsole[2014-09-09 01:46:50] Archived website id = 1, period = week, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 19.207s +INFO CoreConsole[2014-09-09 01:46:50] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-09 01:46:50] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=b97b6610e36a1879beef58fa96cbbdb3fd16e27953fea563b080df5ec743f899de9cd189e99a522132b1affa42b39c368c830' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/b97b6610e36a1879beef58fa96cbbdb3fd16e27953fea563b080df5ec743f899de9cd189e99a522132b1affa42b39c368c830.output 2>&1 & +DEBUG CoreConsole[2014-09-09 01:46:50] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=9943bef019811f952ac8a2913efa0bf4c49862a24c78cbcda994890313db0cb693ce980e0ec5002f9d0501eb6df6218b370c1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/9943bef019811f952ac8a2913efa0bf4c49862a24c78cbcda994890313db0cb693ce980e0ec5002f9d0501eb6df6218b370c1.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:01] Archived website id = 1, period = month, 40 visits in last last52 months, 0 visits this month, Time elapsed: 10.722s +INFO CoreConsole[2014-09-09 01:47:01] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-09 01:47:01] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=773203159cb45b3702e6807c378c811f789b41f466570dec02f1558cb23d6eb7cb2163a52046dd2827ef68bed432b61818340' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/773203159cb45b3702e6807c378c811f789b41f466570dec02f1558cb23d6eb7cb2163a52046dd2827ef68bed432b61818340.output 2>&1 & +DEBUG CoreConsole[2014-09-09 01:47:01] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=63ed9ebfc2372a39e2c3111dd73fbfb529d5db843e728c09afdf8cf78f32983dabe42cbba513af309f04ae5e2ef664eada8a1' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/63ed9ebfc2372a39e2c3111dd73fbfb529d5db843e728c09afdf8cf78f32983dabe42cbba513af309f04ae5e2ef664eada8a1.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:03] Archived website id = 1, period = year, 40 visits in last last7 years, 12 visits this year, Time elapsed: 2.326s +INFO CoreConsole[2014-09-09 01:47:03] Archived website id = 1, 8 API requests, Time elapsed: 35.697s [1/2 done] +DEBUG CoreConsole[2014-09-09 01:47:03] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=db38d41d3398b809310cc0d63ba1d3ee0d4726acaaea720b3412a9e5fa6311d88c6752611e6104270c047e0ecebed37db2fc0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/db38d41d3398b809310cc0d63ba1d3ee0d4726acaaea720b3412a9e5fa6311d88c6752611e6104270c047e0ecebed37db2fc0.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:05] Archived website id = 2, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 1.618s +DEBUG CoreConsole[2014-09-09 01:47:05] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=e1d0a7846bb142eded2edc12020f04b70b85023db70ea1b590d8e0f955277003fa45b8bff24756e6db5154e9bc3cbd2777700' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/e1d0a7846bb142eded2edc12020f04b70b85023db70ea1b590d8e0f955277003fa45b8bff24756e6db5154e9bc3cbd2777700.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:18] Archived website id = 2, period = week, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 13.418s +DEBUG CoreConsole[2014-09-09 01:47:18] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=81840a421ef9c17763c65ef8c899601470ae84add7097344023dc8876451749d42fbf4ea653a5498f8bd8358032bdc7a28f10' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/81840a421ef9c17763c65ef8c899601470ae84add7097344023dc8876451749d42fbf4ea653a5498f8bd8358032bdc7a28f10.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:25] Archived website id = 2, period = month, 1 visits in last last52 months, 0 visits this month, Time elapsed: 6.115s +DEBUG CoreConsole[2014-09-09 01:47:25] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=087c4f9970b4fedb2cd40f0fe1b5da80c76b8a64e63cd7e7a93885147dc86e67b0b0f79ab52cd1769e2d6634b59ce1ffa56f0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/087c4f9970b4fedb2cd40f0fe1b5da80c76b8a64e63cd7e7a93885147dc86e67b0b0f79ab52cd1769e2d6634b59ce1ffa56f0.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:26] Archived website id = 2, period = year, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.373s +INFO CoreConsole[2014-09-09 01:47:26] Archived website id = 2, 4 API requests, Time elapsed: 22.528s [2/2 done] +INFO CoreConsole[2014-09-09 01:47:26] Done archiving! +INFO CoreConsole[2014-09-09 01:47:26] --------------------------- +INFO CoreConsole[2014-09-09 01:47:26] SUMMARY +INFO CoreConsole[2014-09-09 01:47:26] Total visits for today across archived websites: 0 +INFO CoreConsole[2014-09-09 01:47:26] Archived today's reports for 2 websites +INFO CoreConsole[2014-09-09 01:47:26] Archived week/month/year for 2 websites +INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites: no new visit since the last script execution +INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old +INFO CoreConsole[2014-09-09 01:47:26] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old +INFO CoreConsole[2014-09-09 01:47:26] Total API requests: 12 +INFO CoreConsole[2014-09-09 01:47:26] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 12 req, 58327 ms, no error +INFO CoreConsole[2014-09-09 01:47:26] Time elapsed: 58.328s +INFO CoreConsole[2014-09-09 01:47:26] --------------------------- +INFO CoreConsole[2014-09-09 01:47:26] SCHEDULED TASKS +INFO CoreConsole[2014-09-09 01:47:26] Starting Scheduled tasks... +DEBUG CoreConsole[2014-09-09 01:47:26] /home/travis/.phpenv/versions/5.6.0/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=CoreAdminHome.runScheduledTasks&format=csv&convertToUnicode=0&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=334d2f79cda2d2f08e0357c080f38cf6fe90f1248ebb91af3cea79e4593d1c4feff96328b77d32ce1fe9cfcd6e434b11dca50' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/334d2f79cda2d2f08e0357c080f38cf6fe90f1248ebb91af3cea79e4593d1c4feff96328b77d32ce1fe9cfcd6e434b11dca50.output 2>&1 & +INFO CoreConsole[2014-09-09 01:47:26] No task to run +INFO CoreConsole[2014-09-09 01:47:26] done +INFO CoreConsole[2014-09-09 01:47:26] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml index 8a974cdd1a..72b3d94c43 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>9</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> <nb_visits_converted>9</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml index 7ed2e76aeb..0482fd7e5b 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>27</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> <nb_visits_converted>25</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml index dc24b73074..1c7f2179e5 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml @@ -1,16 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <results> - <result idSite="1"> - <nb_uniq_visitors>25</nb_uniq_visitors> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> - <nb_visits_converted>23</nb_visits_converted> - <bounce_count>23</bounce_count> - <sum_visit_length>305</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>92%</bounce_rate> - <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>12</avg_time_on_site> - </result> + <result idSite="1" /> <result idSite="2" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 247d5fbf7a..6f772e2ef7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -4,16 +4,8 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> + <userId>userid.email@example.org</userId> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -35,38 +27,27 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>California</region> - <regionCode>CA</regionCode> - <city>not a city</city> - <location>not a city, California, United States</location> - <latitude>1</latitude> - <longitude>2</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -86,7 +67,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -100,6 +80,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>California</region> + <regionCode>CA</regionCode> + <city>not a city</city> + <location>not a city, California, United States</location> + <latitude>1</latitude> + <longitude>2</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -110,16 +111,8 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -182,46 +175,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <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 /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -241,7 +215,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -255,6 +228,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <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 /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -265,16 +267,8 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -306,46 +300,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <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 /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -365,7 +340,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -379,6 +353,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <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 /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -389,16 +392,8 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -444,46 +439,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> - <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> - <region>Miravci</region> - <regionCode>66</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -503,7 +479,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -517,6 +492,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Macedonia, the Former Yugoslav Republic of</country> + <countryCode>mk</countryCode> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <region>Miravci</region> + <regionCode>66</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -527,16 +531,8 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -568,46 +564,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Macedonia, the Former Yugoslav Republic of</country> - <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> - <region>Miravci</region> - <regionCode>66</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -627,7 +604,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -641,6 +617,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Macedonia, the Former Yugoslav Republic of</country> + <countryCode>mk</countryCode> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> + <region>Miravci</region> + <regionCode>66</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -651,16 +656,8 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -723,46 +720,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Russian Federation</country> - <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> - <region>Saint Petersburg City</region> - <regionCode>66</regionCode> - <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -782,7 +760,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -796,6 +773,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Russian Federation</country> + <countryCode>ru</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <region>Saint Petersburg City</region> + <regionCode>66</regionCode> + <city>Hluboká nad Vltavou</city> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -806,16 +812,8 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -847,46 +845,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Russian Federation</country> - <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> - <region>Saint Petersburg City</region> - <regionCode>66</regionCode> - <city>Hluboká nad Vltavou</city> - <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -906,7 +885,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -920,6 +898,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Russian Federation</country> + <countryCode>ru</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <region>Saint Petersburg City</region> + <regionCode>66</regionCode> + <city>Hluboká nad Vltavou</city> + <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -930,16 +937,8 @@ <idSite>1</idSite> <idVisit>12</idVisit> <visitIp>1.2.4.5</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -985,46 +984,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 5</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 5</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Russian Federation</country> - <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> - <region>Saint Petersburg City</region> - <regionCode>66</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1044,7 +1024,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1058,6 +1037,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Russian Federation</country> + <countryCode>ru</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <region>Saint Petersburg City</region> + <regionCode>66</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 5</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 5</customVariableValue5> + </row> + </customVariables> @@ -1068,16 +1076,8 @@ <idSite>1</idSite> <idVisit>11</idVisit> <visitIp>1.2.4.5</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1109,46 +1109,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 5</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 5</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Russian Federation</country> - <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> - <region>Saint Petersburg City</region> - <regionCode>66</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1168,7 +1149,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1182,6 +1162,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Russian Federation</country> + <countryCode>ru</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <region>Saint Petersburg City</region> + <regionCode>66</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 5</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 5</customVariableValue5> + </row> + </customVariables> @@ -1192,16 +1201,8 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>1.2.4.4</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -1264,46 +1265,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 4</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 4</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Kent</region> - <regionCode>G5</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Kent, United Kingdom</location> - <latitude /> - <longitude /> - <provider>awesomeisp.com</provider> - <providerName>Awesomeisp</providerName> - <providerUrl>http://www.awesomeisp.com/</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1323,7 +1305,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1337,6 +1318,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Kent</region> + <regionCode>G5</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Kent, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>awesomeisp.com</provider> + <providerName>Awesomeisp</providerName> + <providerUrl>http://www.awesomeisp.com/</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 4</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 4</customVariableValue5> + </row> + </customVariables> @@ -1347,16 +1357,8 @@ <idSite>1</idSite> <idVisit>9</idVisit> <visitIp>1.2.4.4</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1388,46 +1390,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 4</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 4</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Kent</region> - <regionCode>G5</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Kent, United Kingdom</location> - <latitude /> - <longitude /> - <provider>awesomeisp.com</provider> - <providerName>Awesomeisp</providerName> - <providerUrl>http://www.awesomeisp.com/</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1447,7 +1430,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1461,6 +1443,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Kent</region> + <regionCode>G5</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Kent, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>awesomeisp.com</provider> + <providerName>Awesomeisp</providerName> + <providerUrl>http://www.awesomeisp.com/</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 4</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 4</customVariableValue5> + </row> + </customVariables> @@ -1471,16 +1482,8 @@ <idSite>1</idSite> <idVisit>8</idVisit> <visitIp>1.2.4.3</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -1526,46 +1529,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 3</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 3</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>London, City of</region> - <regionCode>H9</regionCode> - <city>London</city> - <location>London, London, City of, United Kingdom</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1585,7 +1569,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1599,6 +1582,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>London, City of</region> + <regionCode>H9</regionCode> + <city>London</city> + <location>London, London, City of, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 3</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 3</customVariableValue5> + </row> + </customVariables> @@ -1609,16 +1621,8 @@ <idSite>1</idSite> <idVisit>30</idVisit> <visitIp>113.62.1.1</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -1664,38 +1668,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Tibet</country> - <countryCode>ti</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> - <region>Unknown</region> - <regionCode>1</regionCode> - <city>Lhasa</city> - <location>Lhasa, Unknown, Tibet</location> - <latitude>29.650000</latitude> - <longitude>91.099998</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1715,7 +1708,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1729,6 +1721,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>1</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Tibet</country> + <countryCode>ti</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> + <region>Unknown</region> + <regionCode>1</regionCode> + <city>Lhasa</city> + <location>Lhasa, Unknown, Tibet</location> + <latitude>29.650000</latitude> + <longitude>91.099998</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -1739,16 +1752,8 @@ <idSite>1</idSite> <idVisit>7</idVisit> <visitIp>1.2.4.3</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1780,46 +1785,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 3</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 3</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>London, City of</region> - <regionCode>H9</regionCode> - <city>London</city> - <location>London, London, City of, United Kingdom</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1839,7 +1825,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1853,6 +1838,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>London, City of</region> + <regionCode>H9</regionCode> + <city>London</city> + <location>London, London, City of, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 3</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 3</customVariableValue5> + </row> + </customVariables> @@ -1863,16 +1877,8 @@ <idSite>1</idSite> <idVisit>29</idVisit> <visitIp>113.62.1.1</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1904,46 +1910,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 3</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 3</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Tibet</country> - <countryCode>ti</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> - <region>Unknown</region> - <regionCode>1</regionCode> - <city>Lhasa</city> - <location>Lhasa, Unknown, Tibet</location> - <latitude>29.650000</latitude> - <longitude>91.099998</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1963,7 +1950,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1977,6 +1963,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Tibet</country> + <countryCode>ti</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ti.png</countryFlag> + <region>Unknown</region> + <regionCode>1</regionCode> + <city>Lhasa</city> + <location>Lhasa, Unknown, Tibet</location> + <latitude>29.650000</latitude> + <longitude>91.099998</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 3</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 3</customVariableValue5> + </row> + </customVariables> @@ -1987,16 +2002,8 @@ <idSite>1</idSite> <idVisit>6</idVisit> <visitIp>1.2.4.2</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -2059,46 +2066,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 2</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 2</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> - <provider>comcast.net</provider> - <providerName>Comcast</providerName> - <providerUrl>http://www.comcast.net/</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2118,7 +2106,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2132,6 +2119,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> + <latitude>124.456001</latitude> + <longitude>22.231001</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>comcast.net</provider> + <providerName>Comcast</providerName> + <providerUrl>http://www.comcast.net/</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 2</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 2</customVariableValue5> + </row> + </customVariables> @@ -2142,16 +2158,8 @@ <idSite>1</idSite> <idVisit>28</idVisit> <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -2214,38 +2222,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <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 /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2265,7 +2262,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2279,6 +2275,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>1</events> + <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 /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -2289,16 +2306,8 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>1.2.4.2</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2330,46 +2339,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 2</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 2</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> - <provider>comcast.net</provider> - <providerName>Comcast</providerName> - <providerUrl>http://www.comcast.net/</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2389,7 +2379,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2403,6 +2392,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> + <latitude>124.456001</latitude> + <longitude>22.231001</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>comcast.net</provider> + <providerName>Comcast</providerName> + <providerUrl>http://www.comcast.net/</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 2</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 2</customVariableValue5> + </row> + </customVariables> @@ -2413,16 +2431,8 @@ <idSite>1</idSite> <idVisit>27</idVisit> <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2454,46 +2464,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 2</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 2</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <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 /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2513,7 +2504,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2527,6 +2517,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>0</events> + <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 /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 2</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 2</customVariableValue5> + </row> + </customVariables> @@ -2537,16 +2556,8 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>1.2.4.1</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -2592,46 +2603,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Nuneaton and Bedworth</city> - <location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2651,7 +2643,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2665,6 +2656,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Nuneaton and Bedworth</city> + <location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -2675,16 +2695,8 @@ <idSite>1</idSite> <idVisit>22</idVisit> <visitIp>::ffff:137.82.130.49</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -2730,46 +2742,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2789,7 +2782,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2803,6 +2795,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -2813,16 +2834,8 @@ <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>137.82.0.0</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -2868,38 +2881,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2919,7 +2921,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2933,6 +2934,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>1</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -2943,16 +2965,8 @@ <idSite>1</idSite> <idVisit>34</idVisit> <visitIp>103.29.196.229</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -2998,46 +3012,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Indonesia</country> - <countryCode>id</countryCode> - <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Indonesia</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3057,7 +3052,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3071,6 +3065,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Indonesia</country> + <countryCode>id</countryCode> + <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Indonesia</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -3081,16 +3104,8 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>1.2.4.1</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3122,46 +3137,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Nuneaton and Bedworth</city> - <location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3181,7 +3177,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3195,6 +3190,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Nuneaton and Bedworth</city> + <location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -3205,16 +3229,8 @@ <idSite>1</idSite> <idVisit>21</idVisit> <visitIp>::ffff:137.82.130.49</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3246,46 +3262,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3305,7 +3302,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3319,6 +3315,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -3329,16 +3354,8 @@ <idSite>1</idSite> <idVisit>25</idVisit> <visitIp>137.82.0.0</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3370,46 +3387,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3429,7 +3427,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3443,6 +3440,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -3453,16 +3479,8 @@ <idSite>1</idSite> <idVisit>33</idVisit> <visitIp>103.29.196.229</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3494,46 +3512,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 1</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 1</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>101</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Indonesia</country> - <countryCode>id</countryCode> - <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Indonesia</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3553,7 +3552,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3567,6 +3565,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Indonesia</country> + <countryCode>id</countryCode> + <countryFlag>plugins/UserCountry/images/flags/id.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Indonesia</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 1</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 1</customVariableValue5> + </row> + </customVariables> @@ -3577,16 +3604,8 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>1.2.4.0</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -3649,46 +3668,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3708,7 +3708,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3722,6 +3721,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> + <latitude>123.456001</latitude> + <longitude>21.320999</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -3732,16 +3760,8 @@ <idSite>1</idSite> <idVisit>20</idVisit> <visitIp>194.57.91.215</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -3804,46 +3824,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region>Franche-Comte</region> - <regionCode>A6</regionCode> - <city>Besançon</city> - <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> - <longitude>6.018000</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3863,7 +3864,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3877,6 +3877,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region>Franche-Comte</region> + <regionCode>A6</regionCode> + <city>Besançon</city> + <location>Besançon, Franche-Comte, France</location> + <latitude>47.249001</latitude> + <longitude>6.018000</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -3887,16 +3916,8 @@ <idSite>1</idSite> <idVisit>24</idVisit> <visitIp>137.82.130.0</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -3959,38 +3980,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4010,7 +4020,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4024,6 +4033,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>1</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -4034,16 +4064,8 @@ <idSite>1</idSite> <idVisit>32</idVisit> <visitIp>151.100.101.92</visitIp> + <userId /> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -4106,46 +4128,27 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Italy</country> - <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Italy</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4165,7 +4168,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4179,6 +4181,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Italy</country> + <countryCode>it</countryCode> + <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Italy</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -4189,16 +4220,8 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>1.2.4.0</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4230,46 +4253,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>United Kingdom</country> - <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> - <region>Warwickshire</region> - <regionCode>P3</regionCode> - <city>Stratford-upon-Avon</city> - <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4289,7 +4293,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4303,6 +4306,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>United Kingdom</country> + <countryCode>gb</countryCode> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> + <region>Warwickshire</region> + <regionCode>P3</regionCode> + <city>Stratford-upon-Avon</city> + <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> + <latitude>123.456001</latitude> + <longitude>21.320999</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -4313,16 +4345,8 @@ <idSite>1</idSite> <idVisit>19</idVisit> <visitIp>194.57.91.215</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4354,46 +4378,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region>Franche-Comte</region> - <regionCode>A6</regionCode> - <city>Besançon</city> - <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> - <longitude>6.018000</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4413,7 +4418,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4427,6 +4431,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region>Franche-Comte</region> + <regionCode>A6</regionCode> + <city>Besançon</city> + <location>Besançon, Franche-Comte, France</location> + <latitude>47.249001</latitude> + <longitude>6.018000</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -4437,16 +4470,8 @@ <idSite>1</idSite> <idVisit>23</idVisit> <visitIp>137.82.130.0</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4478,46 +4503,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>Canada</country> - <countryCode>ca</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> - <region>British Columbia</region> - <regionCode>BC</regionCode> - <city>Vancouver</city> - <location>Vancouver, British Columbia, Canada</location> - <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4537,7 +4543,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4551,6 +4556,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>Canada</country> + <countryCode>ca</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag> + <region>British Columbia</region> + <regionCode>BC</regionCode> + <city>Vancouver</city> + <location>Vancouver, British Columbia, Canada</location> + <latitude>49.250000</latitude> + <longitude>-123.133003</longitude> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -4561,16 +4595,8 @@ <idSite>1</idSite> <idVisit>31</idVisit> <visitIp>151.100.101.92</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4602,46 +4628,27 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Italy</country> - <countryCode>it</countryCode> - <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Italy</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4661,7 +4668,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4675,6 +4681,35 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Italy</country> + <countryCode>it</countryCode> + <countryFlag>plugins/UserCountry/images/flags/it.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Italy</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml index f52326b337..5d07770e4e 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>35</nb_visits> - <nb_actions>61</nb_actions> - <nb_visits_converted>35</nb_visits_converted> - <bounce_count>18</bounce_count> - <sum_visit_length>21437</sum_visit_length> + <nb_visits>28</nb_visits> + <nb_actions>48</nb_actions> + <nb_visits_converted>28</nb_visits_converted> + <bounce_count>15</bounce_count> + <sum_visit_length>16393</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>51%</bounce_rate> + <bounce_rate>54%</bounce_rate> <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>612</avg_time_on_site> + <avg_time_on_site>585</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..381e1be3af --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>userid.email@example.org</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..dfa3a20623 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_visits_converted>1</nb_visits_converted> + <bounce_count>1</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml index 8a4e8dcb1e..e21f421867 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml @@ -17,5 +17,5 @@ <row>fed33392d3a48aa1</row> <row>a4380923dd651c19</row> <row>aa68c75c4a77c87f</row> - <row>fed33392d3a48ab2</row> + <row>e64bc481700c5d69</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml index eb4e37fdf7..3633fe5914 100644 --- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml @@ -1,6 +1,7 @@ <?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> diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml index e31e52b1e0..3c62d79738 100644 --- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors_returning>0</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> diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml index e31e52b1e0..3c62d79738 100644 --- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors_returning>0</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> diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml index 196edba881..b8e30312d7 100644 --- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml @@ -5,6 +5,7 @@ <result date="2012-03-05" /> <result date="2012-03-06"> <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> diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml index bc702c076d..c7ea96791b 100644 --- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml @@ -2,6 +2,7 @@ <results> <result date="2012-03"> <nb_uniq_visitors_returning>0</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> @@ -22,6 +23,7 @@ <result date="2012-11" /> <result date="2012-12"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>1</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index f2edb4066b..2c3fb6b0cd 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -105,6 +106,7 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -206,6 +208,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -375,6 +378,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -476,6 +480,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -812,6 +817,7 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -909,6 +915,7 @@ <idSite>1</idSite> <idVisit>9</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1006,6 +1013,7 @@ <idSite>1</idSite> <idVisit>7</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1171,6 +1179,7 @@ <idSite>1</idSite> <idVisit>8</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1268,6 +1277,7 @@ <idSite>1</idSite> <idVisit>6</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index f2edb4066b..2c3fb6b0cd 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -105,6 +106,7 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -206,6 +208,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -375,6 +378,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -476,6 +480,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -812,6 +817,7 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -909,6 +915,7 @@ <idSite>1</idSite> <idVisit>9</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1006,6 +1013,7 @@ <idSite>1</idSite> <idVisit>7</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1171,6 +1179,7 @@ <idSite>1</idSite> <idVisit>8</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> @@ -1268,6 +1277,7 @@ <idSite>1</idSite> <idVisit>6</idVisit> <visitIp>111.1.1.1</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml index 1369014c2f..8826b0f72b 100644 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml @@ -28,6 +28,7 @@ <label>CustomVarVisit</label> <nb_visits>6</nb_visits> <nb_actions>18</nb_actions> + <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>6</sum_visit_length> <bounce_count>0</bounce_count> @@ -38,6 +39,7 @@ <label>CustomVarVisit - CustomVarValue1</label> <nb_visits>3</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>3</sum_visit_length> <bounce_count>0</bounce_count> @@ -48,6 +50,7 @@ <label>CustomVarVisit - CustomVarValue2</label> <nb_visits>3</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>3</sum_visit_length> <bounce_count>0</bounce_count> @@ -60,6 +63,7 @@ <label>CustomVarVisit</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -70,6 +74,7 @@ <label>CustomVarVisit - CustomVarValue1</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml index 42db8174ef..671c9615bd 100644 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -16,6 +17,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -27,6 +29,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -38,6 +41,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -49,6 +53,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -60,6 +65,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 02f5d5a97f..d2777a6618 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -53,6 +53,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <subtable> <row> <label>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</label> @@ -71,6 +72,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Apache-HttpClient/4.2.1 (java 1.5)</label> @@ -81,6 +83,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</label> @@ -99,6 +102,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</label> @@ -117,6 +121,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -137,6 +142,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Googlebot/2.1 ( http://www.googlebot.com/bot.html)</label> @@ -155,6 +161,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -175,6 +182,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Anonymous</label> @@ -193,6 +201,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -213,6 +222,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>NewLoggedOut</label> @@ -231,6 +241,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index d8411b0f39..4900d9f742 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -9,6 +9,7 @@ <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>4</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> <row> @@ -20,6 +21,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index c8cf2933a2..736a970a10 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -9,6 +9,7 @@ <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 445c00fe4a..8283929188 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -64,6 +69,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -75,6 +81,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> <row> @@ -86,6 +93,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> @@ -97,6 +105,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -108,6 +117,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 09ce9b347f..4f81f5481b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -9,6 +9,7 @@ <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>4</sum_daily_nb_users> </row> <row> <label>Vision</label> @@ -19,5 +20,6 @@ <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>2</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index e6c1c07cf8..e529cdbeb2 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -9,6 +9,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> <row> @@ -64,6 +69,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 943d4ca75d..39cb245795 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -9,6 +9,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> @@ -64,6 +69,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> <row> @@ -75,6 +81,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> @@ -86,6 +93,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 524f43508d..7540309820 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -9,6 +9,7 @@ <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>4</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport.xml deleted file mode 100644 index 1b2fed39f9..0000000000 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <nb_visits>5</nb_visits> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 28929d67ee..2ff757424d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>40</idVisit> <visitIp>174.97.139.63</visitIp> + <userId /> <actionDetails> <row> @@ -84,10 +85,10 @@ <location>Raleigh, North Carolina, United States</location> <latitude>35.771999</latitude> <longitude>-78.639000</longitude> - <operatingSystem>Windows 8</operatingSystem> - <operatingSystemCode>WI8</operatingSystemCode> - <operatingSystemShortName>Win 8</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon> + <operatingSystem>Windows 8.1</operatingSystem> + <operatingSystemCode>W81</operatingSystemCode> + <operatingSystemShortName>W81</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Chrome 33.0</browserName> @@ -125,6 +126,7 @@ <idSite>1</idSite> <idVisit>33</idVisit> <visitIp>206.190.75.8</visitIp> + <userId /> <actionDetails> <row> @@ -249,6 +251,7 @@ <idSite>1</idSite> <idVisit>39</idVisit> <visitIp>193.159.20.129</visitIp> + <userId /> <actionDetails> <row> @@ -382,6 +385,7 @@ <idSite>1</idSite> <idVisit>37</idVisit> <visitIp>50.244.17.130</visitIp> + <userId /> <actionDetails> <row> @@ -523,6 +527,7 @@ <idSite>1</idSite> <idVisit>38</idVisit> <visitIp>84.194.72.21</visitIp> + <userId /> <actionDetails> <row> @@ -637,6 +642,7 @@ <idSite>1</idSite> <idVisit>36</idVisit> <visitIp>108.211.181.12</visitIp> + <userId /> <actionDetails> <row> @@ -770,6 +776,7 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>219.101.46.222</visitIp> + <userId /> <actionDetails> <row> @@ -890,6 +897,7 @@ <idSite>1</idSite> <idVisit>34</idVisit> <visitIp>80.136.160.65</visitIp> + <userId /> <actionDetails> <row> @@ -1003,6 +1011,7 @@ <idSite>1</idSite> <idVisit>32</idVisit> <visitIp>188.107.238.9</visitIp> + <userId /> <actionDetails> <row> @@ -1136,6 +1145,7 @@ <idSite>1</idSite> <idVisit>30</idVisit> <visitIp>93.80.130.163</visitIp> + <userId /> <actionDetails> <row> @@ -1288,6 +1298,7 @@ <idSite>1</idSite> <idVisit>31</idVisit> <visitIp>176.41.226.154</visitIp> + <userId /> <actionDetails> <row> @@ -1413,6 +1424,7 @@ <idSite>1</idSite> <idVisit>29</idVisit> <visitIp>84.194.72.21</visitIp> + <userId /> <actionDetails> <row> @@ -1538,6 +1550,7 @@ <idSite>1</idSite> <idVisit>41</idVisit> <visitIp>175.41.192.40</visitIp> + <userId /> <actionDetails> <row> @@ -1804,6 +1817,7 @@ <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -1928,6 +1942,7 @@ <idSite>1</idSite> <idVisit>27</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -2060,6 +2075,7 @@ <idSite>1</idSite> <idVisit>25</idVisit> <visitIp>175.41.192.41</visitIp> + <userId /> <actionDetails> <row> @@ -2167,6 +2183,7 @@ <idSite>1</idSite> <idVisit>24</idVisit> <visitIp>175.41.192.43</visitIp> + <userId /> <actionDetails> <row> @@ -2291,6 +2308,7 @@ <idSite>1</idSite> <idVisit>23</idVisit> <visitIp>175.41.192.42</visitIp> + <userId /> <actionDetails> <row> @@ -2422,6 +2440,7 @@ <idSite>1</idSite> <idVisit>22</idVisit> <visitIp>72.44.32.11</visitIp> + <userId /> <actionDetails> <row> @@ -2529,6 +2548,7 @@ <idSite>1</idSite> <idVisit>21</idVisit> <visitIp>72.44.32.11</visitIp> + <userId /> <actionDetails> <row> @@ -2636,6 +2656,7 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.3.4</visitIp> + <userId /> <actionDetails> <row> @@ -2733,6 +2754,7 @@ <idSite>1</idSite> <idVisit>20</idVisit> <visitIp>175.41.192.41</visitIp> + <userId /> <actionDetails> <row> @@ -2840,6 +2862,7 @@ <idSite>1</idSite> <idVisit>19</idVisit> <visitIp>175.41.192.41</visitIp> + <userId /> <actionDetails> <row> @@ -2947,6 +2970,7 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -3050,6 +3074,7 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -3153,6 +3178,7 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>177.71.128.21</visitIp> + <userId /> <actionDetails> <row> @@ -3256,6 +3282,7 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>177.71.128.21</visitIp> + <userId /> <actionDetails> <row> @@ -3359,6 +3386,7 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>177.71.128.21</visitIp> + <userId /> <actionDetails> <row> @@ -3462,6 +3490,7 @@ <idSite>1</idSite> <idVisit>12</idVisit> <visitIp>175.41.192.34</visitIp> + <userId /> <actionDetails> <row> @@ -3565,6 +3594,7 @@ <idSite>1</idSite> <idVisit>11</idVisit> <visitIp>175.41.192.34</visitIp> + <userId /> <actionDetails> <row> @@ -3668,6 +3698,7 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -3771,6 +3802,7 @@ <idSite>1</idSite> <idVisit>9</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -3874,6 +3906,7 @@ <idSite>1</idSite> <idVisit>8</idVisit> <visitIp>0.0.0.0</visitIp> + <userId /> <actionDetails> <row> @@ -3977,6 +4010,7 @@ <idSite>1</idSite> <idVisit>7</idVisit> <visitIp>72.44.32.10</visitIp> + <userId /> <actionDetails> <row> @@ -4080,6 +4114,7 @@ <idSite>1</idSite> <idVisit>6</idVisit> <visitIp>72.44.32.10</visitIp> + <userId /> <actionDetails> <row> @@ -4183,6 +4218,7 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>72.44.32.10</visitIp> + <userId /> <actionDetails> <row> @@ -4286,6 +4322,7 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>175.41.192.40</visitIp> + <userId /> <actionDetails> <row> @@ -4389,6 +4426,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>175.41.192.40</visitIp> + <userId /> <actionDetails> <row> @@ -4492,6 +4530,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>175.41.192.40</visitIp> + <userId /> <actionDetails> <row> @@ -4595,6 +4634,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>175.41.192.40</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml index 3ac22f787e..c4cf4f3179 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -9,6 +9,7 @@ <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>4</sum_daily_nb_users> <url>http://piwik.org/faq/general/#faq_52</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml index c4568e0702..1c43453213 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -17,6 +17,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <referer_type>3</referer_type> </row> <row> @@ -36,6 +37,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <referer_type>3</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index c580231b96..8579d3283a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -17,6 +17,7 @@ <nb_conversions>23</nb_conversions> <revenue>115</revenue> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>Websites</label> @@ -35,6 +36,7 @@ <nb_conversions>2</nb_conversions> <revenue>10</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>piwik.org</label> @@ -53,6 +55,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>sn110w.snt110.mail.live.com</label> @@ -71,6 +74,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 51a1e169f8..74a22451ad 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -17,6 +17,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://piwik.org/contribute%</label> @@ -27,6 +28,7 @@ <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>1</sum_daily_nb_users> </row> </subtable> </row> @@ -47,6 +49,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label> @@ -57,6 +60,7 @@ <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>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml index 267e90de6f..9567fc2f23 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -17,6 +17,7 @@ <nb_conversions>20</nb_conversions> <revenue>100</revenue> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> @@ -42,6 +43,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>39.044</lat> <long>-77.488</long> <city_name>Ashburn</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml index bb4a48d22d..ff0a9a67d6 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -17,6 +17,7 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>Asia</code> </row> <row> @@ -36,6 +37,7 @@ <nb_conversions>7</nb_conversions> <revenue>35</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>Unknown</code> </row> <row> @@ -55,6 +57,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> <row> @@ -74,6 +77,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>South America</code> </row> <row> @@ -85,6 +89,7 @@ <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>1</sum_daily_nb_users> <code>Oceania</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml index eb13f78f0f..9e0087debc 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -17,6 +17,7 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>jp</code> <logo>plugins/UserCountry/images/flags/jp.png</logo> <logoWidth>16</logoWidth> @@ -39,6 +40,7 @@ <nb_conversions>7</nb_conversions> <revenue>35</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> @@ -61,6 +63,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>us</code> <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> @@ -83,6 +86,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>br</code> <logo>plugins/UserCountry/images/flags/br.png</logo> <logoWidth>16</logoWidth> @@ -97,6 +101,7 @@ <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>1</sum_daily_nb_users> <code>au</code> <logo>plugins/UserCountry/images/flags/au.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml index c4c562795c..a6ac17fd67 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -17,6 +17,7 @@ <nb_conversions>20</nb_conversions> <revenue>100</revenue> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> @@ -40,6 +41,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>VA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index 7ecb163f87..f3ad253189 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -9,6 +9,7 @@ <bounce_count>10</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <shortLabel>Webkit</shortLabel> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <shortLabel>Unknown</shortLabel> </row> <row> @@ -31,6 +33,7 @@ <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <shortLabel>Ie</shortLabel> </row> <row> @@ -42,6 +45,7 @@ <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>1</sum_daily_nb_users> <shortLabel>Gecko</shortLabel> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index dfada1bb89..6e00118191 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> <shortLabel>Epiphany 2.30</shortLabel> </row> @@ -21,6 +22,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> <shortLabel>Internet Explorer 9.0</shortLabel> </row> @@ -33,6 +35,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>RockMelt 0.9</shortLabel> </row> @@ -45,6 +48,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> <shortLabel>Android Browser </shortLabel> </row> @@ -57,6 +61,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 19.0</shortLabel> </row> @@ -69,6 +74,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 20.0</shortLabel> </row> @@ -81,6 +87,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> <shortLabel>Firefox 6.0</shortLabel> </row> @@ -93,6 +100,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>Unknown</shortLabel> </row> @@ -105,6 +113,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 11.0</shortLabel> </row> @@ -117,6 +126,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> <shortLabel>Internet Explorer 6.0</shortLabel> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 95f3291088..81101cc381 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> @@ -64,6 +69,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> <row> @@ -75,6 +81,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index e02a1136d9..f9654c1a34 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> </row> <row> <label>Mac OS / RockMelt / unknown</label> @@ -19,6 +20,7 @@ <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>2</sum_daily_nb_users> </row> <row> <label>Windows 7 / Internet Explorer / unknown</label> @@ -29,6 +31,7 @@ <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>3</sum_daily_nb_users> </row> <row> <label>Android / Android Browser / unknown</label> @@ -39,6 +42,7 @@ <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>2</sum_daily_nb_users> </row> <row> <label>Linux / Firefox / unknown</label> @@ -49,6 +53,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Windows 7 / Chrome / unknown</label> @@ -59,6 +64,7 @@ <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>2</sum_daily_nb_users> </row> <row> <label>Bot / Unknown / unknown</label> @@ -69,6 +75,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Linux / Chrome / unknown</label> @@ -79,6 +86,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Mac OS / Chrome / unknown</label> @@ -89,6 +97,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Unknown / Unknown / unknown</label> @@ -99,6 +108,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Windows XP / Chrome / 1280x800</label> @@ -109,6 +119,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>Windows XP / Internet Explorer / 1024x768</label> @@ -119,5 +130,6 @@ <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>1</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index fd38898a64..e08122bf12 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -9,5 +9,6 @@ <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>4</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index ba10c9516f..493d6eb7db 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -9,6 +9,7 @@ <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>9</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/mobile.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 17ff53a386..8f4652178c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -9,6 +9,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> @@ -42,6 +45,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> @@ -53,6 +57,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml index 108d617d79..d64c5f8f98 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -9,6 +9,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> <shortLabel>Linux</shortLabel> </row> @@ -21,6 +22,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> <shortLabel>Win 7</shortLabel> </row> @@ -33,6 +35,7 @@ <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> <shortLabel>Mac OS</shortLabel> </row> @@ -45,6 +48,7 @@ <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>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> <shortLabel>Android</shortLabel> </row> @@ -57,6 +61,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> <shortLabel>Win XP</shortLabel> </row> @@ -69,6 +74,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> <shortLabel>BOT</shortLabel> </row> @@ -81,6 +87,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> <shortLabel>Unknown</shortLabel> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml index 2ba37987cc..ffd5d0c162 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> </row> <row> <label>1024x768</label> @@ -19,6 +20,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>1280x800</label> @@ -29,5 +31,6 @@ <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>1</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml index 685578ed44..23755c4486 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml @@ -9,6 +9,7 @@ <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>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/unknown.gif</logo> </row> <row> @@ -20,6 +21,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> @@ -31,6 +33,7 @@ <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>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/wide.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml index eb4e37fdf7..f4ff4bbd78 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</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> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index 4dd0cef2d8..1c2689d174 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -15,6 +15,7 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> @@ -25,6 +26,7 @@ <nb_visits>9</nb_visits> <nb_uniq_visitors>9</nb_uniq_visitors> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> <nb_visits_converted>9</nb_visits_converted> @@ -35,6 +37,7 @@ <nb_visits>6</nb_visits> <nb_uniq_visitors>6</nb_uniq_visitors> <nb_actions>6</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> @@ -45,6 +48,7 @@ <nb_visits>10</nb_visits> <nb_uniq_visitors>10</nb_uniq_visitors> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>305</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 5c585c10cc..580a24928f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -9,6 +9,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> @@ -19,6 +20,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>2h</label> @@ -29,6 +31,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>3h</label> @@ -39,6 +42,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> @@ -49,6 +53,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>5h</label> @@ -59,6 +64,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> @@ -69,6 +75,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> @@ -79,6 +86,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>8h</label> @@ -89,6 +97,7 @@ <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>9h</label> @@ -99,6 +108,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> @@ -109,6 +119,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> @@ -119,6 +130,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> @@ -129,6 +141,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>13h</label> @@ -139,6 +152,7 @@ <bounce_count>4</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>14h</label> @@ -149,6 +163,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> @@ -159,6 +174,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>16h</label> @@ -169,6 +185,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>17h</label> @@ -179,6 +196,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>18h</label> @@ -189,6 +207,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>1</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>19h</label> @@ -199,6 +218,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</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>20h</label> @@ -209,6 +229,7 @@ <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>21h</label> @@ -219,6 +240,7 @@ <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>1</sum_daily_nb_users> </row> <row> <label>22h</label> @@ -229,6 +251,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> @@ -239,5 +262,6 @@ <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_users>0</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index f22c865187..5bc568ab81 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -9,6 +9,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> @@ -19,6 +20,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>2h</label> @@ -29,6 +31,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>3h</label> @@ -39,6 +42,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> @@ -49,6 +53,7 @@ <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>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -68,6 +73,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> @@ -78,6 +84,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> @@ -88,6 +95,7 @@ <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>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -115,6 +123,7 @@ <nb_conversions>4</nb_conversions> <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -126,6 +135,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> @@ -136,6 +146,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> @@ -146,6 +157,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> @@ -156,6 +168,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>13h</label> @@ -174,6 +187,7 @@ <nb_conversions>4</nb_conversions> <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -185,6 +199,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> @@ -195,6 +210,7 @@ <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>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -214,6 +230,7 @@ <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -233,6 +250,7 @@ <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -252,6 +270,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -271,6 +290,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -298,6 +318,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -317,6 +338,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -328,6 +350,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> @@ -338,5 +361,6 @@ <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_users>0</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_keywords__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml index c234bed59e..606fbb5241 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_keywords__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result>1</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml index 4c5729d4b1..2e8021bebd 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>27</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> <nb_visits_converted>25</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml index 722d5f8dd4..00ebb388f0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml index 8a58d46ddf..28fbf3b98b 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>9</max_actions> <sum_visit_length>1441</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index b6a5e2a7b6..7f7be6d377 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>1.2.4.0</visitIp> + <userId /> <actionDetails> <row> @@ -128,6 +129,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>1.2.4.0</visitIp> + <userId /> <actionDetails> <row> @@ -283,6 +285,7 @@ <idSite>1</idSite> <idVisit>19</idVisit> <visitIp>194.57.91.215</visitIp> + <userId /> <actionDetails> <row> @@ -407,6 +410,7 @@ <idSite>1</idSite> <idVisit>20</idVisit> <visitIp>194.57.91.215</visitIp> + <userId /> <actionDetails> <row> @@ -562,6 +566,7 @@ <idSite>1</idSite> <idVisit>23</idVisit> <visitIp>137.82.130.0</visitIp> + <userId /> <actionDetails> <row> @@ -686,6 +691,7 @@ <idSite>1</idSite> <idVisit>24</idVisit> <visitIp>137.82.130.0</visitIp> + <userId /> <actionDetails> <row> @@ -833,6 +839,7 @@ <idSite>1</idSite> <idVisit>31</idVisit> <visitIp>151.100.101.92</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index c0b5323021..d24401b6dc 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> + <userId>userid.email@example.org</userId> <actionDetails> <row> @@ -110,6 +111,7 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -265,6 +267,7 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -389,6 +392,7 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -527,6 +531,7 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -651,6 +656,7 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -806,6 +812,7 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index b4e2e7a9c3..47d78e80e8 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -159,6 +160,7 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -283,6 +285,7 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -438,6 +441,7 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -576,6 +580,7 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -700,6 +705,7 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -824,6 +830,7 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> + <userId>userid.email@example.org</userId> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index c0b5323021..d24401b6dc 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> + <userId>userid.email@example.org</userId> <actionDetails> <row> @@ -110,6 +111,7 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -265,6 +267,7 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -389,6 +392,7 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -527,6 +531,7 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -651,6 +656,7 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -806,6 +812,7 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index fd6f7e364a..0d104ef874 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> + <userId>userid.email@example.org</userId> <actionDetails> <row> @@ -110,6 +111,7 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -265,6 +267,7 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> + <userId /> <actionDetails> <row> @@ -389,6 +392,7 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -527,6 +531,7 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> + <userId /> <actionDetails> <row> @@ -651,6 +656,7 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -806,6 +812,7 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> + <userId /> <actionDetails> <row> @@ -930,6 +937,7 @@ <idSite>1</idSite> <idVisit>12</idVisit> <visitIp>1.2.4.5</visitIp> + <userId /> <actionDetails> <row> @@ -1068,6 +1076,7 @@ <idSite>1</idSite> <idVisit>11</idVisit> <visitIp>1.2.4.5</visitIp> + <userId /> <actionDetails> <row> @@ -1192,6 +1201,7 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>1.2.4.4</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 5c1fe5cdf0..7a27573cee 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -22,6 +22,7 @@ <nb_conversions>12</nb_conversions> <revenue>60</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> @@ -52,6 +53,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> <city_name>Vancouver</city_name> @@ -83,6 +85,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> @@ -114,6 +117,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>47.249</lat> <long>6.018</long> <city_name>Besançon</city_name> @@ -145,6 +149,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Hluboká nad Vltavou</city_name> <region>66</region> <country>ru</country> @@ -174,6 +179,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>29.65</lat> <long>91.1</long> <city_name>Lhasa</city_name> @@ -205,6 +211,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>London</city_name> <region>H9</region> <country>gb</country> @@ -234,6 +241,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> @@ -263,6 +271,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>mk</country> @@ -292,6 +301,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>ru</country> @@ -321,6 +331,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>G5</region> <country>gb</country> @@ -345,6 +356,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>1</lat> <long>2</long> <city_name>not a city</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml index 6807a5c527..ff0c032056 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml @@ -22,6 +22,7 @@ <nb_conversions>30</nb_conversions> <revenue>150</revenue> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>10</sum_daily_nb_users> <code>Europe</code> </row> <row> @@ -46,6 +47,7 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>North America</code> </row> <row> @@ -70,6 +72,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Unknown</code> </row> <row> @@ -94,6 +97,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Asia</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index a68d4ccd42..7a4e15a2ce 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <nb_conversions>15</nb_conversions> <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> @@ -49,6 +50,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ca</code> <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> @@ -76,6 +78,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ru</code> <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> @@ -103,6 +106,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> @@ -130,6 +134,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> @@ -157,6 +162,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>id</code> <logo>plugins/UserCountry/images/flags/id.png</logo> <logoWidth>16</logoWidth> @@ -184,6 +190,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>it</code> <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> @@ -211,6 +218,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>mk</code> <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> @@ -238,6 +246,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>ti</code> <logo>plugins/UserCountry/images/flags/ti.png</logo> <logoWidth>16</logoWidth> @@ -260,6 +269,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>us</code> <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 673b48b95b..b0ff278d85 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -22,6 +22,7 @@ <nb_conversions>12</nb_conversions> <revenue>60</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> @@ -50,6 +51,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> @@ -78,6 +80,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -106,6 +109,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>66</region> <country>ru</country> <country_name>Russian Federation</country_name> @@ -134,6 +138,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>1</region> <country>ti</country> <country_name>Tibet</country_name> @@ -162,6 +167,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>66</region> <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> @@ -190,6 +196,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>A6</region> <country>fr</country> <country_name>France</country_name> @@ -218,6 +225,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>G5</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -246,6 +254,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>H9</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -269,6 +278,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>CA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index acd4f8322a..0e4bd32e99 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -22,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml index 5049eed2f7..8c500c205d 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml @@ -22,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Europe</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 27a7669435..64a6c81f5a 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index 1b75304ffa..7a5f4e14d5 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -22,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 046e4901c5..58c9998d63 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <nb_conversions>15</nb_conversions> <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> @@ -49,6 +50,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ru</code> <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> @@ -76,6 +78,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> @@ -103,6 +106,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>it</code> <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> @@ -130,6 +134,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>mk</code> <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index e44fad3695..cd90855e1f 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> <city_name>Vancouver</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml index 4a9bfdd20d..d94f907eaf 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index 89c4e826f3..a0f1d322a8 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ca</code> <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 119f5b856f..629e659397 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index d2f9d91476..5f4e93831d 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -22,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> @@ -53,6 +54,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml index 591c729af6..4e05e6e6cb 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>Europe</code> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 8b8abcc028..02920d53d3 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 5f74e6000c..43b33f1cb5 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -22,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 5386b28232..70a94cb5a5 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -13,11 +13,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -40,6 +42,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -51,6 +54,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>12</nb_actions> + <nb_users>1</nb_users> <revenue>$ 40</revenue> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>00:21:01</avg_time_on_site> @@ -61,6 +65,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <revenue>$ 20</revenue> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> @@ -71,6 +76,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -81,6 +87,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -91,6 +98,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -101,6 +109,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -111,6 +120,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -121,6 +131,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -131,6 +142,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -141,6 +153,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -151,6 +164,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -161,6 +175,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -171,6 +186,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -181,6 +197,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -191,6 +208,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -201,6 +219,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -211,6 +230,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -221,6 +241,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -231,6 +252,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -241,6 +263,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -251,6 +274,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -261,6 +285,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -271,6 +296,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -281,6 +307,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml new file mode 100644 index 0000000000..428508cf56 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_users>1</nb_users> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <nb_visits_converted>0</nb_visits_converted> + <bounce_count>5</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml new file mode 100644 index 0000000000..428508cf56 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_users>1</nb_users> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <nb_visits_converted>0</nb_visits_converted> + <bounce_count>5</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml index 0052f0580d..4581cf832f 100644 --- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>6</nb_actions> + <nb_users>2</nb_users> <max_actions>5</max_actions> <sum_visit_length>721</sum_visit_length> <bounce_count>1</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>721</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml index 6f5b9fe078..e8e90f91e7 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>nb_uniq_visitors</row> + <row>nb_users</row> <row>nb_visits</row> <row>nb_actions</row> <row>nb_visits_converted</row> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_achievementPoints__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml index c234bed59e..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_achievementPoints__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json index 0b49fa51d7..b1bda48352 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json @@ -1 +1 @@ -[{"2010-03-06":{"nb_uniq_visitors":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file +[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml index e4958e50c5..c4d0257c6a 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml @@ -3,6 +3,7 @@ <row> <row key="2010-03-06"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> @@ -19,6 +20,7 @@ <row> <row key="2010-03-06"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv Binary files differindex 47e5c41252..e9e178c6a1 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml index c234bed59e..606fbb5241 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result>1</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml index 9f4dbd2d9a..2227e7a996 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 73d2f07fec..97cb7d23db 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -111,6 +112,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml index 8d24e97834..70de8b9679 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index b162b886a6..b497f3fa20 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> @@ -24,6 +25,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml index e5e6ad0926..014a276cc4 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index 0a1fcddfa8..a18003c1f3 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -43,6 +45,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> @@ -61,6 +64,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index 8a34da6deb..7f91b2b37b 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -25,6 +26,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml index 53c5121fc8..51a5d05c3f 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 4de55a5ecd..407bf56506 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml index e35ca641ed..19d159d081 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index 06f10725ef..f2a83be0db 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index 8698ce8960..028d2a9e2b 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml index 069f5b4dac..adb035d3e1 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index 5fb2fd41a1..2d114c7779 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml index da6bc517d2..cf862f146b 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml index e85da560ae..b13da65ae2 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml index f17d8430c7..3ffbdbfb40 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 5d605d853e..38f341f90b 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml index c9f66c8db6..a57ea4981d 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index b895a61804..18f14ab367 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml index 9cecc447c9..dea4d70860 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml index c8f6ef32b4..5e27b0a21f 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml index eb4e37fdf7..f4ff4bbd78 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</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> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml index 7b035b0188..9832b1f75e 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml @@ -30,6 +30,7 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index d3a8c80707..fac7a12b01 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -45,6 +49,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -55,6 +60,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -65,6 +71,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -75,6 +82,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -85,6 +93,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -95,6 +104,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -105,6 +115,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -115,6 +126,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -125,6 +137,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> @@ -135,6 +148,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -145,6 +159,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -155,6 +170,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -165,6 +181,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -175,6 +192,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -185,6 +203,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -195,6 +214,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -205,6 +225,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -215,6 +236,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -225,6 +247,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -235,6 +258,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index 40e2376055..ec3e7fc1d8 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -45,6 +49,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -55,6 +60,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -65,6 +71,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -75,6 +82,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -85,6 +93,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -95,6 +104,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -105,6 +115,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -115,6 +126,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> + <nb_users>1</nb_users> <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>0</bounce_count> @@ -133,6 +145,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -151,6 +164,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -161,6 +175,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -171,6 +186,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -181,6 +197,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -191,6 +208,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -201,6 +219,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -211,6 +230,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -221,6 +241,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -231,6 +252,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -241,6 +263,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -251,6 +274,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_myConversionSegmentName__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml index c234bed59e..606fbb5241 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_myConversionSegmentName__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result>1</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml index 368da87f68..b352427be8 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml index 4d6615ab11..8c453baeb1 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> + <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -47,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>13</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>13</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -69,6 +75,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -79,6 +86,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 0e713de68a..a9ba35c127 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -74,9 +74,9 @@ <browserName>Inconnu</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion /> + <browserVersion>UNK</browserVersion> <screenType>normal</screenType> - <deviceType>Inconnu</deviceType> + <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -180,9 +180,9 @@ <browserName>Inconnu</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion /> + <browserVersion>UNK</browserVersion> <screenType>normal</screenType> - <deviceType>Inconnu</deviceType> + <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml index c0a8e14b12..2e6fdfc3cd 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>1084</sum_visit_length> <bounce_count>1</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>1084</sum_visit_length> <bounce_count>1</bounce_count> @@ -35,6 +37,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -45,6 +48,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 97c4e0bb01..0135b49bd2 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>74.125.31.147</visitIp> + <userId /> <actionDetails> <row> <type>action</type> @@ -96,6 +97,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>74.125.31.147</visitIp> + <userId /> <actionDetails> <row> <type>action</type> @@ -188,6 +190,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>74.125.31.147</visitIp> + <userId /> <actionDetails> <row> <type>action</type> diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml index 48dc624b7e..299668e942 100644 --- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml +++ b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>1084</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>1084</sum_visit_length> <bounce_count>1</bounce_count> @@ -41,6 +43,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -51,6 +54,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -63,6 +67,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -73,6 +78,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -83,6 +89,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -95,6 +102,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -105,6 +113,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -117,6 +126,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -127,6 +137,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -139,6 +150,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>0</nb_actions> + <nb_users>1</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -157,6 +169,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>0</nb_actions> + <nb_users>1</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml index 3f3379340b..ef8d988f89 100644 --- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>8</nb_visits> <nb_actions>7</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index fe991619f5..7295efb518 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -266,6 +266,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml index 222e054734..b0534b1fd1 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml @@ -196,6 +196,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index 5c530bdadd..be6412244a 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -9,6 +9,7 @@ <bounce_count>9</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <url>http://google.com/search?q=free+%3E+proprietary</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> @@ -21,6 +22,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> <url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+corruption%21</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> @@ -33,6 +35,7 @@ <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> <url>http://google.com/search?q=peace+%22%2C%22+not+war</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml index b9a56dc03a..86026aff84 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml @@ -56,6 +56,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml index 5f45a83e5c..29f0426935 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml @@ -69,6 +69,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml index 0409b96f37..9a1a1b9d35 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml @@ -17,6 +17,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index 7b26cb0421..68837cb7a6 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -69,6 +69,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml index 799dedec2a..0e60dac3c4 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml @@ -8,6 +8,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -22,6 +23,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -36,6 +38,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -50,6 +53,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -64,6 +68,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -78,6 +83,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -103,6 +109,11 @@ <min>0</min> <max>1</max> </nb_actions> + <nb_users> + <name>Users</name> + <min>0</min> + <max>1</max> + </nb_users> <nb_actions_per_visit> <name>Actions per Visit</name> <min>0</min> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml index 0667e62efb..8251015ac6 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml @@ -10,6 +10,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -29,6 +30,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -48,6 +50,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -76,6 +79,11 @@ <min>0</min> <max>1</max> </nb_actions> + <nb_users> + <name>Users</name> + <min>0</min> + <max>1</max> + </nb_users> <nb_actions_per_visit> <name>Actions per Visit</name> <min>0</min> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml index 334c6c2da5..01184a360d 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml @@ -195,6 +195,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml index ff0459c32e..1f6a1ab5ed 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml @@ -119,6 +119,7 @@ <label>test cvar name</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>541</sum_visit_length> <bounce_count>0</bounce_count> @@ -128,6 +129,7 @@ <label>test cvar value</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>541</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml index fee4b36b1a..ba5b1f793b 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml @@ -111,6 +111,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>test cvar value</label> @@ -121,6 +122,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index 1e7e2b8d0c..349f30ef0e 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -13,11 +13,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -41,6 +43,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -56,6 +59,7 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> <row> @@ -66,6 +70,7 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> </result> @@ -78,6 +83,7 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> <row> @@ -88,6 +94,7 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index a34a4ccc8f..d2c8572231 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -17,6 +17,7 @@ <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index c63712075f..3ee6705d11 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml index 35529b7683..32b66284be 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml index 722d5f8dd4..00ebb388f0 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml index d7dfbaef5a..75e6622c16 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml index ad94ac5179..8c4e4cfbaa 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>10</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml index d7dfbaef5a..75e6622c16 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml index d7dfbaef5a..75e6622c16 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml index ad94ac5179..8c4e4cfbaa 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>10</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml index d7dfbaef5a..75e6622c16 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml index d7dfbaef5a..75e6622c16 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml index ad94ac5179..8c4e4cfbaa 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>10</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml index 7780723708..32471ac4cf 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml index a8198d8794..06c309c4fa 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result idSite="1"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index 59aea854d4..7b96eea503 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -13,11 +13,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -41,6 +43,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -54,6 +57,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>00:06:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -66,6 +70,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -78,6 +83,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -90,6 +96,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -102,6 +109,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -114,6 +122,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml index ea77225478..d1ae6ccf41 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -10,6 +10,7 @@ <metrics> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_users>Users</nb_users> <nb_actions>Actions</nb_actions> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <bounce_rate>Bounce Rate</bounce_rate> @@ -19,6 +20,7 @@ <metricsDocumentation> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> @@ -31,6 +33,7 @@ <columns> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_users>Users</nb_users> <nb_actions>Actions</nb_actions> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <bounce_rate>Bounce Rate</bounce_rate> @@ -40,6 +43,7 @@ <reportData> <result prettyDate="Sunday 3 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -49,6 +53,7 @@ </result> <result prettyDate="Monday 4 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> <max_actions>2</max_actions> @@ -58,6 +63,7 @@ </result> <result prettyDate="Tuesday 5 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <max_actions>5</max_actions> @@ -67,6 +73,7 @@ </result> <result prettyDate="Wednesday 6 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <max_actions>5</max_actions> @@ -76,6 +83,7 @@ </result> <result prettyDate="Thursday 7 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <max_actions>5</max_actions> @@ -85,6 +93,7 @@ </result> <result prettyDate="Friday 8 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <max_actions>5</max_actions> @@ -94,6 +103,7 @@ </result> <result prettyDate="Saturday 9 January 2010"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <max_actions>5</max_actions> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index 29748bbf3b..9ea8e32470 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -8,6 +8,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -18,6 +19,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -32,6 +34,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -42,6 +45,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -56,6 +60,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -66,6 +71,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -80,6 +86,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -90,6 +97,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -104,6 +112,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -114,6 +123,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -128,6 +138,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -138,6 +149,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -155,6 +167,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> @@ -165,6 +178,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index be10275c7b..302e91d40a 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -11,6 +11,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -21,6 +22,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -31,6 +33,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -53,6 +56,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> @@ -63,6 +67,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index 2247490c2a..9c516cffbe 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -12,6 +12,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -22,6 +23,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -32,6 +34,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -46,6 +49,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -56,6 +60,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </subtable> </row> @@ -77,6 +82,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> @@ -87,6 +93,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index 1e4d5d31af..9af23aaf76 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -11,6 +11,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -21,6 +22,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -31,6 +33,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -53,6 +56,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> @@ -63,6 +67,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml index 4a7e62a567..d658a0f2f3 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml @@ -5,6 +5,7 @@ <result date="2010-01-04" /> <result date="2010-01-05"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -17,6 +18,7 @@ </result> <result date="2010-01-06"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -29,6 +31,7 @@ </result> <result date="2010-01-07"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -41,6 +44,7 @@ </result> <result date="2010-01-08"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -53,6 +57,7 @@ </result> <result date="2010-01-09"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml index e20f62582a..b5f57f52bc 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>8</nb_visits_returning> <nb_actions_returning>40</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml index 98098553d0..b42cd3c399 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml @@ -4,6 +4,7 @@ <result date="From 2009-12-28 to 2010-01-03" /> <result date="From 2010-01-04 to 2010-01-10"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>6</nb_visits_returning> <nb_actions_returning>30</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -16,6 +17,7 @@ </result> <result date="From 2010-01-11 to 2010-01-17"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>2</nb_visits_returning> <nb_actions_returning>10</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml index 79b7f747ee..95f3ad4c21 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -15,6 +16,7 @@ </result> <result date="2010-01-04"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -27,6 +29,7 @@ </result> <result date="2010-01-05"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -39,6 +42,7 @@ </result> <result date="2010-01-06"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -51,6 +55,7 @@ </result> <result date="2010-01-07"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -63,6 +68,7 @@ </result> <result date="2010-01-08"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -75,6 +81,7 @@ </result> <result date="2010-01-09"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -90,6 +97,7 @@ <result date="2010-01-03" /> <result date="2010-01-04"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml index 492d535200..a575efca94 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -23,6 +24,7 @@ <result idSite="2"> <result date="2010-01"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml index d5eedfa09e..611a7dc7bb 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="From 2009-12-28 to 2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -15,6 +16,7 @@ </result> <result date="From 2010-01-04 to 2010-01-10"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>7</nb_visits> <nb_actions>32</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -27,6 +29,7 @@ </result> <result date="From 2010-01-11 to 2010-01-17"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -46,6 +49,7 @@ <result date="From 2009-12-28 to 2010-01-03" /> <result date="From 2010-01-04 to 2010-01-10"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 266aa03a6c..3de785f3d4 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -7,6 +7,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -31,6 +33,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -41,6 +44,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -55,6 +59,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -65,6 +70,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -79,6 +85,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -89,6 +96,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -103,6 +111,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -113,6 +122,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -127,6 +137,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> @@ -137,6 +148,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>5</max_actions> <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index de1c3b0e6e..b52e454e88 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -10,6 +10,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -20,6 +21,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -30,6 +32,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index ea7c0b1fc7..3d650861ff 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -11,6 +11,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -21,6 +22,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -31,6 +33,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -45,6 +48,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -55,6 +59,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index ac95568680..c5f8e144d3 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -10,6 +10,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> @@ -20,6 +21,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> @@ -30,6 +32,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml index 03c6e6c7c6..35d00c3b2b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml @@ -4,6 +4,7 @@ <result date="2010-01-04" /> <result date="2010-01-05"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -16,6 +17,7 @@ </result> <result date="2010-01-06"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -28,6 +30,7 @@ </result> <result date="2010-01-07"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -40,6 +43,7 @@ </result> <result date="2010-01-08"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -52,6 +56,7 @@ </result> <result date="2010-01-09"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>5</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml index 875aede1c5..fddd345d31 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml @@ -2,6 +2,7 @@ <results> <result date="2010-01"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>8</nb_visits_returning> <nb_actions_returning>40</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml index de7a5ddf27..913ff803a3 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml @@ -3,6 +3,7 @@ <result date="From 2009-12-28 to 2010-01-03" /> <result date="From 2010-01-04 to 2010-01-10"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>6</nb_visits_returning> <nb_actions_returning>30</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> @@ -15,6 +16,7 @@ </result> <result date="From 2010-01-11 to 2010-01-17"> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> <nb_visits_returning>2</nb_visits_returning> <nb_actions_returning>10</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml index 7b21303627..7f58873370 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml @@ -2,6 +2,7 @@ <results> <result date="2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result date="2010-01-04"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -26,6 +28,7 @@ </result> <result date="2010-01-05"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -38,6 +41,7 @@ </result> <result date="2010-01-06"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -50,6 +54,7 @@ </result> <result date="2010-01-07"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -62,6 +67,7 @@ </result> <result date="2010-01-08"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -74,6 +80,7 @@ </result> <result date="2010-01-09"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml index ced5798d4d..895ff4390d 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result date="2010-01"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>10</nb_visits> <nb_actions>43</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml index ae4a5d1be7..65935bcab0 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml @@ -2,6 +2,7 @@ <results> <result date="From 2009-12-28 to 2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -14,6 +15,7 @@ </result> <result date="From 2010-01-04 to 2010-01-10"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>7</nb_visits> <nb_actions>32</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -26,6 +28,7 @@ </result> <result date="From 2010-01-11 to 2010-01-17"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index ba5dafe722..2a5488bd2e 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -4,8 +4,8 @@ Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0 Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0 Visits Summary -nb_uniq_visitors,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site -2,10,43,5,10%,4.3,00:12:37 +nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site +2,1,10,43,5,10%,4.3,00:12:37 Visits by Server Time label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 9115282428..adb664ab33 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -3330,7 +3330,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page URL + Entry Page URL </th> <th style="padding: 6px 0;"> Entrances @@ -3396,7 +3396,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page URL + Exit Page URL </th> <th style="padding: 6px 0;"> Exits @@ -3597,7 +3597,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page Name + Entry Page title </th> <th style="padding: 6px 0;"> Entrances @@ -3659,7 +3659,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page Name + Exit Page Title </th> <th style="padding: 6px 0;"> Exits diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index f4e7a9afb5..b3b4db5f0b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -419,13 +419,21 @@ <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;"> + Users </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Visits </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 10 </td> </tr> - <tr style=""> + <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;"> Actions </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -433,7 +441,7 @@ </td> </tr> - <tr style="background-color: rgb(249,250,250)"> + <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Maximum actions in one visit </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -441,7 +449,7 @@ </td> </tr> - <tr style=""> + <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;"> Bounce Rate </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -449,7 +457,7 @@ </td> </tr> - <tr style="background-color: rgb(249,250,250)"> + <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Actions per Visit </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -457,7 +465,7 @@ </td> </tr> - <tr style=""> + <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;"> Avg. Visit Duration (in seconds) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 9b86222a07..b615d1d9a8 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml new file mode 100644 index 0000000000..ae0cf2abf9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -0,0 +1,206 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idVisit>1</idVisit> + <userId /> + <visitorId>a13b7c5a62f72dea</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>incredible title!</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sat 6 Mar 11:22:33</serverTimePretty> + <pageId>1</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime> + <actions>1</actions> + </row> + <row> + <idVisit>2</idVisit> + <userId /> + <visitorId>f66bc315f2a01a79</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index2.htm</url> + <pageTitle>incredible title!</pageTitle> + <pageIdAction>3</pageIdAction> + <serverTimePretty>Sat 6 Mar 11:25:33</serverTimePretty> + <pageId>2</pageId> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <icon /> + </row> + <row> + <type>action</type> + <url>http://example.org/index3.htm</url> + <pageTitle>incredible title!</pageTitle> + <pageIdAction>4</pageIdAction> + <serverTimePretty>Sat 6 Mar 11:28:33</serverTimePretty> + <pageId>3</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime> + <actions>2</actions> + </row> + <row> + <idVisit>3</idVisit> + <userId>email@example.com</userId> + <visitorId>9395988394d4568d</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>incredible title!</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sat 6 Mar 13:22:33</serverTimePretty> + <pageId>4</pageId> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <icon /> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>second page</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sat 6 Mar 13:28:33</serverTimePretty> + <pageId>5</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime> + <actions>2</actions> + </row> + <row> + <idVisit>4</idVisit> + <userId>new-email@example.com</userId> + <visitorId>c9ade7a5a103b2ed</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>a new user id was set -> new visit</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sat 6 Mar 13:34:33</serverTimePretty> + <pageId>6</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 13:34:33</lastActionDateTime> + <actions>1</actions> + </row> + <row> + <idVisit>5</idVisit> + <userId>new-email@example.com</userId> + <visitorId>c9ade7a5a103b2ed</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/home</url> + <pageTitle>same user id was set -> this is the same unique user</pageTitle> + <pageIdAction>8</pageIdAction> + <serverTimePretty>Sat 6 Mar 16:22:33</serverTimePretty> + <pageId>7</pageId> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <icon /> + </row> + <row> + <type>action</type> + <url>http://example.org/home</url> + <pageTitle>second pageview - by this user id</pageTitle> + <pageIdAction>8</pageIdAction> + <serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty> + <pageId>8</pageId> + <icon /> + </row> + <row> + <type>goal</type> + <goalName>triggered js</goalName> + <goalId>1</goalId> + <revenue>0</revenue> + <goalPageId /> + <serverTimePretty>Sat 6 Mar 16:34:33</serverTimePretty> + <url>http://example.org/home</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>ecommerceAbandonedCart</type> + <revenue>10000000000</revenue> + <items>1</items> + <serverTimePretty>Sat 6 Mar 16:40:33</serverTimePretty> + <itemDetails> + <row> + <itemSKU>sku-007-PRISM</itemSKU> + <itemName>My secret spy tech</itemName> + <itemCategory>Surveillance</itemCategory> + <price>10000000000</price> + <quantity>1</quantity> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 16:40:33</lastActionDateTime> + <actions>2</actions> + </row> + <row> + <idVisit>6</idVisit> + <userId /> + <visitorId>5e15b4d842cc294d</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/home</url> + <pageTitle>pageview - should not be tracked by our user id but in a new visit</pageTitle> + <pageIdAction>8</pageIdAction> + <serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty> + <pageId>9</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime> + <actions>1</actions> + </row> + <row> + <idVisit>7</idVisit> + <userId>email@example.com</userId> + <visitorId>9395988394d4568d</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Page view by email@example.com</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sun 14 Mar 11:22:33</serverTimePretty> + <pageId>10</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-14 11:22:33</lastActionDateTime> + <actions>1</actions> + </row> + <row> + <idVisit>8</idVisit> + <userId>new-user-id@one-weeklater</userId> + <visitorId>72d4b5565daf5546</visitorId> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>A page view by new-user-id@one-weeklater</pageTitle> + <pageIdAction>2</pageIdAction> + <serverTimePretty>Sun 14 Mar 11:46:33</serverTimePretty> + <pageId>11</pageId> + <icon /> + </row> + </actionDetails> + <lastActionDateTime>2010-03-14 11:46:33</lastActionDateTime> + <actions>1</actions> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml new file mode 100644 index 0000000000..15ef03fb49 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>3</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml new file mode 100644 index 0000000000..6593897748 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>4</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml new file mode 100644 index 0000000000..15ef03fb49 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>3</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml new file mode 100644 index 0000000000..e8e63ff5b6 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="The metric nb_users is not enabled for the requested period. Please see this FAQ: http://piwik.org/faq/how-to/faq_113/ + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml new file mode 100644 index 0000000000..07d6eee790 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_users>3</nb_users> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <nb_visits_converted>1</nb_visits_converted> + <bounce_count>3</bounce_count> + <sum_visit_length>1623</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>271</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml new file mode 100644 index 0000000000..a93adb4c50 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_users>4</nb_users> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> + <nb_visits_converted>1</nb_visits_converted> + <bounce_count>5</bounce_count> + <sum_visit_length>1623</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>63%</bounce_rate> + <nb_actions_per_visit>1.4</nb_actions_per_visit> + <avg_time_on_site>203</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml new file mode 100644 index 0000000000..07d6eee790 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>5</nb_uniq_visitors> + <nb_users>3</nb_users> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <nb_visits_converted>1</nb_visits_converted> + <bounce_count>3</bounce_count> + <sum_visit_length>1623</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>271</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml new file mode 100644 index 0000000000..107fa6ae8a --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> + <nb_visits_converted>1</nb_visits_converted> + <bounce_count>5</bounce_count> + <sum_visit_length>1623</sum_visit_length> + <max_actions>2</max_actions> + <bounce_rate>63%</bounce_rate> + <nb_actions_per_visit>1.4</nb_actions_per_visit> + <avg_time_on_site>203</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml new file mode 100644 index 0000000000..39c7de375f --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>My secret spy tech</label> + <revenue>10000000000</revenue> + <quantity>1</quantity> + <abandoned_carts>1</abandoned_carts> + <avg_price>10000000000</avg_price> + <avg_quantity>1</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml new file mode 100644 index 0000000000..a43cbc433e --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <conversion_rate>50</conversion_rate> + <revenue>0</revenue> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TrackingAPI_SetVisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml index 1076ef51ea..969fd130e8 100644 --- a/tests/PHPUnit/Integration/expected/test_TrackingAPI_SetVisitorId__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_visits_converted>0</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>181</sum_visit_length> + <sum_visit_length>1081</sum_visit_length> <max_actions>2</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>91</avg_time_on_site> + <avg_time_on_site>541</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml index 960470df27..60e66443ac 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result date="2010-01"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -15,6 +16,7 @@ <result date="2010-02" /> <result date="2010-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml index a0bc7a3d90..6091a91875 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml @@ -4,6 +4,7 @@ <result date="2010-02" /> <result date="2010-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml index caa4caae05..f62a5823c3 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml @@ -2,6 +2,7 @@ <results> <result date="2009-10"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>0</nb_visits_converted> @@ -16,6 +17,7 @@ <result date="2009-12" /> <result date="2010-01"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml index be23d67bf2..49123c527d 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml @@ -5,6 +5,7 @@ <result date="2009-12" /> <result date="2010-01"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml index e8c2be194d..49206ac44f 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml @@ -4,6 +4,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -31,6 +32,7 @@ <exit_bounce_count>Bounces</exit_bounce_count> <exit_rate>Exit rate</exit_rate> <sum_daily_nb_uniq_visitors>Unique visitors (daily sum)</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>Users (daily sum)</sum_daily_nb_users> <sum_daily_entry_nb_uniq_visitors>Unique entrances (daily sum)</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>Unique exits (daily sum)</sum_daily_exit_nb_uniq_visitors> <entry_nb_actions>Actions after entering here</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index c03a680ec7..1ad0016671 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -70,6 +70,7 @@ <metrics> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_users>Users</nb_users> <nb_actions>Actions</nb_actions> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <bounce_rate>Bounce Rate</bounce_rate> @@ -79,6 +80,7 @@ <metricsDocumentation> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> @@ -99,11 +101,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -132,11 +136,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -159,11 +165,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -185,11 +193,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -212,11 +222,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -238,11 +250,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -265,11 +279,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -309,11 +325,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -335,11 +353,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -362,11 +382,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -388,11 +410,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -414,11 +438,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -440,11 +466,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1030,11 +1058,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1064,11 +1094,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1090,11 +1122,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1124,11 +1158,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1158,11 +1194,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1192,11 +1230,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1226,11 +1266,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1603,11 +1645,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1723,11 +1767,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1749,11 +1795,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1775,11 +1823,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1801,11 +1851,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1827,11 +1879,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1853,11 +1907,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1879,11 +1935,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1905,11 +1963,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -1929,6 +1989,7 @@ <metrics> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_users>Users</nb_users> <nb_actions>Actions</nb_actions> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <bounce_rate>Bounce Rate</bounce_rate> @@ -1963,6 +2024,7 @@ <metricsDocumentation> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 19aefaace8..5b0389fd95 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -159,6 +159,14 @@ <row> <type>dimension</type> <category>Visit</category> + <name>User ID</name> + <segment>userId</segment> + <acceptedValues>any non empty unique string identifying the user (such as an email address or a username).</acceptedValues> + <permission>1</permission> + </row> + <row> + <type>dimension</type> + <category>Visit</category> <name>Visit Ecommerce status at the end of the visit</name> <segment>visitEcommerceStatus</segment> <acceptedValues>none, ordered, abandonedCart, orderedThenAbandonedCart. For example, to select all visits that have made an Ecommerce order, the API request would contain "&segment=visitEcommerceStatus==ordered,visitEcommerceStatus==orderedThenAbandonedCart"</acceptedValues> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml index 71adf62247..31a1a76207 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml @@ -2,6 +2,7 @@ <result> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> + <nb_users>1</nb_users> <nb_actions>1</nb_actions> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php index ec25ddae75..97a77f75d4 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php @@ -1 +1 @@ -a:1:{i:0;a:76:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:20:"nb_visits_percentage";s:8:"% Visits";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";}}
\ No newline at end of file +a:1:{i:0;a:78:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:20:"nb_visits_percentage";s:8:"% Visits";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";}}
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index ec3e001105..637cd72d01 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -51,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>1086</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml index 3da4a2d812..d4c25ca522 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml @@ -5,13 +5,13 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://example.org/piwik/"; + var u="//example.org/piwik/"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', 1]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="http://example.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//example.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 1e86d73426..eab8c16736 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv Binary files differindex 67508d138c..b4ffde1b75 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv Binary files differindex 356de334f1..109087d7da 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv Binary files differindex 91ae853358..8d4d20182f 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv Binary files differindex b9a8050f6c..271dfc0903 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex f3b034e10e..c73459c8af 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv Binary files differindex 9962efd45a..40134526b9 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index e971584eba..d79b87b412 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -138,6 +139,7 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 12740b0394..fc0c7b8b98 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -13,11 +13,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -40,6 +42,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -51,6 +54,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <revenue>$ 10</revenue> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>00:12:01</avg_time_on_site> @@ -61,6 +65,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -71,6 +76,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> + <nb_users>1</nb_users> <revenue>$ 3111</revenue> <nb_actions_per_visit>6</nb_actions_per_visit> <avg_time_on_site>01:06:01</avg_time_on_site> @@ -81,6 +87,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -91,6 +98,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -101,6 +109,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -111,6 +120,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -121,6 +131,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <revenue>$ 0</revenue> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>00:12:01</avg_time_on_site> @@ -131,6 +142,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -141,6 +153,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -151,6 +164,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -161,6 +175,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -171,6 +186,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -181,6 +197,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -191,6 +208,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -201,6 +219,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -211,6 +230,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -221,6 +241,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -231,6 +252,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -241,6 +263,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -251,6 +274,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -261,6 +285,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -271,6 +296,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -281,6 +307,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml index b8c7975d1b..84fe788870 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml index b8c7975d1b..84fe788870 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml index 35529b7683..32b66284be 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml index 9e048c4038..245838d973 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml index 0d1d5d37e6..a77a67e608 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml index 9e048c4038..245838d973 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml index 324e8c4dcf..3756627436 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml index 3dbe43a93d..fe1fab1bb1 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml @@ -4,6 +4,7 @@ <label>ValueIsZero</label> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> @@ -37,6 +38,7 @@ <label>0</label> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> @@ -72,6 +74,7 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> @@ -105,6 +108,7 @@ <label>NewLoggedOut</label> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> @@ -232,6 +236,7 @@ <label>VisitorName</label> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>4682</sum_visit_length> <bounce_count>0</bounce_count> @@ -260,6 +265,7 @@ <label>Great name!</label> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>4682</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 9ebcbe3c60..1604ba4335 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -214,6 +215,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -543,6 +545,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml index 540bbc601f..280871867e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>2</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml index 09231c1745..9001fd15fe 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>2</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index bc107c7cde..f2727a5735 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>4682</sum_visit_length> <bounce_count>0</bounce_count> @@ -38,6 +39,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>721</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml index 71006d2c5a..7c6f26cbac 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>2</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml index e9de54454b..7728bda23d 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml @@ -10,6 +10,7 @@ <nb_visits>3</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml index b9c826a493..e8dea88fc3 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -45,6 +49,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -55,6 +60,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -65,6 +71,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -75,6 +82,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -85,6 +93,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -95,6 +104,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -105,6 +115,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -115,6 +126,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -125,6 +137,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>5403</sum_visit_length> <bounce_count>0</bounce_count> @@ -135,6 +148,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -145,6 +159,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -155,6 +170,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -165,6 +181,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -175,6 +192,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -185,6 +203,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -195,6 +214,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -205,6 +225,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -215,6 +236,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -225,6 +247,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -235,6 +258,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml index 2f593b5367..5b116367a0 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>721</sum_visit_length> <bounce_count>0</bounce_count> @@ -23,6 +24,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -33,6 +35,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> + <nb_users>1</nb_users> <max_actions>6</max_actions> <sum_visit_length>3961</sum_visit_length> <bounce_count>0</bounce_count> @@ -62,6 +65,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -72,6 +76,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -82,6 +87,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -92,6 +98,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -102,6 +109,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>721</sum_visit_length> <bounce_count>0</bounce_count> @@ -121,6 +129,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -131,6 +140,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -141,6 +151,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -151,6 +162,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -161,6 +173,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -171,6 +184,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -181,6 +195,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -191,6 +206,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -201,6 +217,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -211,6 +228,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -221,6 +239,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -231,6 +250,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -241,6 +261,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -251,6 +272,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -261,6 +283,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -271,6 +294,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml index 3449ad9ec8..2cbee6a96a 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index 478590155c..676a78493b 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -4,8 +4,8 @@ Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100% Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0 Visits Summary -nb_uniq_visitors,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site -1,5,16,6,20%,3.2,00:22:49 +nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site +1,1,5,16,6,20%,3.2,00:22:49 Visits by Server Time label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 47d2b984d2..247f013038 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -4338,7 +4338,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page URL + Entry Page URL </th> <th style="padding: 6px 0;"> Entrances @@ -4388,7 +4388,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page URL + Exit Page URL </th> <th style="padding: 6px 0;"> Exits @@ -4638,7 +4638,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page Name + Entry Page title </th> <th style="padding: 6px 0;"> Entrances @@ -4714,7 +4714,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Page Name + Exit Page Title </th> <th style="padding: 6px 0;"> Exits diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 78ca134267..499abb0186 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -479,13 +479,21 @@ <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;"> + Users </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Visits </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> </tr> - <tr style=""> + <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;"> Actions </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -493,7 +501,7 @@ </td> </tr> - <tr style="background-color: rgb(249,250,250)"> + <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Maximum actions in one visit </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -501,7 +509,7 @@ </td> </tr> - <tr style=""> + <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;"> Bounce Rate </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -509,7 +517,7 @@ </td> </tr> - <tr style="background-color: rgb(249,250,250)"> + <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Actions per Visit </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -517,7 +525,7 @@ </td> </tr> - <tr style=""> + <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;"> Avg. Visit Duration (in seconds) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex f7bdbe8b56..fbf27a0c19 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml new file mode 100644 index 0000000000..106f23f16b --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_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/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml new file mode 100644 index 0000000000..5cfb246edc --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_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/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport.xml b/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport.xml deleted file mode 100644 index 1b2fed39f9..0000000000 --- a/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <nb_visits>5</nb_visits> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml index 5e489a599d..c415099916 100644 --- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning> + <nb_users_returning>0</nb_users_returning> <nb_visits_returning>0</nb_visits_returning> <nb_actions_returning>0</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml new file mode 100644 index 0000000000..f5722c2b94 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>0</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml index 35529b7683..32b66284be 100644 --- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>0</nb_uniq_visitors> + <nb_users>0</nb_users> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml index b2f9f0c541..6496f1c84e 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml @@ -11,6 +11,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> + <nb_users>2</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>1</bounce_count> @@ -25,6 +26,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -37,6 +39,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -58,6 +61,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -72,6 +76,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml index 38885d824a..0bbeb47f2d 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml @@ -10,6 +10,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> @@ -22,6 +23,7 @@ <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>1</sum_daily_nb_users> <url>mixi.jp</url> <logo>plugins/Referrers/images/socials/mixi.jp.png</logo> </row> @@ -34,6 +36,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>skyrock.com</url> <logo>plugins/Referrers/images/socials/skyrock.com.png</logo> </row> @@ -46,6 +49,7 @@ <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <url>twitter.com</url> <logo>plugins/Referrers/images/socials/twitter.com.png</logo> </row> @@ -58,6 +62,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>flickr.com</url> <logo>plugins/Referrers/images/socials/flickr.com.png</logo> </row> @@ -70,6 +75,7 @@ <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>1</sum_daily_nb_users> <url>xanga.com</url> <logo>plugins/Referrers/images/socials/xanga.com.png</logo> </row> @@ -84,6 +90,7 @@ <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>twitter.com</url> <logo>plugins/Referrers/images/socials/twitter.com.png</logo> </row> @@ -96,6 +103,7 @@ <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>1</sum_daily_nb_users> <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml index 7a5bd96531..db9224b872 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml @@ -9,6 +9,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://facebook.com/whatever</url> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> @@ -31,6 +33,7 @@ <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>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index c5070518d9..de63f6e83a 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -9,6 +9,7 @@ <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml index af2a4113f9..97c6ffce80 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml @@ -9,5 +9,6 @@ <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml index 551b2730b9..f29f60a748 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml @@ -9,6 +9,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> @@ -19,6 +20,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>2h</label> @@ -29,6 +31,7 @@ <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>3h</label> @@ -39,6 +42,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> @@ -49,6 +53,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>5h</label> @@ -59,6 +64,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> @@ -69,6 +75,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> @@ -79,6 +86,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>8h</label> @@ -89,6 +97,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>9h</label> @@ -99,6 +108,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> @@ -109,6 +119,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> @@ -119,6 +130,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> @@ -129,6 +141,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>13h</label> @@ -139,6 +152,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>14h</label> @@ -149,6 +163,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> @@ -159,6 +174,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>16h</label> @@ -169,6 +185,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>17h</label> @@ -179,6 +196,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>18h</label> @@ -189,6 +207,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>19h</label> @@ -199,6 +218,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>20h</label> @@ -209,6 +229,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>21h</label> @@ -219,6 +240,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>22h</label> @@ -229,6 +251,7 @@ <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_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> @@ -239,5 +262,6 @@ <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_users>0</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml index 36ba343b8d..e36d8673a4 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml @@ -10,6 +10,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://facebook.com/whatever</url> </row> <row> @@ -21,6 +22,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> @@ -32,6 +34,7 @@ <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>1</sum_daily_nb_users> <url>http://mixi.jp</url> </row> <row> @@ -43,6 +46,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://skyrock.com</url> </row> <row> @@ -54,6 +58,7 @@ <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>1</sum_daily_nb_users> <url>http://t.co/id/?y=dsfs</url> </row> <row> @@ -65,6 +70,7 @@ <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>1</sum_daily_nb_users> <url>http://twitter.com/whatever2</url> </row> <row> @@ -76,6 +82,7 @@ <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>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> <row> @@ -87,6 +94,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.flickr.com</url> </row> <row> @@ -98,6 +106,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.twitter.com/index?a=2334</url> </row> <row> @@ -109,6 +118,7 @@ <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>1</sum_daily_nb_users> <url>http://xanga.com</url> </row> </result> @@ -122,6 +132,7 @@ <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>1</sum_daily_nb_users> <url>http://t.co/id/?y=dsfs</url> </row> <row> @@ -133,6 +144,7 @@ <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>1</sum_daily_nb_users> <url>http://twitter.com/whatever2</url> </row> <row> @@ -144,6 +156,7 @@ <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>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml index 0f5fa963c6..e8bbd9822c 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml @@ -22,6 +22,7 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> @@ -40,6 +41,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> @@ -63,6 +65,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -83,6 +86,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> @@ -101,6 +105,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -139,6 +144,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> @@ -157,6 +163,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -177,6 +184,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> @@ -195,6 +203,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index a4b5bc02dd..991e9a10d5 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -4,6 +4,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -108,6 +109,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -222,6 +224,7 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 2fca85f964..7cfdbb21e2 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -47,6 +47,7 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -152,6 +153,7 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> + <userId /> <actionDetails> <row> @@ -264,6 +266,7 @@ </row> </lastVisits> + <userId /> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml index 1c0a535dc5..dd5070e6a6 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml @@ -9,6 +9,7 @@ <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> <subtable> <row> <label>Google</label> @@ -19,6 +20,7 @@ <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> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml index 3d028f8e71..a3121fadae 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -16,6 +17,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -27,6 +29,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -38,6 +41,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -49,6 +53,7 @@ <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> + <nb_users>9</nb_users> <max_actions>2</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml index 380cb7ace9..25c6014a6f 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -37,6 +40,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -47,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -69,6 +75,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml index 3698d420bd..9f75ee4f21 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>15</nb_uniq_visitors> <nb_visits>55</nb_visits> <nb_actions>55</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>55</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>12</nb_uniq_visitors> <nb_visits>12</nb_visits> <nb_actions>12</nb_actions> + <nb_users>12</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>12</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -45,6 +49,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> @@ -67,6 +73,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -77,6 +84,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -87,6 +95,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml index 5c9a95535e..60aa118c67 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -27,6 +29,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -39,6 +42,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -51,6 +55,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -61,6 +66,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -73,6 +79,7 @@ <nb_uniq_visitors>6</nb_uniq_visitors> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> + <nb_users>6</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml index 6c7222bd30..b57109e0af 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -37,6 +40,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -47,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -69,6 +75,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml index 3025935cb2..eb4632bf55 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -21,6 +22,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -37,6 +39,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml index fe34824621..8709d29f8f 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -20,6 +21,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -35,6 +37,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml index 72b4541030..83261e4e55 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -29,6 +31,7 @@ <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>45</nb_visits> <nb_actions>45</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml index e34115a022..daeaa29064 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>10</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>12</nb_uniq_visitors> <nb_visits>60</nb_visits> <nb_actions>60</nb_actions> + <nb_users>12</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>60</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml index 13688b0eee..7b9b2dda4d 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -29,6 +31,7 @@ <nb_uniq_visitors>8</nb_uniq_visitors> <nb_visits>40</nb_visits> <nb_actions>40</nb_actions> + <nb_users>5</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml index 94ae7f5a3c..446fcc519a 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>8</nb_uniq_visitors> <nb_visits>40</nb_visits> <nb_actions>40</nb_actions> + <nb_users>5</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml index 766cc68ff2..793827ccbb 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml @@ -9,6 +9,7 @@ <bounce_count>52</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://www.comcast.net/</url> </row> <row> @@ -20,6 +21,7 @@ <bounce_count>26</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://www.awesomeisp.com/</url> </row> <row> @@ -31,6 +33,7 @@ <bounce_count>22</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://piwik.org/faq/general/#faq_52</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml index 3d028f8e71..a3121fadae 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -16,6 +17,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -27,6 +29,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -38,6 +41,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -49,6 +53,7 @@ <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> + <nb_users>9</nb_users> <max_actions>2</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml index 380cb7ace9..25c6014a6f 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -37,6 +40,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -47,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -69,6 +75,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml index 3698d420bd..9f75ee4f21 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>15</nb_uniq_visitors> <nb_visits>55</nb_visits> <nb_actions>55</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>55</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>12</nb_uniq_visitors> <nb_visits>12</nb_visits> <nb_actions>12</nb_actions> + <nb_users>12</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>12</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -35,6 +38,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -45,6 +49,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> @@ -67,6 +73,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -77,6 +84,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -87,6 +95,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml index 5c9a95535e..60aa118c67 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -27,6 +29,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -39,6 +42,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -51,6 +55,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -61,6 +66,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -73,6 +79,7 @@ <nb_uniq_visitors>6</nb_uniq_visitors> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> + <nb_users>6</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml index 6c7222bd30..b57109e0af 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> + <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -37,6 +40,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -47,6 +51,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -57,6 +62,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -69,6 +75,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index 3025935cb2..eb4632bf55 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -21,6 +22,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -37,6 +39,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index fe34824621..8709d29f8f 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -20,6 +21,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -35,6 +37,7 @@ <nb_uniq_visitors>7</nb_uniq_visitors> <nb_visits>35</nb_visits> <nb_actions>35</nb_actions> + <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml index 72b4541030..83261e4e55 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -29,6 +31,7 @@ <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>45</nb_visits> <nb_actions>45</nb_actions> + <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml index e34115a022..daeaa29064 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>10</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>12</nb_uniq_visitors> <nb_visits>60</nb_visits> <nb_actions>60</nb_actions> + <nb_users>12</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>60</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml index 13688b0eee..7b9b2dda4d 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -29,6 +31,7 @@ <nb_uniq_visitors>8</nb_uniq_visitors> <nb_visits>40</nb_visits> <nb_actions>40</nb_actions> + <nb_users>5</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml index 94ae7f5a3c..446fcc519a 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> @@ -15,6 +16,7 @@ <nb_uniq_visitors>3</nb_uniq_visitors> <nb_visits>15</nb_visits> <nb_actions>15</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> @@ -25,6 +27,7 @@ <nb_uniq_visitors>8</nb_uniq_visitors> <nb_visits>40</nb_visits> <nb_actions>40</nb_actions> + <nb_users>5</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml index 489f5c42ca..180ffee42b 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml @@ -9,6 +9,7 @@ <bounce_count>52</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://www.comcast.net/</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml index 9c6eba0c0c..9b4d19a4ad 100644 --- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml @@ -5,6 +5,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>363</sum_visit_length> <bounce_count>0</bounce_count> @@ -43,6 +44,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -53,6 +55,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -63,6 +66,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -73,6 +77,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -83,6 +88,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -93,6 +99,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -103,6 +110,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -113,6 +121,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -123,6 +132,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -133,6 +143,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -143,6 +154,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -153,6 +165,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -163,6 +176,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -173,6 +187,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -183,6 +198,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -193,6 +209,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -203,6 +220,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -213,6 +231,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -223,6 +242,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -233,6 +253,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -243,6 +264,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -253,6 +275,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> @@ -263,6 +286,7 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> + <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml index 76b20063bf..9738bb1e1d 100644 --- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml index 77cc09b623..6b4ab50749 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml index 77cc09b623..6b4ab50749 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml index 7c63bddea3..5d9ef3f371 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml index 77cc09b623..6b4ab50749 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml index 7c63bddea3..5d9ef3f371 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml index e9cdab8355..8253ae8ec8 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml @@ -6,6 +6,7 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> + <nb_users>2</nb_users> <max_actions>4</max_actions> <sum_visit_length>722</sum_visit_length> <bounce_count>2</bounce_count> @@ -28,6 +29,7 @@ <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -45,6 +47,7 @@ <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -69,6 +72,7 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -86,6 +90,7 @@ <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -105,6 +110,7 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -122,6 +128,7 @@ <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -157,6 +164,7 @@ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -174,6 +182,7 @@ <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index bce87d03bd..e30a2e382d 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -24,6 +24,7 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> @@ -42,6 +43,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> @@ -65,6 +67,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -85,6 +88,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> @@ -103,6 +107,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -123,6 +128,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> @@ -141,6 +147,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -179,6 +186,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> @@ -197,6 +205,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml index af699f57c0..d0993ba66f 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01-03"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml index af0e5b6234..d1606c4582 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="From 2009-12-28 to 2010-01-03"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 9b072bf91e..6ec09ca8b4 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -14,11 +14,13 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -35,6 +37,7 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> + <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -45,6 +48,7 @@ <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <conversion_rate>0%</conversion_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>00:06:01</avg_time_on_site> @@ -55,6 +59,7 @@ <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <conversion_rate>0%</conversion_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>00:03:01</avg_time_on_site> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml index adbbf67348..65d9f89144 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml @@ -6,6 +6,7 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> + <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>725</sum_visit_length> <bounce_count>2</bounce_count> @@ -28,6 +29,7 @@ <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -45,6 +47,7 @@ <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -69,6 +72,7 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -86,6 +90,7 @@ <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -121,6 +126,7 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -138,6 +144,7 @@ <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -157,6 +164,7 @@ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -174,6 +182,7 @@ <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> + <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml index 7201f53df6..b60c08c406 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml @@ -24,6 +24,7 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> @@ -42,6 +43,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> @@ -65,6 +67,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -85,6 +88,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> @@ -103,6 +107,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -141,6 +146,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> @@ -159,6 +165,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -179,6 +186,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> @@ -197,6 +205,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml index fed5186aaa..2c077be5ff 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01-03"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml index 15d1811493..64436791b9 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="From 2009-12-28 to 2010-01-03"> <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> <nb_visits_converted>2</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml index 10b78a6352..51453f0021 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml @@ -6,6 +6,7 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -23,6 +24,7 @@ <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -58,6 +60,7 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -75,6 +78,7 @@ <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -94,6 +98,7 @@ <label>VisitorType</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -116,6 +121,7 @@ <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml index 8921fee12c..02da1ef089 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml @@ -19,6 +19,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> @@ -37,6 +38,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -75,6 +77,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> @@ -93,6 +96,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -118,6 +122,7 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> @@ -136,6 +141,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml index 610c0c4f9e..c18454dfe3 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml @@ -7,6 +7,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -17,6 +18,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> + <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml index 2ee26403d7..c591eb3deb 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml @@ -11,6 +11,7 @@ <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> <subtable> <row> <label>Google</label> @@ -21,6 +22,7 @@ <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> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml index 1eecbb155e..94e129088d 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml index 48f2d04f2d..703cbd578e 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml @@ -3,6 +3,7 @@ <result idSite="1"> <result date="From 2009-12-28 to 2010-01-03"> <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_users>1</nb_users> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 319cf3e20c8f280fb2a4662eaf64bc90ad44f5e +Subproject 14b5a0ba52e5193497d8b24765d221ce66cc086 diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh index fa783472dc..69576a05c5 100755 --- a/tests/travis/travis.sh +++ b/tests/travis/travis.sh @@ -15,6 +15,9 @@ then echo "=====> There are some tests functions which do not have a @group set or have no tests. " echo " Please add the @group phpdoc comment to the following tests: <=====" phpunit --group __nogroup__ --testdox | grep "[x]" + + echo "Initial output of \$phpunit --group __nogroup__ " + phpunit --group __nogroup__ exit 1 fi fi |
