diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c6720e9fc5a5f167e1b07e57e09bc6f5a7ce5e3..06cd5f970c05e60bf7e58f964e04477f0b154413 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 7a30ec861b6458872698f8e97f8dac4e48ba3599..e126a39a7f4169c50799e8cec5b9a1a0928a6f2e 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 62552298cd0d11139bbeb8cdbb02d457b74e02ff..d72d5e6150efd19bab20139455d2c6a5c3a8bd3e 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 cd3fc0138c970ae90ce45eb7d4418ccacfc759a1..2df309d69c50bbeb536725ce3953f712a13f25c3 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 03b26acf2f7ba817568d5f80672ebefeaf917a49..223241e9809afa898466c47fc9030d5985af7a01 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -284,6 +284,18 @@ class Rules
Cache::clearCacheGeneral();
}
+ /**
+ * 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
@@ -310,4 +322,4 @@ class Rules
}
return false;
}
-}
+}
\ No newline at end of file
diff --git a/core/Factory.php b/core/BaseFactory.php
similarity index 96%
rename from core/Factory.php
rename to core/BaseFactory.php
index 480f9313c17c80ae035044eb1eb9f7f45ba449f1..e24b6dfc02f337f10b384b64ec4e4b713b7c51c5 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 0318136a367ecd2e4e5068860a5edb5c54201059..9c7e82fe53839288b4006664b8f8886570df29bc 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 ecfefabcec0e4d2cf3f9438192e2d6a0c5ca5e04..5d5c35c764a7cb4dd81f600f5b8f14af0a751f3a 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -574,6 +574,18 @@ class Common
return self::hex2bin($id);
}
+ /**
+ * 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
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index d52ff8b7a067b7213db40ad4eda5a38ad8486dd8..95a7603176a7e3b4ad05fa0931ee3d396a3e37ee 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 4f994a7d3ebacb3e7ce5cd887b6babc83f9b3ea7..042d5ae9619d13324a7f7e328077bd8a75484e90 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 aea71e4da863ae42bd4f49912db0911cb9e8d8c9..e366cc2ec8534912d4da3da37ef4b0748d1ce96e 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 43a42f167d1adc256224d030ab5b244ca37567bf..1130c1b6bf342c7f07d665e66c42a31057163d19 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 2ccf6fda289e6f9809f0b0622541d355e52bc3be..1fe1152c98e38ffca391eee2601919fcb1299cfd 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 37685dd09a2ee122114c1940b724933f65b68be5..c88bb1329420a4e2e4ee4dff374896c48aaa976e 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 fcb49ee82f87dc2dc6ac75dd18475f1571a0df3d..9e53964e60520090094978402cd773f421b9598b 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 7b6298dfe7b3663736e34a4d9d649e006388a126..3ebad0f1eda42ee437889b0a9f702b61e7c4d796 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 9f7240b1f30be30de921caad56b4405c5aac0648..6d2bdefccd28908042c9da8ed2c7a72b82a37deb 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 c341926a5cddd7a3a551c9e5dcf30155762a3b29..f59e8a13c0de38c79f613c2ce3d99599d450dbca 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 e6ccc530ed818679f956d8eda91ddccbed0caa17..9cf58448f73163dfd03a04afa963896002d9deba 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 ef9c7d7e4f614f39aa8c2f6323193817322db38e..d9e8a04278c627d301cd04443b5d98b4e2eb6b5c 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 6a7f96b0b9d15795bbc30e71614697e48f8769b2..659c5fac6acf5e446ceb1448c5b229a096dac328 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 90b58a88b068e845a3f81b930b08d84b1cebf83a..793cfefb1c8e6ee7e7a6af7e93b77dae60b6c0df 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 70fb165f9b1030ccfa82e3c4580187ae3f5a9587..846c7c78acfaf9810caf08ff0b1922532d187a7e 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 0000000000000000000000000000000000000000..914d2ab65eb7ae71f3c10cb13eeb5a650b93568c
--- /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 843a22004b32cfcb1240222494282aa81e46995a..b91bb28685253c37afb16f08b02f7137313b3847 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 fe6494c87ea67e0f7f606ecb929f3c4316657f73..c62c0eed78f3bbb4647bcba63887b9e6c13cfe90 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 5df0950b37351839211c7fcfdd89ad09f1df34ac..5a67f53716bb3f46adc6ca372116a1923f31c71b 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 ac9a4ff71ff71603d6f26308bf8e8291c551a8f5..2aa35778cc55548ee7dfbaae44a033b1cdf6e788 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 312cb00d46685f2e10022205d23551c86b55c07e..2a69e3d7e04f9175ed1ad2f6b8871716e186614a 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 ec41926c0e9c638b303869e19dfb16389576b246..a4dadb03580eefb301c7ac083c8645ee88bfcfb4 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 f210220727f6f50c00669d67f9b764b7fc3dfa41..3cc4177dc22b74cbd0ab8f1e020dab3782e57535 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 e251e309f7cc95aefb073c5775e528a893d9caa0..af9a2d64cda83aa233dee4003d58e97926dbbe94 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 95057dc26e48382c1dc0cfff1859898a4c31e0fc..517d228d0bc3dfa2d54e8abedd99c5b061b95d98 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 7842da798a4f8bd4a869afe429f7510e40a65905..6c4aadf675220451366615d31a3278da007280b5 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 30f6c2b211d73805156e79a4a752acf9b6e16886..6bcaf21fd1f308448a876fe80669888fc3735f81 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 7e3a8557bce85248d328d28b15a4ea3435a9046a..09366b1fa492a2bb50db52a7c4d1a88742f34a70 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 a5344beda3d40057ffb96f56d1691a285fd0e758..8c726b20ac45a5dca8495d3bd315984791fdd793 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 -->
diff --git a/piwik.js b/piwik.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1b51739205f2d7107ed6861e1c438a5b9af64745 100644
--- a/piwik.js
+++ b/piwik.js
@@ -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 e499a706b79a79ad041df8dd5a7d41618bfbf827..fd22791a2c57572f2361b2c7dc161d806a7ced3b 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -151,6 +151,20 @@ class API extends \Piwik\Plugin\API
$isAuthenticatedWithViewAccess = Piwik::isUserHasViewAccess($idSites) && !Piwik::isUserIsAnonymous();
+ $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'),
@@ -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 0020ecf1c4cd897ab03371767b0ad57e771eea8c..b01c686ac0432ad6c5f142aaa553779ac2e70a9f 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 e174d3e4a42f0fdf1a1795b28271b9097fc664a1..418ef4a30a1e8da055ab4b49e78414ee0ba76fc7 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 8804fabe0d0d55de3931951f9c0a05a64d916354..e9ce436b75a4ecf978b907c6e8fb1a421b6447f0 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 49e5ab193d36c098ae8b52b2fbcf598e4b646282..4c07889cd43bfc9a31e57fe5299a4254501401d7 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 7a36ada7caafeab65db899e540b23964b71cd2b9..0319b5aa8a176e3c2f472e2223cea4f8a3e0ac53 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 58e6c906a3519a27005e8376ebbcabd0cc5cfff0..f47d056517ae85dbb98b3e9c9e8d1b7df11a17de 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 a150e944c626f2b423ec1b1f92bb15c137a6f7ef..6b672d07e8bc0ecc4c14856bbf0756b8b3848818 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 368a470fff5cd9e6ebc73214cacf9ed05fb162a3..7926ff9cf58dd1e91639153126d857c3d2f1209b 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 ff0bbcccbf45a66bd6299c9f0252a4b78eb59ac6..ca13edcb5b7641ce66840bba16606d436aec5e35 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 e86484f3c0c2c49bf42c995942478a3b5eff3cfa..98153e42d2033611acbe05e98d12941d9af4a246 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 08915a2e10773a1331b7a1c0fb0fee666433ea5d..dcf244d77db2402ffc1738f93a0959384c972ffb 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 0000000000000000000000000000000000000000..35d96917066870442cb72e8cbc1e2952af41c741
--- /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 1dddca9b6545ef1f8854891c40d1f165e2a1ca85..2c78036be205a78dd67d86ce739f16e4a9c15435 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 16868d3f98e41907a435b66e96d0fb8d40f2132b..4ba2607c1408bbbe94dfcbf80aa8970a7c478ad2 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 7cb2c952e72c9cd6ad30614844836396a427a8b3..c976f2ad3a93681ef0ad271ab79fb51d5689d89e 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 d84140b1d81488a7d73afa436c99818d3a3e1094..7f560fd9f572ed0cd3582656e833436913224587 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 96caf85b30fee20287d6642fa1716b222c89e4bf..0c3b5695700894db0d8bffc213761fca2cbe3b60 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 ab06504d239dce5eaa54ef0cc5f0707980525b4c..64de484c76b6a3380171b0be1417ed4ba9a99ef2 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 b9238fd15856d6d679e77fc681ee9717575e3348..3b876131cf09e1e1c584eb720467cb46a875efe8 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 cd056720d5b3a59066b266bb06633563a72f6b1a..8279afcc73f7e5a9a22ef328bde94f3414c4b67c 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 f9607c1d894dc030cf47a1959e344368f9ee88d0..accf6c7ef9608e155baff87e5cc436efb689e286 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 d67d348c9239273d264ff245a24e76fb14cabe88..8c057ed06f522d5ea57f930a9ee9a571a8fdc6ba 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 6a92dbd5117cf6e1165394a742f02536f27f4126..576d0cf93b83fafdb3c6768da48a0207a1800103 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 fa35c9e49955615eaea6b46bbe59f62dac5b5459..7d78145a07d1c19983d8128dc206b9eb6d9755bc 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 85549628700da8eebf82c692c4a1201de3b75272..6e2aa2f92321d36c06dd6ca1a9a5f0294b92f06b 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 b3e8a5f6fac867a41f5889b72cf2e9ab808bbeba..dbb1942d2a5dadeaace2590d90d49fadd421aa61 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 9f310989465520d7075c2f4036b5f410661ec66f..2ccd5a9e0104089c600cdd53ffb3e06b7b646d69 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 a0f868288174e2d3022e795a21ce82983c0b48de..50d4981bb264257bc5303604cb9f977bbd84bf33 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
index c467c059942e0c4331e79d547c4e3acb4bbd0fa1..643984c1bab2bc48f120e3cb83fac39b270d9481 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit c467c059942e0c4331e79d547c4e3acb4bbd0fa1
+Subproject commit 643984c1bab2bc48f120e3cb83fac39b270d9481
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 8747fe2b5c6ff754335a21c5b9a013918214f7fd..ca0c9fc4d54b5b4b01e69f4205f8410662f96351 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 463462262e435c0673febea7b69ddb72f76eebc5..5d1eec57507d238d3a68a7b4c05d6f8283187442 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 463462262e435c0673febea7b69ddb72f76eebc5..5d1eec57507d238d3a68a7b4c05d6f8283187442 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 50f7b8a047a19d3ee0ca8f4ffaa7d25171aaba48..a52b9bd2fd6b843cfae192bfeeb637c9d6bfed53 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 a74efdea5c75440af443ec5b669dad4fbd1b93d9..d6504b9f1fe9ea74e23d86eebc61f81ea9882460 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 2549021fc748a2ae5ca2334160404fb36e2cc6f0..2ee0521623026145354bf34dc2f47ac26be6545c 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 deac55f05bae22dfd217064cc2b75a32017c1837..bbca664ea2c12d3adeec25d1e3bf8214923e7257 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 e37c62e75f93894645e96242ba374ca4fedbe82d..797f9886249814b39b279cda157105e5f07f309c 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 381ca725d2d5de9e916163bc891400e06ea40b3e..a15d7cac58a001f430356d318b9f8287e25ea858 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 01c60cabe6490b8b7ee96964a628cc243201e900..440a35978e1f9160686b289cf0f73ea6b3f22964 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 a71de29afd596e0920ee671fb533d2e236e8ce23..24c823ac96de7e30a1afd6eaaa4e65caa8a2c815 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 c0dac419b0e59435e72415db189248e235946bc8..61d63e59c4ea3ca132137787d4e9770d268cea32 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 4a2c3507b934a5d6e189843cf83555d44dc696f9..a496e40ed91b0f2c0a3ed131bd0e124453977b25 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 2a3ed266f2dcb15e3b71f3e54a1c60607a6c02a6..3fd347aee1cab817173aaab73487ac3f27128916 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 b6328199ce3acb4b815fecdc30052d283c8ed4e3..d3b8257e4d93df14e943058b34679f866b938dd9 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 d8c940d0fcd2ae8226f851b6c05a143fa08462c6..c322e32785c692b3ec289926b533b44220ca1528 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 dafbedb6e4de4195ef212522799a030da16325c9..d077554ef812d1fce26ba5dceb899d6f212cb48e 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 8b5f1bcfea3cbe59010b73c3a9c6e6c1f69893a7..66a0b7041a2f42fce7fd2b577679e8ec1cb7324b 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 aa1156bc520f0986ede76542ea39d19a485c4082..acfd55dab1c5f0184ee680ef7419b9d9cddcdd12 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 f1cf4788c10c2da8b1643ae860a3bda7b85b9de4..10e558ad3dc27e15a05c4e8519e90e9cc6056932 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 62608d8729faed191c5deb41cc48f2ec8acbcb4a..46b394b06783398cf02aa02640d71f1b6f356ecf 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 a712c6c39a66afbdb7466d1dcb5450da21eae814..71ba5995ba408c58685692eb1d0cd80cf8adaf03 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 b23e697dffb8f9941b87e7cddea8499a7e6ef420..d9aeeabe677d7925db7cdb155953296d949c3342 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 0000000000000000000000000000000000000000..cf80b66decca547c8ff8491050eade3ed67a1660
--- /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 7ae25c8d79fe4888089a4a549b41fa69b4212ce1..fd57fab75cc088d7db59ca3cea3eaf3a27e14e8a 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 56ea3eb2d2dcd298e772e744945ada5bd2f73a5f..0d0b5389521626c1a1610f4a0d5b3f407cd05aac 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 1b53892a941a67e013256aaf30ea36f39831ca08..a51250d944852fc8c86e7303857e2ca0ba390137 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 c868f3b1a39fcb0ad91f7f653b83c6ac0ff7546e..b8dc955a53d1c3bba14cdbfc55bf1d508414d601 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 0000000000000000000000000000000000000000..ab8dbb51d8aaeae02348223b37b180dc62bbe28c
--- /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 b18dedf5987b9fabdc80020953a5961e6c1ff7d3..c2acabb6191fa4f025550919ae0497b9459d890f 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 b03d37e650ae652a659efbadb0396077965db806..d9bb556efdfa11b740c3625cb3633f22f0f4c528 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 539045b8f7f51ac26af7b2720f2632ee797ade12..90799cd357cee3ec43c67fa4384b8336896b6297 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 6ea54bcf09bfeeee9663e92038558436f8f99be3..6b6a0328cee75379d259e86d764c2b869c8c61e2 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 f4389cdd29f4c9bb3cf4ff960813c7198f787025..17b762f6033b49e1bd6b461753bcb4b091c9ce96 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 a165112f50f0ff45463d44a4fa7c97f2598301d9..b37949e7eafb1d2eaaaf5ad8a1728a9c356f6145 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 aa378a6ccd0474e75b8c4816c4cdb201b1fdb380..9206c5ac51df5f504b27e85cd33c4c56ee96a928 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 afeac813a128ec35cd5eb4cd6d6dae6b7f109df3..9e68dde96b7fb247d4df6fc7b59c6c93691595b5 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 4dea3c329d46ec38fc107a2a054817740cfffc3f..e810e997449663a654d421138f678296d302d445 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 0019a1ad582084e0a86cd52b2ff669bbfc251b52..c9212971e271fffc87f4cacc6802d4e18cb52432 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 3c7eef2b2b78de9daf8f1e35abe18e7fc9bc6a3c..53743c3aa04e0fe09a7d26f343b9024b336ebf92 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 98581d9ac5b63d0f5864c09adbc86c1d19d229a8..84a459deb365061df2aaa973c53b553d8562a0c8 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 488f39d00c12fea5cd3cbce384e40d5c78e62f0a..344e6d0311e1c11c638ffdbb75f2b9a437f19555 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 0cbee0d89b337de0fb72971f285e08b4f0508e86..5059cfc09dc2094a71a0bc4ce7d2763506ae5d8c 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 f238b2adc24193da451a93b7012f709dd2301f71..35b6f5a793a52f8d6dbcb96f8de5f312702b29a7 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 5eee77622c53b5b5f60b9d50ca8614450694336e..33c7aa55a2c29a472600d1b2a9f08e6770d2dc03 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 c5b1da168767be7e16c62925de15add27e476026..b96cc7beedd78e22293cca7729fd3e35514c5c6d 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 12f2d404b441e5354031db78bebc8afbc181c286..f5a1a6dd3cb1cfe037e7b5816ceadc02bce6c4d7 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 26286810fad474d79bfc05c26904849da80e1d6f..e683cb7f9ef99112086806c55de33cfbb1025aa5 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 60768d7c2f8c8901de100cf8e80c8ae65ecd401e..835ae15f785b17ed0ea3354fa1472f2672c8a72b 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 26aafad2ad121845adf898676474a1fd0ebd524d..6c0111ff235101b6a0d460b61a6ad6ca40cd3474 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 301fe44a504ee4799ecf24b5d8997d9543eab91e..98b752cc2aea949b899861a508e092767514c94c 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 a79cc0be24da337343020d13edbb6bf97557d995..bd957c54c011dd57278fd0426beade837b968f8e 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 bb58caa29762c6cf20eeb6ff443569669d46582c..4e88d2191f12803d74d538374c1e1fd84a88473b 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 999b0d41bbfb8438a31a8475b6e090842f077958..a3f03751d84d64f5d10d823f80f3b0762b51636e 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 ab96ba4e09752f1c2b35c169c8117a10758bb355..f7f27d94e0065e96e28cca4683267ee54ca91b14 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 89c8a314bf379ba560bee201555f06c77072e190..1d1b2275d84be85b518f9e652457eea502409fd7 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 017690f442727b1e49e6c29a68742b350dabd796..3f4d1b02adf3f97a871bc04c6b773f3cdc1fc151 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 3785e7492e34d44d980f12de43790a6460153a88..52e20800f688ad39fc4d5728f0e26d052cc9b8e3 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 41e259a618b1ec1aa38a5425e2ef0671f5b46c22..9305ab23fabb4a946e1c78a18365d64ada5ba81f 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 db4bd145a55cb59e3e93cdab1b43e071f494745d..37cc8685b74af1b0316ea6b39161f92ae74d79cc 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 13eaf491505bb0d25c0d9652a57b51d0d427565b..b25ea22011cc6a045ae50626af4784804873ef75 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 fa32a8f9b7940ee968e19da319e75dd9e08f6632..88108e3f4d37bb61155895e787c5baab9a4aa0da 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 5b442e5e09a5b11911d4ae30f8e776d478d3950c..c194ea20fba1dd2ea3fab0b829400942895bbd89 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
new file mode 100644
index 0000000000000000000000000000000000000000..76ffe2158730d09a625fd89ec6326fb72b6b3cc1
Binary files /dev/null and b/plugins/UserSettings/images/os/W81.gif differ
diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json
index fa87ec92e98c025e23e0562e3c473b415672a751..791f7e8f51db1e29656fd61cbfb8acf7e13d0f9b 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 494d09542c2ef21a518af4bee6f04abfc4c52843..8335d97305c1fcd09fa189a1e821450db2b16a80 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 cd5cd32e9b1ea3b47869083bb1e8f7e39cd47844..6761bde40ebb94265394a6e64877f8da328ca53f 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 8759cf751d8202cc485e445e1d24fb94ef915e90..e858bd2f765959b22f28da543a1110b9d8826eb1 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 db221a4eda3025014b37250964eb8255460d132c..ffa3a5b015d1290584913765cc670ce4ad4ebae9 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 e89113eed2c932dd4aba4e9e900a4f5e47ff8d81..8012de8f50f38b71b17110c3de56ca3516721a8e 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 1919fd325b536f5146b5243de05ef805f00e2d69..903b2477cf5ecd203bd04b080cedc0f4d55223d5 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 926967875a839f25855ec31c61c4580b4269af8e..82a21f1cc920c09695f21126d5a82024664e48c5 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 d4cd9aa258f2cc3727cb5de52be7c977e55c8bdc..6c191f1c2b7eda976f527448cf7c1fda580a0ca8 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 24c5ad4a74c96ed7ee78f3d0f5caff3cc085aa46..fd58642ad24ff5ba08d4c6bb03433a19c0a47b84 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 954df309e5fa571ca71928c9f2047e07ba54b429..f796faf57e1bc1b8d264b573849b64b346ef2225 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 0000000000000000000000000000000000000000..d221d07b5604ea6eaa497e8a89d18d176b423296
--- /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 0000000000000000000000000000000000000000..e941f5c672671c13a7b0c5cf27bc514579dbe0a2
--- /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 46243ef3406732cc7b891ff898769ea1695440d0..afa0a6a4bcc81b70ea5709503db5dd376342bf07 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 ce496684ba0c40f0fb6a31953fc1d9fd2557153a..47bbddb2d26e63383f28e7e026be79978b122b91 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 dfa6cbdb7a6c083abce3611b3b2a2e75910c7525..d85efcc2cecfbb24569a4c284e4726b187396e9c 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 735905b0528c1bd963732f9bf2853ec3a2e522b8..76ae1aa521f5fd4ac7433683db66bc5be8b59b53 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 8d895228b4309b98720f42141b6fe97c4a3e837f..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..30accf676deff468e75d529384866484ed890cfc
--- /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 c6d131b06181cd2c5090aec2bd27fecfe17de5a2..2d7620f4fe3ce9e4ccf0097632c951baf8eb0fb3 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 0000000000000000000000000000000000000000..267e848fdee6aa79de81648ffde2b2aed9f72906
--- /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 ecb778f536396f72b0691b767a88e0958f15b9e8..a2dfab24d432d3b82483b0af63109d47da3fed2a 100644
--- a/tests/PHPUnit/Impl/ApiTestConfig.php
+++ b/tests/PHPUnit/Impl/ApiTestConfig.php
@@ -176,13 +176,21 @@ 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
*/
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.
*
diff --git a/tests/PHPUnit/Impl/TestRequestResponse.php b/tests/PHPUnit/Impl/TestRequestResponse.php
index 9ce1a3da76c509c10d58df0e25a5cd66a1ae3bda..1f4bae3ebb0532b03eec393b464be313379c1a85 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 a24c50787710857b076c8b4aa1aa296a1af291ea..8e68ab66102f6e13e04c9d2125db0499f471fcd8 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 ebf606de72dffac7caebd5b338bac33ef35851f8..3ec353b2f29bb793adb4eb0d84ff0b314232340a 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 495a76ef0c499f8358ab106869f3afb2a6499e4e..084f42203550f30d26215e60164efe28cd215ac6 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 0000000000000000000000000000000000000000..06c366dbe52f23f72f77b62f7ad8455ccf399daa
--- /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 af0fd8de446284b0c0c226fcade7847a736b02f6..d8b211e6f9dcdb4d954c9bb2b910a109ae559ecf 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 86885f513d860b188161bccf805803548c3ae47b..0000000000000000000000000000000000000000
--- 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 50c76d3a16f858272db39d7fef805af9ba658ce7..e2328fbc2a4c9a025989c7281899be56aac08784 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 0000000000000000000000000000000000000000..0b140f33605aaa11e5e055e0a23476a00a002f98
--- /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 a8bd83cb5327e155c1383fe7f201b67cec1a54ff..afc6e909b1137d67b0bc6ba249b68405aba3ee56 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 8a974cdd1ac87034852189dfc2b45083b7572f75..72b3d94c431bd967a2dbf8339ebd0f033912418a 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 7ed2e76aebf1470fd0d821d9c974c715f12a8b6a..0482fd7e5bdc22db7ee7f5df91b82c864402ccaf 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 dc24b730740612a51de39cdaf986036097d19d9b..1c7f2179e5ae80abb3710f64976aa31d817f256a 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 247d5fbf7abce6c47d0a238f155d85f648889430..6f772e2ef7accedef09e8dab5a61b3348b4aa331 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,48 +845,29 @@
<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>
- <referrerType>direct</referrerType>
- <referrerTypeName>Direct Entry</referrerTypeName>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
<referrerKeyword />
<referrerKeywordPosition />
@@ -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,26 +1318,47 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
-
-
-
-
-
- </row>
- <row>
- <idSite>1</idSite>
- <idVisit>9</idVisit>
+ <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>
+
+
+
+
+
+ </row>
+ <row>
+ <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,26 +1721,39 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
-
-
-
-
-
- </row>
- <row>
- <idSite>1</idSite>
- <idVisit>7</idVisit>
- <visitIp>1.2.4.3</visitIp>
-
- <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>
+ <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>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>7</idVisit>
+ <visitIp>1.2.4.3</visitIp>
+ <userId />
+
<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,26 +2119,47 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
-
-
-
-
-
- </row>
- <row>
- <idSite>1</idSite>
- <idVisit>28</idVisit>
- <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp>
-
- <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>
+ <deviceType>Desktop</deviceType>
<events>1</events>
- <actions>3</actions>
+ <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>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>28</idVisit>
+ <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp>
+ <userId />
+
<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>
- <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>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>100</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
+ <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,20 +4293,48 @@
<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>
<pluginsIcons>
<row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
+ <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+ <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>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
+ <customVariableName5>Cvar 5 name</customVariableName5>
+ <customVariableValue5>Cvar5 value is 0</customVariableValue5>
</row>
- </pluginsIcons>
+ </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 f52326b337dbad87391ed9c53263c53339f55895..5d07770e4ef0bcb20ddf062d1525342947c48868 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_ImportLogs__ExamplePlugin.getExampleReport.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
similarity index 58%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport.xml
rename to tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
index 1b2fed39f94f82c0d89b43af6f12711f7adb5860..381e1be3afb5f0e4bd9e9fae2a0b0d6f727d30b5 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport.xml
+++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <nb_visits>5</nb_visits>
- </row>
+ <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 0000000000000000000000000000000000000000..dfa3a2062361e1f2127a84e9e33202e73a513ee2
--- /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 8a4e8dcb1e40b5a0e6546a52373d755195f4eb00..e21f421867989e4ff422b9e7854e0a5ca9dfe9b5 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 eb4e37fdf7072fe332af6b247514a276d3b240e8..3633fe591455905c0e862657698625d9b314bc0e 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 e31e52b1e027c3d4e6323712dd52863cd9aebbee..3c62d797389e7ebeff217e1d26dfb79806aa887d 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 e31e52b1e027c3d4e6323712dd52863cd9aebbee..3c62d797389e7ebeff217e1d26dfb79806aa887d 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 196edba8813cc1f88357d6c59e58018572af4703..b8e30312d73a3ed5db1a8226f3f7214e8661f680 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 bc702c076d5b59a1d9a0edeb4f0747b2e455cb56..c7ea96791bc854572f12d5cbc704bb342c4a8cd2 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 f2edb4066bc83cdfc1742445e815b4f1f0f23a18..2c3fb6b0cdcb960b25c0fe5e264cc08bdd9c8fca 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 f2edb4066bc83cdfc1742445e815b4f1f0f23a18..2c3fb6b0cdcb960b25c0fe5e264cc08bdd9c8fca 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 1369014c2fd406049e6e3ff318580b5175410779..8826b0f72bc290e01738623c5b4d7ba25de99ac0 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 42db8174ef002db64da13803a41a94435427620f..671c9615bd27ed976953556f14871b31eddd3c48 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 02f5d5a97f7f0b42365f396b0f953cc443f4e7f3..d2777a6618ca70dcfc83e04faea1a7d1991f1761 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 d8411b0f399bb2249c03d419d59a95e961867cd4..4900d9f74261040ea9cb5722f5cd8dfc534a27c0 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 c8cf2933a20107bffaeda652cf02e3e2557fb3bf..736a970a106397a275e9bdb550175aa82b24273e 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 445c00fe4aa9df4d05068e1ac1fdbbdc9e25fd20..82839291880676fd8bb111fb5e9a8d8356a242f8 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 09ce9b347f3a09df55a34a963716ca59a4a61bfa..4f81f5481bea9aeeb2e98a36379243df16f93fdb 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 e6c1c07cf88aeaaccdf2d41c328761f405b9ade1..e529cdbeb21b71ed2a99d1f81ed7d250c14d3534 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 943d4ca75da8b582dc7ae1affdfff2156f3fef71..39cb245795557bafc81c22e1a6b9cb6e606e90cc 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 524f43508d0bc05d68d02c68966eec283d8dddd3..75403098201cb3ed1952027390bb1460fcae9f45 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__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 28929d67eeadee631fb92ed4566141ef45f65ddb..2ff757424d95aa5833a554cfb110a59f1e10d694 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 3ac22f787ed69ecf36b7b0f280af6266ef84c5eb..c4cf4f317983d4f5b08d7a534741a274c116312b 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 c4568e070268cc9a4c0fdeca1cd443a053f320d2..1c43453213145239d5bcabe1eba4b439babd2ba3 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 c580231b96ab342cc318dea3682da50a136960bd..8579d3283a6de5745b9e4208776e371d4876178c 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 51a1e169f8dbfa5459beb3d4e7ece3e40033851e..74a22451ad379ef8693bf957e726f05e29b8a92c 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 267e90de6f999661be24ec170d090798610993b4..9567fc2f237aa665391d54e083af2f1511cab3a2 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 bb4a48d22d4909b86e4b6126840b98fc6e1e3d28..ff0a9a67d6f3b286bc136ff8b82be3dead7dee67 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 eb13f78f0f53f522ab3734eae336392fcac996b1..9e0087debc9afa8f8944488b303efe1e6b50998a 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 c4c562795c0cda54978ff34c58f02d2906184e4d..a6ac17fd67c1c9ba741243fe4b07caba0760285e 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 7ecb163f8708d11fd4ed60ab9808e6b2ddf18d01..f3ad2531895429d64f2a5d7c293e94163b9a22e2 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 dfada1bb899d23c6a1e800d4df2a564557322957..6e001181910976c186ce2bf07f5a3d572b6a5eca 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 95f3291088ddc158d63cefaf4a08c5a4511e8124..81101cc38158a7e500c3f4727a9416078103e5b8 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 e02a1136d9d768d70e3280d552ffd11f208a2146..f9654c1a34a2dac59b724a241951c146bd1439e0 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 fd38898a64495c2b751e9869fe2e78f95d20acf1..e08122bf126681b069d827e0ff998f5e4b50ac7a 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 ba10c9516f12c803c865d05d7409be6075c47f0a..493d6eb7dbfb3a457c77e361ccda9a58a529fd88 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 17ff53a386456bb1526b22e5c7e82b37fa663b84..8f4652178c7a5ac717783deba6d18e1a3b76d1f1 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 108d617d79be06f27137f172f1e4c0d488793c94..d64c5f8f98d9707e3219904d7b574d9065024e19 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 2ba37987cc163191f4887b20c97780662aae4226..ffd5d0c1621fb24a8bb0b90423d97f5ca193f9a5 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 685578ed4467e4895f8b61a4f75414d7b302599c..23755c4486939d3c0f3497a2b83966522292b21b 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 eb4e37fdf7072fe332af6b247514a276d3b240e8..f4ff4bbd78ce9b479dd661cbd7676257a0f1b569 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 4dd0cef2d8e9d04c8cd0605012d22c8072a93fb8..1c2689d1744480f13ac8f9c393478c60e0055f90 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 5c585c10cc69270a6791b970e88f23c941fcc8e2..580a24928fe2fdc4d3c739a189fc12de2aeb0895 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 f22c86518721247bfd8a14c738643e71f6a76a24..5bc568ab817cac6cb482f5e258f984edb411828a 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_myConversionSegmentName__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
similarity index 68%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_myConversionSegmentName__API.getSuggestedValuesForSegment.xml
rename to tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index c234bed59e963e268d7a9bc05348d941758c4aa9..606fbb524182170284d7f1baad7fce4697d9b8b3 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_myConversionSegmentName__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 4c5729d4b1bc30b7d2c8fd12236134334d588095..2e8021bebdde7af61f5de2b0d2d68e0c7069cc18 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 722d5f8dd4a76164cd4e3d71094837cfe5d706d6..00ebb388f0f6b2f4e5870a46039555dcd2c18bbf 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 8a58d46ddf4777c6e3abb4b91c3a36b14dad9d47..28fbf3b98b00e2047d3be55cc2f8abb9e37da145 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 b6a5e2a7b637537b87dac82cba7fb9b2ffe5b41d..7f7be6d377f5e7a486a87874fb1fdec82a9f4216 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 c0b532302171bbdf2abee2c2230695f427603be7..d24401b6dce883c9c3848fc9cc678221ca0585a2 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 b4e2e7a9c311666f6dcd593a8f4be8ccb32e23fc..47d78e80e83adf8112a4d86037007aefdf791f17 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 c0b532302171bbdf2abee2c2230695f427603be7..d24401b6dce883c9c3848fc9cc678221ca0585a2 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 fd6f7e364aa8e42d37cc833a292bf61181c0d36e..0d104ef874f4b6e19cf5a674a81e0a72ce9b0768 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 5c1fe5cdf0f8b9d34be59cccde9a235373a4f364..7a27573cee62b04aeedd121c2aa90b36411ac346 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 6807a5c527a5546291aa1ff38f92864be3aeb61f..ff0c032056c330cf0f1c6b4a7057cf429f4e3a96 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 a68d4ccd42c96a92cf8370b49052e123f48ce150..7a4e15a2ce0b8afa4a794f2ea5cdb880b3cf90ab 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 673b48b95bb15f39f5205673b9fa1912596382c5..b0ff278d859d111c772d37f94e0f0aaf54afb5b7 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 acd4f8322ad05a60d6d531c1f6822f567495a8f7..0e4bd32e997a5d059b8ca938022abe792fa4f986 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 5049eed2f75e412b2fcd91a1464b1acfbb5f607a..8c500c205d121bc85674ee71785e28a878f0dd64 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 27a7669435cb604ae7a00f728baaee27b03bb82b..64a6c81f5abaae2e2e155b7386b105f70c43561b 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 1b75304ffa7bd9c7b14e1f2c05ad58ff7fe45621..7a5f4e14d5a821520b8064f3eb3960e4aac4e2a9 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 046e4901c5ba14a477dd148400090d4e56b8996b..58c9998d630a5add8688ba6b1a07c864c2d6d174 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 e44fad36951328b36adf7a25e8d21a39a4fa186d..cd90855e1fbee969a1da530758cb7200943e1cfe 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 4a9bfdd20d1007b0b2876ab87d43aac054816294..d94f907eaf56b1b5bbdb3d463d8a6ca3be0edbb4 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 89c4e826f3f20719ba39931f7b33b9bfd61a2098..a0f1d322a8ca5f6f8f4c4e1e0b00395c9dad8d2c 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 119f5b856f5d392bbd62e437822b882dc67c418f..629e6593971f5454e466c338647e995e343e3b71 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 d2f9d91476a6b3f40e44504f1368bc0afe7dc189..5f4e93831d752683e7c9616099e3c29f977c5275 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 591c729af68de170914589e27c073b930dd8d17b..4e05e6e6cb5d0e6759b2c4421680fd66f48ac99b 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 8b8abcc028540f5c73a42edf51501041949f3785..02920d53d37b444c6a3feee1928e62e44163779a 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 5f74e6000c9682ccfdb00b5ce380026f5e653fd2..43b33f1cb5d55f322d852d8c966fa7e5f164deaa 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 5386b282321f60f9d37ccf7e4ebc40ef3cf0b5da..70a94cb5a59eb7e188457895369cabf035f17f45 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 0000000000000000000000000000000000000000..428508cf56103048dc29d73058e1f91b39381cd5
--- /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 0000000000000000000000000000000000000000..428508cf56103048dc29d73058e1f91b39381cd5
--- /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 0052f0580dc8bce87a68de7078256f0ebf4e68dd..4581cf832fc075c3346333a90457d593580b2d09 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 6f5b9fe0780d74e7c40843ea68ef32766bddf6df..e8e90f91e7669945637ad756e334fb937cb4cffa 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_achievementPoints__API.getSuggestedValuesForSegment.xml
rename to 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 0b49fa51d75d44856ab3dce323212bc2cd298f80..b1bda4835226c21bba355f56f70c9ea48d6861d2 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 e4958e50c5adecac4e4a69a5d3634435611eac4c..c4d0257c6a2900e88b8632d2628606117ce3df54 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
index 47e5c412527561c20448a4dc33ac2ccdec3b3f95..e9e178c6a132a240689f65537ffde5ef9b4c4cc5 100644
Binary files a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ
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 c234bed59e963e268d7a9bc05348d941758c4aa9..606fbb524182170284d7f1baad7fce4697d9b8b3 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 9f4dbd2d9a3cc170d0f92a7d881f0aa3227aa644..2227e7a996aab60f17255ee7d2d8e7b76fb51ca3 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 73d2f07fecd6e5e03954e88af2f1af9561243081..97cb7d23db9e52e9571343397972acd3d63ad4bb 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 8d24e97834f6bf91cca6dae1fb482e554d4de8a4..70de8b96795410dada329f2e6372f8faea8d0eee 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 b162b886a6d4b691a0f66f81039057a6128920ba..b497f3fa20a558420aacc48419c1ccf3a1a7bcae 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 e5e6ad0926e2e3afcdf3b59298c546dedf80e7f7..014a276cc464f143cf3884ff5aa72d27dcea6d52 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 0a1fcddfa8bc4131712a2e84287d8312bd7b1410..a18003c1f31f6e1c8c00b939e3b8b2e86b5102f6 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 8a34da6debab163cf95ce50ac6e663970e236b27..7f91b2b37b78b9525bf645ba23c2a60625d956d9 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 53c5121fc89d49c402dd6037f7b464791e5deee7..51a5d05c3f57b70d3b71ce7684a85f0e2a5a7f2a 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 4de55a5ecd54d9eb2018a2e32342e659800792c7..407bf5650680dcac16106c5e0f1a0e8422e97964 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 e35ca641ed00afffdb18c635e5b76cc6da16210d..19d159d081c426de93beea4dddbe7a53a0108f93 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 06f10725ef4515c1043f8d52cee39eb4b2166d89..f2a83be0dbcd1ed5d978388d82366c3c2132140b 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 8698ce8960da90cf1019df2ec597e98e0a5c721d..028d2a9e2b3a3d82e27f663ee8483acf273e9cbc 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 069f5b4dac8d04c9f7abac09d6810c7baf221989..adb035d3e151f58e4b6d5f951f93b9d43b27b645 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 5fb2fd41a1ff9aca7ef544724b0e0591ad57f978..2d114c7779fc80872427e204ab08ce720dafbca8 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 da6bc517d243eb708b76c050e5001954c7c31f61..cf862f146b21d109a5e90d1c505e6f4ecd3b6e33 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 e85da560ae557c774a52a85d12805787aca00d92..b13da65ae2c517ff2cdba865e637841ff36b2d70 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 f17d8430c73929feebb16f64542f2184567231ff..3ffbdbfb40c4b9e45ef41a09076623d8eacee245 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 5d605d853eaa06dfd0d1943a94336737f40c3495..38f341f90badd2a005be0f2ded6570ef40d97b07 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 c9f66c8db68d88825dedda0720ff725ff97cda5e..a57ea4981d656323db454767185371902b48e9c9 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 b895a618049e9270fd73c26d99da72a73c614e71..18f14ab3678dcef64ca47fbee0cccbb6c2a2da0b 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 9cecc447c96ef767b1e641c4ab6942026e96b331..dea4d70860052cd4df6cffaa3278a9668007ff97 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 c8f6ef32b434957191d90d9284a9a46cd3be54a3..5e27b0a21f62639abdb18d1f67eebd6e5ed889d5 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 eb4e37fdf7072fe332af6b247514a276d3b240e8..f4ff4bbd78ce9b479dd661cbd7676257a0f1b569 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 7b035b01889ba7f9cd6bff712e55d9d4f77a7357..9832b1f75ed21a89345f24e1ca2169503085ce3f 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 d3a8c80707fff8b9e3a41e95730f43bd32399197..fac7a12b01fb65db3affedaa2d5589b9ea272dcb 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 40e23760557b0448d05cfb97fff72c9213b70059..ec3e7fc1d8481b793f04418d63aafe9a027bdfdd 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_keywords__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
similarity index 68%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_keywords__API.getSuggestedValuesForSegment.xml
rename to tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
index c234bed59e963e268d7a9bc05348d941758c4aa9..606fbb524182170284d7f1baad7fce4697d9b8b3 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_keywords__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 368da87f682758e4e91d1031c708a3882cfbbc8e..b352427be86eaf79e33fa25d7e5cb46e1cdfe4e2 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 4d6615ab1132eda8f85e5756ed8649c2330c249b..8c453baeb10329145f6020d42d40274e0f29f27f 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 0e713de68a32494588a830cddea55f98e2df4292..a9ba35c127c1fdfc01f1a429444c3fed5c1bf6ac 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 c0a8e14b12e1f06668f45179e36c99d9af2f4a01..2e6fdfc3cd83a426102f0ad4a37b12048c8b3ee8 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 97c4e0bb0162b6327154b828bf36d245f5bbced6..0135b49bd22ffa3765dff853ef0560fb743a9cc0 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 48dc624b7e5b2f73007306b529a49040a9fc32a2..299668e942c58cedadc2eab9a7ff1f318320ee5c 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 3f3379340bee26b3cb35c62691f4ab9fc3bc82b7..ef8d988f899b6ef911f7e2435eabddc206922f2b 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 fe991619f501ee507cb54f9adf6e5091d93734ce..7295efb5180c2033a4ad7e8c922a050cb14140cb 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 222e0547340a258ffb42f35953c475d4ef965c2b..b0534b1fd12ab626883aaeac33cd2c8229ba28b6 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 5c530bdadda461360cbf321de2ecb8748333a373..be6412244a2f7a4cf7518a9cf8f3396c815b7dc8 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 b9a56dc03a5fe9d38df3680e4a280dd0f7ca25b4..86026aff84e64112d35835a4f4f2802c57b4e023 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 5f45a83e5cab55d440e5f2b8034d04252cb52f97..29f0426935d04b8af8901e893b147202db8cf2c5 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 0409b96f37dc6109717a1b7973be86e73f313c7b..9a1a1b9d3518a1c0bab4ce1a72ab2f1f5bc44120 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 7b26cb04217ebc0b6be46832c9f6ed8376c73101..68837cb7a6458e9ffb9aff18df9a8295729aa974 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 799dedec2a7aa349f9c1ecfd39706052496af038..0e60dac3c40cb3efa4e8235d7e8f8c00ff3a3e50 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 0667e62efb4e939a35ecd843d89c9280d8f719e0..8251015ac633687d3189a8f86fb9c51c723d0a26 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 334c6c2da51b2b30a98aa743196fe5b55ac33510..01184a360d8938644de80d4edbc71c83692c3750 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 ff0459c32e9fe555b976dc42518c3b67bf18ac63..1f6a1ab5edfff00b627aa9c4e1a65481565b5f89 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 fee4b36b1a5a14377e70ac2c4937510ef7900b7c..ba5b1f793b3f91cb91477c2885505a6c82c63063 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 1e7e2b8d0c475de69fee908e9505f4b32f641034..349f30ef0e4d123ca1215fd64fad6cc3af95457c 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 a34a4ccc8f8de21bf2b3442ed82d50dd905b3445..d2c8572231c038971595c5c0ed4ead1de409fec2 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 c63712075f5a74cf4e7fc1ecbec88933183ee2c6..3ee6705d11aea591e49cd4561f376fc0baca6ab4 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 35529b7683a61a9cce91775ce1a17d367027bc45..32b66284bedbe458384d8a08a7b9a61b9d01f775 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 722d5f8dd4a76164cd4e3d71094837cfe5d706d6..00ebb388f0f6b2f4e5870a46039555dcd2c18bbf 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 d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2..75e6622c16f978d31dc93c47b9c1a0ae3424cc4a 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 ad94ac5179cd6ee948b10a311389d9e6e5ede41d..8c4e4cfbaa2fccb7d3b6a095f8c58dd7582c70d1 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 d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2..75e6622c16f978d31dc93c47b9c1a0ae3424cc4a 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 d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2..75e6622c16f978d31dc93c47b9c1a0ae3424cc4a 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 ad94ac5179cd6ee948b10a311389d9e6e5ede41d..8c4e4cfbaa2fccb7d3b6a095f8c58dd7582c70d1 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 d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2..75e6622c16f978d31dc93c47b9c1a0ae3424cc4a 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 d7dfbaef5a120118a7c2ee23a16a8a0ea288e7a2..75e6622c16f978d31dc93c47b9c1a0ae3424cc4a 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 ad94ac5179cd6ee948b10a311389d9e6e5ede41d..8c4e4cfbaa2fccb7d3b6a095f8c58dd7582c70d1 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 7780723708da30e1b8a069f5041153c5d754f1eb..32471ac4cf1bde1c5caa02508ebdaa1c83ab013c 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 a8198d8794bb8626e60ea895a45c2ee925d90bfb..06c309c4fa9be21bae805e86422d13fe0a2bdd1f 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 59aea854d49d09ae638e9a6afcc681d109893e6f..7b96eea503f39e660a9085de18701a9f892a301c 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 ea77225478b6579ffe66aebbe85cd4440b67d82a..d1ae6ccf41f1ed97201c4affe8ad7119f4979732 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 29748bbf3bf59feea1ab52411554f157a0b83df5..9ea8e324705ed5e96375c7180c1a9f76e86ded59 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 be10275c7b70f9cc10210c8dc690834dc956a706..302e91d40ae39e9abe57307f6f36dc0d847b8def 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 2247490c2aa68cfbf0ad85b45bc431279082ce98..9c516cffbeb226ae20042395c0a983d86c8cd914 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 1e4d5d31af7bb50f1c96ba27475d782a80eec6e1..9af23aaf763596745a453553c9ae5dbd8f80f3ee 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 4a7e62a567697a99fd1b08dca7051d675a327b8f..d658a0f2f34b821ba9fb98dc23b98a2cecd1fdba 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 e20f62582a43bffaf63317cd5c9fe7fde1d47996..b5f57f52bcbd8b8eb19bb727102da06a7a363243 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 98098553d0de60389d7183a63ffc09f056914ebe..b42cd3c3994bfcff9650e45deb7c372fd771e172 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 79b7f747eeb21df28728e12183ae75ffe3d70557..95f3ad4c2166ef0d953eb5b4c4d0299780c0d205 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 492d535200a7adeaae0d40d231c086c77ec20172..a575efca949597cb2a12acc4b42cce6ba49d1218 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 d5eedfa09ea33263cdf0bbe4a12d52bc988a71fe..611a7dc7bb1b038ad80ac9df5563890283b07f29 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 266aa03a6c8a4e434d4f488722046f7cc7b1ded7..3de785f3d4a9cafb465503456b76cbdd1aaacf2d 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 de1c3b0e6ed0a707141763b5ccc6e61f4d93603b..b52e454e88d5fd340ce5657e39d524025c71ad24 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 ea7c0b1fc76360403d39a485b0f2a86123674d02..3d650861ff85203c6e1a85030a1b32ad99017c1d 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 ac95568680083582dbc30c9ce94935d7139cd991..c5f8e144d31f6206d1a6921dba08e4631973ce86 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 03c6e6c7c64a4d437c303bd63dee368672499420..35d00c3b2ba18d8adf752b8e2a335cb9642d4781 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 875aede1c5868cce168337bf531f6abcbace026b..fddd345d3182b920115b05946329177b1027c798 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 de7a5ddf27a6edf54c8ea22b9fed6719651bad33..913ff803a3975bd653050e93212c043e4ba089ea 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 7b21303627ed6d4881375ea189bb62a7b4ad3a84..7f588733704670512653d6f62c9fd126991e24db 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 ced5798d4d41318f8e2b699f95c834dae4b90941..895ff4390d26735ea0358f09a676c3ebe113dae9 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 ae4a5d1be71ec8fa21b6b8a9f2d4555f290862b2..65935bcab0c0f5f39f9294e6cd96f3e9269e1653 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 ba5dafe7221ba3d220cfde944b2e1e96edfc8db1..2a5488bd2e2a40afb10f5debddb1436808f8e080 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 91152824286ec6c89a82063cb5629329af50a3da..adb664ab33c7ef4eaca9cb89c61f90e4d24bb649 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 f4e7a9afb537ddc306a4d33498e4cf9cbbf83e90..b3b4db5f0be4ebd2e82b8329065a1138f1ec4a19 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
@@ -418,6 +418,14 @@
</tr>
<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;">
@@ -425,7 +433,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;">
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
index 9b86222a07cc7b1a9d6e27547d30747cc73c96b7..b615d1d9a82053ddd1032a33363082b3f15328bc 100644
Binary files a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ
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 0000000000000000000000000000000000000000..ae0cf2abf90768b21e7ba546cab85edcfc9cb9c7
--- /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 0000000000000000000000000000000000000000..15ef03fb49cfea4767aa035a031e96c3b348bc93
--- /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 0000000000000000000000000000000000000000..6593897748b0236c1c06d60abaae4b84f84d2213
--- /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 0000000000000000000000000000000000000000..15ef03fb49cfea4767aa035a031e96c3b348bc93
--- /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 0000000000000000000000000000000000000000..e8e63ff5b665ebc443d3ea9a1dd654adf99bf117
--- /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 0000000000000000000000000000000000000000..07d6eee790486cebc94e8d1f358ea7d6e4a90ba5
--- /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 0000000000000000000000000000000000000000..a93adb4c504c02cad95d3f120f0ba132ac22511d
--- /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 0000000000000000000000000000000000000000..07d6eee790486cebc94e8d1f358ea7d6e4a90ba5
--- /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 0000000000000000000000000000000000000000..107fa6ae8aef2b799212ce9bb7caed9d7197bbbb
--- /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 0000000000000000000000000000000000000000..39c7de375fbd8bd0e86c77fbf3886470f8f9ffa0
--- /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 0000000000000000000000000000000000000000..a43cbc433e552caa08cd0b25bafd106da63b7fea
--- /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
similarity index 56%
rename from tests/PHPUnit/Integration/expected/test_TrackingAPI_SetVisitorId__VisitsSummary.get_day.xml
rename to tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
index 1076ef51eae5d68ce52b5ff64d3d82d2b94f5e31..969fd130e8cc92b26efb5d1ce91f4561f1fac16d 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 960470df27e39d634957dfa6942469b3cb8fcbfd..60e66443ac63c4ae71cf96f49e34b05f4df20447 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 a0bc7a3d907d5cfa7ac6c2248bfd5437c747c439..6091a91875295832a821e9e9efbee64a53bc0a1b 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 caa4caae0595407f401cfb91214586e4bc265394..f62a5823c38889712fe7b7721c849d1ed264451c 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 be23d67bf27e156ce7eb25ab0bc7874c63efdc48..49123c527d9b6ccc7f6d994d42eafbbe40e4337b 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 e8c2be194d265eeda23f6d3c39032703c23075a5..49206ac44f13f5c477f78278e8a274a14d81819b 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 c03a680ec7e19def01c2e6e3e0ddcecb8af5028c..1ad0016671e042da3b19f2412c34e5fc7d7ee1a5 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 19aefaace8f0f09044510d4f299fa93f7eb36429..5b0389fd95b54c2b9388fc44b052a5a54ac45d72 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -156,6 +156,14 @@
<segment>visitServerHour</segment>
<acceptedValues>0, 1, 2, 3, ..., 20, 21, 22, 23</acceptedValues>
</row>
+ <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>
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 71adf6224709a293d574362698b2bdca1ad38bfa..31a1a762070217830fd3009a51a14e78ab340817 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 ec25ddae7594295b221e775dabf76304aacaffa9..97a77f75d4ab687493e6aa05356ee110d0abac3c 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 ec3e001105c33385c66e8761dc1599f4cd15c192..637cd72d0106d6788f0bc34c00e314a92e75b75c 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 3da4a2d812c9df0ea9735e843887994cb1fc0682..d4c25ca5220778469796c1cd37d47559a2b0a966 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
index 1e86d73426e9ba0a475560f1597ec4bbff3a994a..eab8c16736f1ee46174a5855b3f3ef1bc62f22b4 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ
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
index 67508d138cd110530fc9eea9628d1f5842872114..b4ffde1b7527645707fab48921ecf5a530ca7ae3 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv differ
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
index 356de334f168140dad3dafdc8a77420e952d9d6e..109087d7da2511c3bcd9536e297baeaceb50db8c 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv differ
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
index 91ae853358dbf700c55f4bab48d2ac7acd521eb5..8d4d20182f01f89431ac548172e0c9423d0cec21 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv differ
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
index b9a8050f6cc1c2d9d1eb6cf9412881a81b37d929..271dfc090353a045cd99719514df54a54370b932 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv differ
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
index f3b034e10e6b3eda029307bec6985de22f1ba551..c73459c8af4a41080da6c0b933faa7d3a9463054 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv differ
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
index 9962efd45a82faccdf392d9c60bb4085fb0507d4..40134526b99ef46910f1c4982dabfe0553f6e668 100644
Binary files a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv and b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv differ
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 e971584eba2a8eef00288c845838ed62e952239d..d79b87b4123ca973210b172ba9a8abdc7df2f05c 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 12740b0394de1f3b8e13d8dadae9af2d5a76da33..fc0c7b8b98c35d312dffe8b84c6224938fe744a7 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 b8c7975d1b47513cb22fa7dfb509d3ba3ced6ecb..84fe788870730f66656eda4738bdf9db8dd08636 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 b8c7975d1b47513cb22fa7dfb509d3ba3ced6ecb..84fe788870730f66656eda4738bdf9db8dd08636 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 35529b7683a61a9cce91775ce1a17d367027bc45..32b66284bedbe458384d8a08a7b9a61b9d01f775 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 9e048c403887790b4e32568a439307219419ebd9..245838d9734c7e3320fc6a2d1ecde21c419993ae 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 0d1d5d37e6f965d668fd9d6e7acc900a6812411b..a77a67e6083073936b99a20a943b4dfa58d6e199 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 9e048c403887790b4e32568a439307219419ebd9..245838d9734c7e3320fc6a2d1ecde21c419993ae 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 324e8c4dcf878d62e2f0de82583818e10ff86c3f..37566274362b56c6ad2fa753481f20b8f427dc75 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 3dbe43a93d5dc212f14259c9398a9d13dd93f14e..fe1fab1bb1c4ebfc5c9a446d3d0af44e132861cf 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 9ebcbe3c60bd82a548aec4457f6e293d929fb405..1604ba4335e4d3eecc63355d4803cdd036ffe17a 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 540bbc601f6a0ac7e6659234e69d935578f952bc..280871867ef3567df04a5906e93bf3d347ee27ab 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 09231c17452c2f1e88057f08f2f471aa4b8dfa7e..9001fd15fe8d09198061d6958dcca81504fb812f 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 bc107c7cded6ccefae95682ced7b71e80ba61013..f2727a57352c92629ada91897f93c5e7f2c28bac 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 71006d2c5a1d185a06d4f353c83da671bf1a4a94..7c6f26cbac5514321dd570dc646a9be0e430e18b 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 e9de54454b39bb2b5e7a8ca0e97a77f5a6d25d66..7728bda23d35c758725a49ae44953842440a542d 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 b9c826a493faa58d249977782ad4fe232880764a..e8dea88fc3d281577ca5e7f69d0e21eacd292654 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 2f593b53670a9ee1d81a1733735aa0d7870cb546..5b116367a0f99a87d83db4b3a3bc123bbe6aaf2b 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 3449ad9ec8605f78cf3f9bb8a18dff37243115f0..2cbee6a96a027298535bef2bf7d04cc36eec59c0 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 478590155c5cb14a251bc0880908b0356ef1ab30..676a78493b2835008852b6b419dc55ae127c0899 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 47d2b984d2700d66509911f6f08085aa16fc4a86..247f01303866a271211356dc3b797076d9722165 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 78ca134267d3a9dfbab9b2bd9b73e890dc364d2f..499abb0186e82e1b58cf231a0d3ff659bfc29eaf 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
@@ -478,6 +478,14 @@
</tr>
<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;">
@@ -485,7 +493,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;">
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
index f7bdbe8b562e69c92408a99de586dac0ea7003fc..fbf27a0c19abe493ed3ded410078bfdc59d402af 100644
Binary files a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ
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 0000000000000000000000000000000000000000..106f23f16bb7dddc98ac7def1dd2c59d64a48127
--- /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 0000000000000000000000000000000000000000..5cfb246edc18a6da402cb45044dfaf1ad20e25bc
--- /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 1b2fed39f94f82c0d89b43af6f12711f7adb5860..0000000000000000000000000000000000000000
--- 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 5e489a599dc39f2276c33178a77cf9d670a3c7f8..c41509991615003d5680fd59886951e524fc2d53 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 0000000000000000000000000000000000000000..f5722c2b947ae81c5390b2448986be96d1bf4ff3
--- /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 35529b7683a61a9cce91775ce1a17d367027bc45..32b66284bedbe458384d8a08a7b9a61b9d01f775 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 b2f9f0c541a0a69b357e9c3dfa478c2187ea112f..6496f1c84e8f6bc9d9bb272d180e2c731f88bd93 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 38885d824a811108da101186c1f475a1b316bd74..0bbeb47f2d286d9cf7f0158eef54523fe2b8a593 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 7a5bd965312039a45caa1dad4e26c84adda28692..db9224b872a26f53e31bb66991c3843d3215e08b 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 c5070518d96b72dea9f4ae3801eee3a924d7f6d9..de63f6e83ac67bbfa722bb0682be0ac11998676f 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 af2a4113f9881f486f3f9b11c564ed7931c1c13a..97c6ffce80df89d1f46dc8452abf1a2319ac3797 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 551b2730b925409338e47f1fe3d7cbb1287921f9..f29f60a7481480dc84e853ade24bebd7ad6b4948 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 36ba343b8da3952a7b5c3dad87841c2e7baf821a..e36d8673a4b15107dc0b0ee10d3c7d7b14a8e15a 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 0f5fa963c65a381e7d43645796bba4ce54641be3..e8bbd9822cf986e19771b8a820b01bbb3ce10df1 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 a4b5bc02dd96b0a47e55a4a9f76b603126937e60..991e9a10d57f5d5ef617562c891f4eb51a74ba9d 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 2fca85f96480f9266c983b0192aa4505a6d886db..7cfdbb21e2eb72bf20cc587bc43f2b1c7788862b 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 1c0a535dc59eb50fa84c1a9404e30c4aca4a7fab..dd5070e6a6093665df17c15e1fc42e9de1c6cc01 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 3d028f8e715621106df11c1168aceecc2285b4a6..a3121fadaecf1d4888598a43e6cadcbadc57b830 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 380cb7ace9eb898dd9143b0c0fc1579efc1f3311..25c6014a6ff0998501a3164a2dea25a8af615691 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 3698d420bdf05fa25f1fa5f1609b2997437acfeb..9f75ee4f21a6f9c24f10765b928025ed03b654a8 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 5c9a95535edbeead6706a5b6b285053dbce73131..60aa118c6746f69418613abc16391fe67d0a42b2 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 6c7222bd3092b6f87d813b176c020666687f933a..b57109e0afb205593a18ef49901f9df4e2fd3cb8 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 3025935cb29807dc69e82aeaa32b81632d5127a2..eb4632bf554414a0982e6d19f1fb074035f86f33 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 fe348246211a76e75b98a04558ab5cc797d920c9..8709d29f8f976035bae56ec5f4c30fd111fcc937 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 72b45410308eefa5d83830a26f41f62c255bd0d9..83261e4e551f57549264fa3f6d69f5cafa5de648 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 e34115a022732e69bf65630e179420bad92376a5..daeaa29064f7894e5e004d75b50b0b46dc999d71 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 13688b0eeee24edd925c0141f6b445e1b5458293..7b9b2dda4db854b4c7c4c82d722d2812624c0acd 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 94ae7f5a3c19b33c7b6492af24d845ba82e3f65c..446fcc519af08aef4d4cc1575a05ea3b58b95879 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 766cc68ff2e3eafb2b9b95b7f9f5863bcf8b52b5..793827ccbb673dbdb48697bac6f91b680e5d81a2 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 3d028f8e715621106df11c1168aceecc2285b4a6..a3121fadaecf1d4888598a43e6cadcbadc57b830 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 380cb7ace9eb898dd9143b0c0fc1579efc1f3311..25c6014a6ff0998501a3164a2dea25a8af615691 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 3698d420bdf05fa25f1fa5f1609b2997437acfeb..9f75ee4f21a6f9c24f10765b928025ed03b654a8 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 5c9a95535edbeead6706a5b6b285053dbce73131..60aa118c6746f69418613abc16391fe67d0a42b2 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 6c7222bd3092b6f87d813b176c020666687f933a..b57109e0afb205593a18ef49901f9df4e2fd3cb8 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 3025935cb29807dc69e82aeaa32b81632d5127a2..eb4632bf554414a0982e6d19f1fb074035f86f33 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 fe348246211a76e75b98a04558ab5cc797d920c9..8709d29f8f976035bae56ec5f4c30fd111fcc937 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 72b45410308eefa5d83830a26f41f62c255bd0d9..83261e4e551f57549264fa3f6d69f5cafa5de648 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 e34115a022732e69bf65630e179420bad92376a5..daeaa29064f7894e5e004d75b50b0b46dc999d71 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 13688b0eeee24edd925c0141f6b445e1b5458293..7b9b2dda4db854b4c7c4c82d722d2812624c0acd 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 94ae7f5a3c19b33c7b6492af24d845ba82e3f65c..446fcc519af08aef4d4cc1575a05ea3b58b95879 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 489f5c42cacae3450eaf56b6b1d8eda4f3996563..180ffee42be67f68e53664a979ef3a455f9c3d4d 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 9c6eba0c0cb5407a27e99218e9e0e8e270cc82a4..9b4d19a4ad1d45ceebdc7263c93cf6d103afe297 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 76b20063bff495e90d0ecedd64102f3be2647a6e..9738bb1e1d88b96ae328fea9531c596c8279b524 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 77cc09b62366f3171afa6f95bf3a0e7230957e48..6b4ab5074923e6902051acdd8dac3ce67ed2c9d1 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 77cc09b62366f3171afa6f95bf3a0e7230957e48..6b4ab5074923e6902051acdd8dac3ce67ed2c9d1 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 7c63bddea356add11aceb01bf8b8af3800be737e..5d9ef3f37102941784bdcc40fdafd7a23e5a92bd 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 77cc09b62366f3171afa6f95bf3a0e7230957e48..6b4ab5074923e6902051acdd8dac3ce67ed2c9d1 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 7c63bddea356add11aceb01bf8b8af3800be737e..5d9ef3f37102941784bdcc40fdafd7a23e5a92bd 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 e9cdab83552e5a513ba869a501fbb4d55e670186..8253ae8ec8c7382da123320569f18bee2c2c5871 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 bce87d03bd8e1a93672c8a12f3a67f5534dff35d..e30a2e382d03bc43fa072e0390fdc94f33c6a07b 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 af699f57c029c2365d9fae946765be69e24f1c86..d0993ba66f8227cc1663400834d25afbf06cd582 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 af0e5b623478c50bdd3fd55395da2c042bb3b188..d1606c458260b7591b114fbb142422a5bace7bba 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 9b072bf91ef20565448c409a55b78714986d1885..6ec09ca8b4623d86a7e92b36ab737e68b46d18e8 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 adbbf67348098a04badf7cb32e1229dc48c18e69..65d9f8914401c943df90fe32e153fb07640aea1c 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 7201f53df653edd320a8c9922d714be4d0277e6f..b60c08c4068365bd79cd37b0aefaa9dc122c106b 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 fed5186aaa135d2993544aa229108a521a103c3a..2c077be5fff34168a89338723a73abac281655cf 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 15d181149326df4397458a9a9735b11c66a6feff..64436791b9fcd4f96dcb405d0334a279363082e3 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 10b78a63521fb3b680b5fde933e7054a7dff52aa..51453f002165c72aba4dc07220e274e48d232852 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 8921fee12c71b0e5b02446c5b42025c800fc419a..02da1ef089709172fcf6e9bb1f93ba37f6c6a1cc 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 610c0c4f9e4651f0b62d1dff8bf8446be19fc3e3..c18454dfe34aa1726316a7594981e84360c0b944 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 2ee26403d7e3b3278652d8c660719d9ff70b7dd6..c591eb3deb9bd5c9bc63d915bc337589745bd8a3 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 1eecbb155e722c14442e5a165b4e6cbd4b3d8ffc..94e129088d2f3f52fe9c05dbd3be6ea28afe4b45 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 48f2d04f2d81093dc9dd731a3768f41cc4a8a868..703cbd578e86cff180e83a58e6fd300a044f0648 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
index 319cf3e20c8f280fb2a4662eaf64bc90ad44f5ec..14b5a0ba52e5193497d8b24765d221ce66cc086a 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 319cf3e20c8f280fb2a4662eaf64bc90ad44f5ec
+Subproject commit 14b5a0ba52e5193497d8b24765d221ce66cc086a
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index fa783472dc7a708d0a637390f9397860c0be8560..69576a05c553b25bae13b16424a9a02a22e1de1f 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