diff --git a/config/global.ini.php b/config/global.ini.php
index 62552298cd0d11139bbeb8cdbb02d457b74e02ff..a01f51b1d7d362d660524070994c3108de4dbb3c 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -101,10 +101,10 @@ 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
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index cd3fc0138c970ae90ce45eb7d4418ccacfc759a1..800db50a118bd8e820c26b1a294fd073c41cc4c9 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -154,7 +154,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,
);
/**
@@ -368,12 +369,16 @@ class ArchiveProcessor
// we only compute unique visitors for a single site
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 +400,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/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..0170097fe6b24814dbf29ab3c58d899fa7241cfb 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -164,6 +164,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)",
);
}
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/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/Metrics.php b/core/Metrics.php
index 4af30600d337e73b92eca7d7bd4b2d6524e72826..85cc4da371bb96461d1efe1204e2806d9b74a251 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -78,6 +78,10 @@ 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;
+
// Goal reports
const INDEX_GOAL_NB_CONVERSIONS = 1;
const INDEX_GOAL_REVENUE = 2;
@@ -92,6 +96,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',
@@ -100,6 +105,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',
@@ -133,7 +139,7 @@ class Metrics
Metrics::INDEX_EVENT_SUM_EVENT_VALUE => 'sum_event_value',
Metrics::INDEX_EVENT_MIN_EVENT_VALUE => 'min_event_value',
Metrics::INDEX_EVENT_MAX_EVENT_VALUE => 'max_event_value',
- Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE => 'nb_events_with_value'
+ Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE => 'nb_events_with_value',
);
@@ -152,6 +158,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,
@@ -256,6 +263,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;
@@ -289,6 +297,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);
@@ -362,6 +371,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/Plugin/Report.php b/core/Plugin/Report.php
index 32b4e597b85c98a1e7d96c4a88913b25550f372e..71d655f6a7180d278f78e158c23b8db2ac950638 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/Tracker.php b/core/Tracker.php
index 58e7112db575719404c5aadea5ef677265b7f6a4..9ff3dec7584c0de3f1efd8b089be0f4818756532 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
@@ -762,12 +755,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)
@@ -826,11 +813,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
@@ -873,7 +855,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 98057f6ccc47a0cac90194a305065954bf14a57f..239feb7ed71c30536f1d0385b5c6337f9c5186dc 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'),
@@ -436,21 +435,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
@@ -467,6 +482,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);
@@ -474,7 +490,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;
@@ -511,16 +527,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()
@@ -550,4 +564,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..3cc2275853180a6256964465b26d1751c03eaa25 100644
--- a/core/Tracker/Visitor.php
+++ b/core/Tracker/Visitor.php
@@ -236,8 +236,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 +254,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 a5effe147f9188d8a9b5fd85e7f6577756f6e2c9..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.7.0-b1';
+ const VERSION = '2.7.0-b2';
}
diff --git a/js/piwik.js b/js/piwik.js
index 225878700b7de9ba6b9488ba09c01d65e40adc30..8c3a8c9d23cddbf835aedb1434e03e6e165cad14 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -408,7 +408,7 @@ if (typeof JSON2 !== 'object') {
exec,
res, width, height, devicePixelRatio,
pdf, qt, realp, wma, dir, fla, java, gears, ag,
- hook, getHook, getVisitorId, getVisitorInfo, setSiteId, setTrackerUrl, appendToTrackingUrl, getRequest, addPlugin,
+ hook, getHook, getVisitorId, getVisitorInfo, setUserId, setSiteId, setTrackerUrl, appendToTrackingUrl, getRequest, addPlugin,
getAttributionInfo, getAttributionCampaignName, getAttributionCampaignKeyword,
getAttributionReferrerTimestamp, getAttributionReferrerUrl,
setCustomData, getCustomData,
@@ -1100,6 +1100,9 @@ if (typeof Piwik !== 'object') {
// Site ID
configTrackerSiteId = siteId || '',
+ // User ID
+ configUserId = '',
+
// Document URL
configCustomUrl,
@@ -1761,6 +1764,7 @@ if (typeof Piwik !== 'object') {
'&h=' + now.getHours() + '&m=' + now.getMinutes() + '&s=' + now.getSeconds() +
'&url=' + encodeWrapper(purify(currentUrl)) +
(configReferrerUrl.length ? '&urlref=' + encodeWrapper(purify(configReferrerUrl)) : '') +
+ (configUserId.length ? '&uid=' + encodeWrapper(configUserId) : '') +
'&_id=' + uuid + '&_idts=' + createTs + '&_idvc=' + visitCount +
'&_idn=' + newVisitor + // currently unused
(campaignNameDetected.length ? '&_rcn=' + encodeWrapper(campaignNameDetected) : '') +
@@ -2424,6 +2428,15 @@ if (typeof Piwik !== 'object') {
configTrackerSiteId = siteId;
},
+ /**
+ * Sets a User ID to this user (such as an email address or a username)
+ *
+ * @param string User ID
+ */
+ setUserId: function (userId) {
+ configUserId = userId;
+ },
+
/**
* Pass custom data to the server
*
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/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php
index 3afc2db93a2ce2c0e36cca28ba60a5220e2db44f..c6629d4473184df88d31585bdb8a6b2744ffc1ba 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;
}
@@ -946,17 +948,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.
+ *
+ * @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.
*
- * You may set the Visitor ID based on a user attribute, for example the user email:
- * $v->setVisitorId( substr(md5( $userEmail ), 0, 16));
+ * 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
*/
@@ -989,13 +1022,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;
}
/**
@@ -1061,7 +1109,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
*/
@@ -1308,7 +1355,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) : '') .
@@ -1332,6 +1379,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/piwik.js b/piwik.js
index d38ea894ed76f79f5fdffa3145ed71ff8f59d0e2..1b51739205f2d7107ed6861e1c438a5b9af64745 100644
--- a/piwik.js
+++ b/piwik.js
@@ -15,21 +15,21 @@ return typeof f==="function"?m({"":n},""):n}throw new SyntaxError("JSON2.parse")
}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,aT){var W=I(s.domain,C.location.href,v()),be=w(W[0]),bt=W[1],a1=W[2],bu=false,aX="GET",aZ=aX,aL="application/x-www-form-urlencoded; charset=UTF-8",au=aL,U=ap||"",am="",aV="",bj=aT||"",aJ,ay=s.title,aA="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",aW=[be],Z=[],aO=[],ao=[],aU=500,aa,aq,ab,ae,aC=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],ax=["pk_kwd","piwik_kwd","utm_term"],br="_pk_",ag,bs,af=false,bm,aE,aH,al=63072000000,an=1800000,aK=15768000000,aF=true,at=0,aI=false,Y=false,aj,aP={},V={},bn=200,a7={},bk={},a4=false,a2=false,a0,aQ,ah,aB=N,a3,aG;
-function a9(bD,bA,bz,bC,by,bB){if(af){return}var bx;if(bz){bx=new Date();bx.setTime(bx.getTime()+bz)}s.cookie=bD+"="+k(bA)+(bz?";expires="+bx.toGMTString():"")+";path="+(bC||"/")+(by?";domain="+by:"")+(bB?";secure":"")}function ak(bz){if(af){return 0}var bx=new RegExp("(^|;)[ ]*"+bz+"=([^;]*)"),by=bx.exec(s.cookie);return by?B(by[2]):0}function bo(bx){var by;if(ab){by=new RegExp("#.*");return bx.replace(by,"")}return bx}function bd(bz,bx){var bA=j(bx),by;if(bA){return bx}if(bx.slice(0,1)==="/"){return j(bz)+"://"+b(bz)+bx}bz=bo(bz);by=bz.indexOf("?");if(by>=0){bz=bz.slice(0,by)}by=bz.lastIndexOf("/");if(by!==bz.length-1){bz=bz.slice(0,by+1)}return bz+bx}function aY(bA){var by,bx,bz;for(by=0;by<aW.length;by++){bx=w(aW[by].toLowerCase());if(bA===bx){return true}if(bx.slice(0,1)==="."){if(bA===bx.slice(1)){return true}bz=bA.length-bx.length;if((bz>0)&&(bA.slice(bz)===bx)){return true}}}return false}function bw(bx){var by=new Image(1,1);by.onload=function(){r=0};by.src=U+(U.indexOf("?")<0?"?":"&")+bx
-}function ba(bx){try{var bz=C.XMLHttpRequest?new C.XMLHttpRequest():C.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;bz.open("POST",U,true);bz.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){bw(bx)}};bz.setRequestHeader("Content-Type",au);bz.send(bx)}catch(by){bw(bx)}}function aD(bz,by){var bx=new Date();if(!bm){if(aZ==="POST"){ba(bz)}else{bw(bz)}i=bx.getTime()+by}}function a8(bx){return br+bx+"."+bj+"."+a3}function X(){if(af){return"0"}if(!u(e.cookieEnabled)){var bx=a8("testcookie");a9(bx,"1");return ak(bx)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function aR(){a3=aB((ag||be)+(bs||"/")).slice(0,4)}function ai(){var by=a8("cvar"),bx=ak(by);if(bx.length){bx=JSON2.parse(bx);if(E(bx)){return bx}}return{}}function T(){if(Y===false){Y=ai()}}function bi(){var bx=new Date();a0=bx.getTime()}function ad(bB,by,bx,bA,bz,bC){a9(a8("id"),bB+"."+by+"."+bx+"."+bA+"."+bz+"."+bC,al,bs,ag)}function S(){var by=new Date(),bx=Math.round(by.getTime()/1000),bA=ak(a8("id")),bz;
-if(bA){bz=bA.split(".");bz.unshift("0")}else{if(!aG){aG=aB((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bk)+by.getTime()+Math.random()).slice(0,16)}bz=["1",aG,bx,0,bx,"",""]}return bz}function R(){var bx=ak(a8("ref"));if(bx.length){try{bx=JSON2.parse(bx);if(E(bx)){return bx}}catch(by){}}return["","",0,""]}function Q(){var bx=af;af=false;a9(a8("id"),"",-86400,bs,ag);a9(a8("ses"),"",-86400,bs,ag);a9(a8("cvar"),"",-86400,bs,ag);a9(a8("ref"),"",-86400,bs,ag);af=bx}function bh(bB){if(!bB||!E(bB)){return}var bA=[];var bz;for(bz in bB){if(Object.prototype.hasOwnProperty.call(bB,bz)){bA.push(bz)}}var bC={};bA.sort();var bx=bA.length;var by;for(by=0;by<bx;by++){bC[bA[by]]=bB[bA[by]]}return bC}function az(bz,bX,bY,bA){var bV,by=new Date(),bH=Math.round(by.getTime()/1000),b1,bW,bC,bN,bS,bG,bQ,bD,bU,bB=1024,b3,bK,bR=Y,bI=a8("ses"),bJ=a8("ref"),b4=a8("cvar"),bO=S(),bM=ak(bI),bT=R(),b0=aJ||bt,bE,bx;if(af){Q()}if(bm){return""}b1=bO[0];bW=bO[1];bN=bO[2];bC=bO[3];bS=bO[4];bG=bO[5];if(!u(bO[6])){bO[6]=""
-}bQ=bO[6];if(!u(bA)){bA=""}var bL=s.characterSet||s.charset;if(!bL||bL.toLowerCase()==="utf-8"){bL=null}bE=bT[0];bx=bT[1];bD=bT[2];bU=bT[3];if(!bM){var bZ=an/1000;if(!bG||(bH-bG)>bZ){bC++;bG=bS}if(!aH||!bE.length){for(bV in aC){if(Object.prototype.hasOwnProperty.call(aC,bV)){bE=D(b0,aC[bV]);if(bE.length){break}}}for(bV in ax){if(Object.prototype.hasOwnProperty.call(ax,bV)){bx=D(b0,ax[bV]);if(bx.length){break}}}}b3=b(a1);bK=bU.length?b(bU):"";if(b3.length&&!aY(b3)&&(!aH||!bK.length||aY(bK))){bU=a1}if(bU.length||bE.length){bD=bH;bT=[bE,bx,bD,bo(bU.slice(0,bB))];a9(bJ,JSON2.stringify(bT),aK,bs,ag)}}bz+="&idsite="+bj+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+by.getHours()+"&m="+by.getMinutes()+"&s="+by.getSeconds()+"&url="+k(bo(b0))+(a1.length?"&urlref="+k(bo(a1)):"")+"&_id="+bW+"&_idts="+bN+"&_idvc="+bC+"&_idn="+b1+(bE.length?"&_rcn="+k(bE):"")+(bx.length?"&_rck="+k(bx):"")+"&_refts="+bD+"&_viewts="+bG+(String(bQ).length?"&_ects="+bQ:"")+(String(bU).length?"&_ref="+k(bo(bU.slice(0,bB))):"")+(bL?"&cs="+k(bL):"");
-for(bV in bk){if(Object.prototype.hasOwnProperty.call(bk,bV)){bz+="&"+bV+"="+bk[bV]}}if(bX){bz+="&data="+k(JSON2.stringify(bX))}else{if(ae){bz+="&data="+k(JSON2.stringify(ae))}}function bF(b5,b6){var b7=JSON2.stringify(b5);if(b7.length>2){return"&"+b6+"="+k(b7)}return""}var b2=bh(aP);var bP=bh(V);bz+=bF(b2,"cvar");bz+=bF(bP,"e_cvar");if(Y){bz+=bF(Y,"_cvar");for(bV in bR){if(Object.prototype.hasOwnProperty.call(bR,bV)){if(Y[bV][0]===""||Y[bV][1]===""){delete Y[bV]}}}if(aI){a9(b4,JSON2.stringify(Y),an,bs,ag)}}if(aF){if(at){bz+=">_ms="+at}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){bz+=">_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}ad(bW,bN,bC,bH,bG,u(bA)&&String(bA).length?bA:bQ);a9(bI,"*",an,bs,ag);bz+=J(bY);if(aV.length){bz+="&"+aV}if(o(aj)){bz=aj(bz)}return bz}function bc(bA,bz,bE,bB,bx,bH){var bC="idgoal=0",bD,by=new Date(),bF=[],bG;if(String(bA).length){bC+="&ec_id="+k(bA);bD=Math.round(by.getTime()/1000)}bC+="&revenue="+bz;if(String(bE).length){bC+="&ec_st="+bE
-}if(String(bB).length){bC+="&ec_tx="+bB}if(String(bx).length){bC+="&ec_sh="+bx}if(String(bH).length){bC+="&ec_dt="+bH}if(a7){for(bG in a7){if(Object.prototype.hasOwnProperty.call(a7,bG)){if(!u(a7[bG][1])){a7[bG][1]=""}if(!u(a7[bG][2])){a7[bG][2]=""}if(!u(a7[bG][3])||String(a7[bG][3]).length===0){a7[bG][3]=0}if(!u(a7[bG][4])||String(a7[bG][4]).length===0){a7[bG][4]=1}bF.push(a7[bG])}}bC+="&ec_items="+k(JSON2.stringify(bF))}bC=az(bC,ae,"ecommerce",bD);aD(bC,aU)}function bb(bx,bB,bA,bz,by,bC){if(String(bx).length&&u(bB)){bc(bx,bB,bA,bz,by,bC)}}function bq(bx){if(u(bx)){bc("",bx,"","","","")}}function aN(bA,bB){var bx=new Date(),bz=az("action_name="+k(P(bA||ay)),bB,"log");aD(bz,aU);if(aa&&aq&&!a2){a2=true;O(s,"click",bi);O(s,"mouseup",bi);O(s,"mousedown",bi);O(s,"mousemove",bi);O(s,"mousewheel",bi);O(C,"DOMMouseScroll",bi);O(C,"scroll",bi);O(s,"keypress",bi);O(s,"keydown",bi);O(s,"keyup",bi);O(C,"resize",bi);O(C,"focus",bi);O(C,"blur",bi);a0=bx.getTime();setTimeout(function by(){var bC;bx=new Date();
-if((a0+aq)>bx.getTime()){if(aa<bx.getTime()){bC=az("ping=1",bB,"ping");aD(bC,aU)}setTimeout(by,aq)}},aq)}}function ac(bz,bB,bx,bA,bC){if(String(bz).length===0||String(bB).length===0){return false}var by=az("e_c="+k(bz)+"&e_a="+k(bB)+(u(bx)?"&e_n="+k(bx):"")+(u(bA)?"&e_v="+k(bA):""),bC,"event");aD(by,aU)}function aw(bx,bA,by,bB){var bz=az("search="+k(bx)+(bA?"&search_cat="+k(bA):"")+(u(by)?"&search_count="+by:""),bB,"sitesearch");aD(bz,aU)}function aS(bx,bA,bz){var by=az("idgoal="+bx+(bA?"&revenue="+bA:""),bz,"goal");aD(by,aU)}function bg(by,bx,bA){var bz=az(bx+"="+k(bo(by)),bA,"link");aD(bz,aU)}function bl(by,bx){if(by!==""){return by+bx.charAt(0).toUpperCase()+bx.slice(1)}return bx}function av(bC){var bB,bx,bA=["","webkit","ms","moz"],bz;if(!aE){for(bx=0;bx<bA.length;bx++){bz=bA[bx];if(Object.prototype.hasOwnProperty.call(s,bl(bz,"hidden"))){if(s[bl(bz,"visibilityState")]==="prerender"){bB=true}break}}}if(bB){O(s,bz+"visibilitychange",function by(){s.removeEventListener(bz+"visibilitychange",by,false);
-bC()});return}bC()}function ar(bz,by){var bA,bx="(^| )(piwik[_-]"+by;if(bz){for(bA=0;bA<bz.length;bA++){bx+="|"+bz[bA]}}bx+=")( |$)";return new RegExp(bx)}function bf(bA,bx,bB){var bz=ar(aO,"download"),by=ar(ao,"link"),bC=new RegExp("\\.("+aA+")([?&#]|$)","i");return by.test(bA)?"link":(bz.test(bA)||bC.test(bx)?"download":(bB?0:"link"))}function a6(bC){var bA,by,bx;bA=bC.parentNode;while(bA!==null&&u(bA)){by=bC.tagName.toUpperCase();if(by==="A"||by==="AREA"){break}bC=bA;bA=bC.parentNode}if(u(bC.href)){var bD=bC.hostname||b(bC.href),bE=bD.toLowerCase(),bz=bC.href.replace(bD,bE),bB=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bB.test(bz)){bx=bf(bC.className,bz,aY(bE));if(bx){bz=g(bz);bg(bz,bx)}}}}function bv(bx){var by,bz;bx=bx||C.event;by=bx.which||bx.button;bz=bx.target||bx.srcElement;if(bx.type==="click"){if(bz){a6(bz)}}else{if(bx.type==="mousedown"){if((by===1||by===2)&&bz){aQ=by;ah=bz}else{aQ=ah=null}}else{if(bx.type==="mouseup"){if(by===aQ&&bz===ah){a6(bz)
-}aQ=ah=null}}}}function a5(by,bx){if(bx){O(by,"mouseup",bv,false);O(by,"mousedown",bv,false)}else{O(by,"click",bv,false)}}function aM(by){if(!a4){a4=true;var bz,bx=ar(Z,"ignore"),bA=s.links;if(bA){for(bz=0;bz<bA.length;bz++){if(!bx.test(bA[bz].className)){a5(bA[bz],by)}}}}}function bp(){var by,bz,bA={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"},bx=(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(by in bA){if(Object.prototype.hasOwnProperty.call(bA,by)){bz=e.mimeTypes[bA[by]];bk[by]=(bz&&bz.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&u(e.javaEnabled)&&e.javaEnabled()){bk.java="1"}if(o(C.GearsFactory)){bk.gears="1"}bk.cookie=X()}bk.res=F.width*bx+"x"+F.height*bx
-}bp();aR();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(bx){U=bx},setSiteId:function(bx){bj=bx},setCustomData:function(bx,by){if(E(bx)){ae=bx}else{if(!ae){ae=[]}ae[bx]=by}},getCustomData:function(){return ae},setCustomRequestProcessing:function(bx){aj=bx},appendToTrackingUrl:function(bx){aV=bx},getRequest:function(bx){return az(bx)},addPlugin:function(bx,by){a[bx]=by},setCustomVariable:function(by,bx,bB,bz){var bA;if(!u(bz)){bz="visit"}if(!u(bx)){return}if(!u(bB)){bB=""}if(by>0){bx=!l(bx)?String(bx):bx;bB=!l(bB)?String(bB):bB;bA=[bx.slice(0,bn),bB.slice(0,bn)];if(bz==="visit"||bz===2){T();Y[by]=bA}else{if(bz==="page"||bz===3){aP[by]=bA}else{if(bz==="event"){V[by]=bA}}}}},getCustomVariable:function(by,bz){var bx;
-if(!u(bz)){bz="visit"}if(bz==="page"||bz===3){bx=aP[by]}else{if(bz==="event"){bx=V[by]}else{if(bz==="visit"||bz===2){T();bx=Y[by]}}}if(!u(bx)||(bx&&bx[0]==="")){return false}return bx},deleteCustomVariable:function(bx,by){if(this.getCustomVariable(bx,by)){this.setCustomVariable(bx,"","",by)}},storeCustomVariablesInCookie:function(){aI=true},setLinkTrackingTimer:function(bx){aU=bx},setDownloadExtensions:function(bx){aA=bx},addDownloadExtensions:function(bx){aA+="|"+bx},setDomains:function(bx){aW=l(bx)?[bx]:bx;aW.push(be)},setIgnoreClasses:function(bx){Z=l(bx)?[bx]:bx},setRequestMethod:function(bx){aZ=bx||aX},setRequestContentType:function(bx){au=bx||aL},setReferrerUrl:function(bx){a1=bx},setCustomUrl:function(bx){aJ=bd(bt,bx)},setDocumentTitle:function(bx){ay=bx},setAPIUrl:function(bx){am=bx},setDownloadClasses:function(bx){aO=l(bx)?[bx]:bx},setLinkClasses:function(bx){ao=l(bx)?[bx]:bx},setCampaignNameKey:function(bx){aC=l(bx)?[bx]:bx},setCampaignKeywordKey:function(bx){ax=l(bx)?[bx]:bx},discardHashTag:function(bx){ab=bx
-},setCookieNamePrefix:function(bx){br=bx;Y=ai()},setCookieDomain:function(bx){ag=w(bx);aR()},setCookiePath:function(bx){bs=bx;aR()},setVisitorCookieTimeout:function(bx){al=bx*1000},setSessionCookieTimeout:function(bx){an=bx*1000},setReferralCookieTimeout:function(bx){aK=bx*1000},setConversionAttributionFirstReferrer:function(bx){aH=bx},disableCookies:function(){af=true;bk.cookie="0"},deleteCookies:function(){Q()},setDoNotTrack:function(by){var bx=e.doNotTrack||e.msDoNotTrack;bm=by&&(bx==="yes"||bx==="1");if(bm){this.disableCookies()}},addListener:function(by,bx){a5(by,bx)},enableLinkTracking:function(bx){if(n){aM(bx)}else{A.push(function(){aM(bx)})}},enableJSErrorTracking:function(){if(bu){return}bu=true;var bx=C.onerror;C.onerror=function(bC,bA,bz,bB,by){av(function(){var bD="JavaScript Errors";var bE=bA+":"+bz;if(bB){bE+=":"+bB}ac(bD,bE,bC)});if(bx){return bx(bC,bA,bz,bB,by)}return false}},disablePerformanceTracking:function(){aF=false},setGenerationTimeMs:function(bx){at=parseInt(bx,10)
-},setHeartBeatTimer:function(bz,by){var bx=new Date();aa=bx.getTime()+bz*1000;aq=by*1000},killFrame:function(){if(C.location!==C.top.location){C.top.location=C.location}},redirectFile:function(bx){if(C.location.protocol==="file:"){C.location=bx}},setCountPreRendered:function(bx){aE=bx},trackGoal:function(bx,bz,by){av(function(){aS(bx,bz,by)})},trackLink:function(by,bx,bz){av(function(){bg(by,bx,bz)})},trackPageView:function(bx,by){if(x(bj)){av(function(){H(U,am,bj)})}else{av(function(){aN(bx,by)})}},trackEvent:function(by,bA,bx,bz){av(function(){ac(by,bA,bx,bz)})},trackSiteSearch:function(bx,bz,by){av(function(){aw(bx,bz,by)})},setEcommerceView:function(bA,bx,bz,by){if(!u(bz)||!bz.length){bz=""}else{if(bz instanceof Array){bz=JSON2.stringify(bz)}}aP[5]=["_pkc",bz];if(u(by)&&String(by).length){aP[2]=["_pkp",by]}if((!u(bA)||!bA.length)&&(!u(bx)||!bx.length)){return}if(u(bA)&&bA.length){aP[3]=["_pks",bA]}if(!u(bx)||!bx.length){bx=""}aP[4]=["_pkn",bx]},addEcommerceItem:function(bB,bx,bz,by,bA){if(bB.length){a7[bB]=[bB,bx,bz,by,bA]
-}},trackEcommerceOrder:function(bx,bB,bA,bz,by,bC){bb(bx,bB,bA,bz,by,bC)},trackEcommerceCartUpdate:function(bx){bq(bx)}}}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()
+}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/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/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/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/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/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/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..deb50b52529d60c9cda0117690d8241d16e46e11 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 defined %}<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/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/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/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/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/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/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/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/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..7076ecf7fbc3dd6698d2d481cbc790775dd37dc3
--- /dev/null
+++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php
@@ -0,0 +1,218 @@
+<?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);
+ 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/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/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/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 658af8bc2fc12043dde8cd05aafd165d780fbbd6..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>
@@ -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_keywords__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_keywords__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_keywords__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>1</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 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_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_myConversionSegmentName__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_myConversionSegmentName__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_myConversionSegmentName__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>1</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
index 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_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 b719a0aa77b2223a4a54ecc46ba693a38d85f59a..73fd29c06ad4d8c84fede96ed01cb8970386ad6f 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit b719a0aa77b2223a4a54ecc46ba693a38d85f59a
+Subproject commit 73fd29c06ad4d8c84fede96ed01cb8970386ad6f
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index 54db955658cbca0b328c1939ecd1b06549db5fb5..ca7f887ac1ffe29a556bf88e9d478c37d665d026 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -322,7 +322,7 @@ function PiwikTest() {
});
test("API methods", function() {
- expect(57);
+ expect(58);
equal( typeof Piwik.addPlugin, 'function', 'addPlugin' );
equal( typeof Piwik.getTracker, 'function', 'getTracker' );
@@ -347,6 +347,7 @@ function PiwikTest() {
equal( typeof tracker.getRequest, 'function', 'getRequest' );
equal( typeof tracker.addPlugin, 'function', 'addPlugin' );
equal( typeof tracker.setSiteId, 'function', 'setSiteId' );
+ equal( typeof tracker.setUserId, 'function', 'setUserId' );
equal( typeof tracker.setCustomData, 'function', 'setCustomData' );
equal( typeof tracker.getCustomData, 'function', 'getCustomData' );
equal( typeof tracker.setCustomRequestProcessing, 'function', 'setCustomRequestProcessing' );
@@ -947,7 +948,7 @@ if ($sqlite) {
});
test("tracking", function() {
- expect(98);
+ expect(99);
/*
* Prevent Opera and HtmlUnit from performing the default action (i.e., load the href URL)
@@ -1188,6 +1189,9 @@ if ($sqlite) {
// do not track
tracker3.setDoNotTrack(false);
+ // User ID
+ tracker3.setUserId('userid@mydomain.org');
+
// Append tracking url parameter
tracker3.appendToTrackingUrl("appended=1&appended2=value");
@@ -1313,6 +1317,9 @@ if ($sqlite) {
// Testing the Tracking URL append
ok( /&appended=1&appended2=value/.test( results ), "appendToTrackingUrl(query) function");
+ // Testing the User ID setter
+ ok( /&uid=userid%40mydomain.org/.test( results ), "setUserId(userId) function");
+
// Testing the JavaScript Error Tracking
ok( /e_c=JavaScript%20Errors&e_a=http%3A%2F%2Fpiwik.org%2Fpath%2Fto%2Ffile.js%3Fcb%3D34343%3A44%3A12&e_n=Uncaught%20Error%3A%20The%20message&idsite=1/.test( results ), "enableJSErrorTracking() function with predefined onerror event");
ok( /e_c=JavaScript%20Errors&e_a=http%3A%2F%2Fpiwik.org%2Fpath%2Fto%2Ffile.js%3Fcb%3D3kfkf%3A45&e_n=Second%20Error%3A%20With%20less%20data&idsite=1/.test( results ), "enableJSErrorTracking() function without predefined onerror event and less parameters");