diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-10-01 07:26:52 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-10-01 07:26:52 +0400 |
| commit | cd1b52dd2e5807d2871e6037815cae2390c5243d (patch) | |
| tree | 5e5ff7f877d60f8d477f9d21cf5b2d659acea68a | |
| parent | 2cd5f09a52fe28ff644827a58ce0f88f177b3f7e (diff) | |
Fixes #6313 - When a user starts to get a User ID set, then we set this User ID to the existing visit rather than create a new visit for this user id specifically
42 files changed, 301 insertions, 240 deletions
diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index aa721a03c5..5fba5a2862 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -357,7 +357,9 @@ abstract class Action $visitAction['idlink_va'] = $this->idLinkVisitAction; Common::printDebug("Inserted new action:"); - Common::printDebug($visitAction); + $visitActionDebug = $visitAction; + $visitActionDebug['idvisitor'] = bin2hex($visitActionDebug['idvisitor']); + Common::printDebug($visitActionDebug); /** * Triggered after successfully persisting a [visit action entity](/guides/persistence-and-the-mysql-backend#visit-actions). diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 8ded0dc7a2..212abbd0d2 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -551,12 +551,11 @@ class Request public function getForcedUserId() { $userId = $this->getParam('uid'); - if (strlen($userId) > 0) { return $userId; } - return null; + return false; } public function getForcedVisitorId() @@ -608,8 +607,8 @@ class Request * @param $userId * @return string */ - private function getUserIdHashed($userId) + public function getUserIdHashed($userId) { - return sha1($userId); + return substr( sha1( $userId ), 0, 16); } } diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php index 75633d95b6..f01f34bc19 100644 --- a/core/Tracker/Visit.php +++ b/core/Tracker/Visit.php @@ -513,11 +513,7 @@ class Visit implements VisitInterface { $valuesToUpdate = array(); - // Might update the idvisitor when it was forced or overwritten for this visit - if (strlen($this->visitorInfo['idvisitor']) == Tracker::LENGTH_BINARY_ID) { - $valuesToUpdate['idvisitor'] = $this->visitorInfo['idvisitor']; - $visitor->setVisitorColumn('idvisitor', $this->visitorInfo['idvisitor']); - } + $valuesToUpdate = $this->setIdVisitorForExistingVisit($visitor, $valuesToUpdate); $dimensions = $this->getAllVisitDimensions(); $valuesToUpdate = $this->triggerHookOnDimensions($dimensions, 'onExistingVisit', $visitor, $action, $valuesToUpdate); @@ -613,4 +609,29 @@ class Visit implements VisitInterface { return Config::getInstance()->Tracker['visit_standard_length']; } + + /** + * @param $visitor + * @param $valuesToUpdate + * @return mixed + */ + private function setIdVisitorForExistingVisit($visitor, $valuesToUpdate) + { + // Might update the idvisitor when it was forced or overwritten for this visit + if (strlen($this->visitorInfo['idvisitor']) == Tracker::LENGTH_BINARY_ID) { + $binIdVisitor = $this->visitorInfo['idvisitor']; + $visitor->setVisitorColumn('idvisitor', $binIdVisitor); + $valuesToUpdate['idvisitor'] = $binIdVisitor; + } + + // User ID takes precedence and overwrites idvisitor value + $userId = $this->request->getForcedUserId(); + if ($userId) { + $userIdHash = $this->request->getUserIdHashed($userId); + $binIdVisitor = Common::hex2bin($userIdHash); + $visitor->setVisitorColumn('idvisitor', $binIdVisitor); + $valuesToUpdate['idvisitor'] = $binIdVisitor; + } + return $valuesToUpdate; + } } diff --git a/core/Tracker/Visitor.php b/core/Tracker/Visitor.php index a73361e014..ec5dd6d279 100644 --- a/core/Tracker/Visitor.php +++ b/core/Tracker/Visitor.php @@ -118,7 +118,8 @@ class Visitor // We use a UNION here so that each sql query uses its own INDEX else { // will use INDEX index_idsite_config_datetime (idsite, config_id, visit_last_action_time) - $where = ' AND config_id = ?'; + $where = ' AND config_id = ? + AND user_id IS NULL '; $bindSql[] = $configId; $sqlConfigId = "$select , 0 as priority @@ -226,22 +227,31 @@ class Visitor protected function shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup) { + $isForcedUserIdMustMatch = (false !== $this->request->getForcedUserId()); + if($isForcedUserIdMustMatch) { + // if &iud was set, we must try and match both idvisitor and config_id + return false; + } + // This setting would be enabled for Intranet websites, to ensure that visitors using all the same computer config, same IP // are not counted as 1 visitor. In this case, we want to enforce and trust the visitor ID from the cookie. $trustCookiesOnly = Config::getInstance()->Tracker['trust_visitors_cookies']; + if($isVisitorIdToLookup && $trustCookiesOnly) { + return true; + } // 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); + if($isForcedVisitorIdMustMatch) { + return true; + } - $shouldMatchOneFieldOnly = (($isVisitorIdToLookup && $trustCookiesOnly) - || $isForcedVisitorIdMustMatch - || $isForcedUserIdMustMatch - || !$isVisitorIdToLookup); + if( !$isVisitorIdToLookup ) { + return true; + } - return $shouldMatchOneFieldOnly; + return false; } /** diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php index 8605e38e1f..15e3b8420c 100644 --- a/libs/PiwikTracker/PiwikTracker.php +++ b/libs/PiwikTracker/PiwikTracker.php @@ -1063,6 +1063,8 @@ class PiwikTracker /** * Hash function used internally by Piwik to hash a User ID into the Visitor ID. * + * Note: matches implementation of Tracker\Request->getUserIdHashed() + * * @param $id * @return string */ @@ -1071,7 +1073,6 @@ class PiwikTracker 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. diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 5ed9724479..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -28,7 +28,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 5ed9724479..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -28,7 +28,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 5ed9724479..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -28,7 +28,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 5ed9724479..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -28,7 +28,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 5ed9724479..989f816722 100644 --- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -28,7 +28,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php index 146a7ea4c6..55fea6b517 100644 --- a/plugins/CoreHome/Columns/UserId.php +++ b/plugins/CoreHome/Columns/UserId.php @@ -48,12 +48,7 @@ class UserId extends VisitDimension */ public function onExistingVisit(Request $request, Visitor $visitor, $action) { - $forcedUserId = $request->getForcedUserId(); - if ($forcedUserId) { - return $forcedUserId; - } - - return false; + return $request->getForcedUserId(); } }
\ No newline at end of file diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php index 688d1c8bb6..35b64b3d30 100644 --- a/plugins/CoreHome/Visitor.php +++ b/plugins/CoreHome/Visitor.php @@ -102,10 +102,10 @@ class Visitor function getUserId() { if (isset($this->details['user_id']) - && !is_null($this->details['user_id'])) { + && strlen($this->details['user_id']) > 0) { return $this->details['user_id']; } - return false; + return null; } }
\ 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 76e4a27324..a61cb11554 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -69,7 +69,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 76e4a27324..a61cb11554 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -69,7 +69,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 3b8eb5d11a..88e4c569eb 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -4,7 +4,6 @@ <idSite>1</idSite> <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> - <userId>userid.email@example.org</userId> <actionDetails> <row> @@ -34,6 +33,7 @@ + <userId>userid.email@example.org</userId> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -111,7 +111,6 @@ <idSite>1</idSite> <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> - <userId /> <actionDetails> <row> @@ -182,6 +181,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -267,7 +267,6 @@ <idSite>1</idSite> <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> - <userId /> <actionDetails> <row> @@ -307,6 +306,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -392,7 +392,6 @@ <idSite>1</idSite> <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> - <userId /> <actionDetails> <row> @@ -446,7 +445,8 @@ - <visitorType>returningCustomer</visitorType> + <userId /> + <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> @@ -531,7 +531,6 @@ <idSite>1</idSite> <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> - <userId /> <actionDetails> <row> @@ -571,6 +570,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -656,7 +656,6 @@ <idSite>1</idSite> <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> - <userId /> <actionDetails> <row> @@ -727,6 +726,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -812,7 +812,6 @@ <idSite>1</idSite> <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> - <userId /> <actionDetails> <row> @@ -852,6 +851,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -937,7 +937,6 @@ <idSite>1</idSite> <idVisit>12</idVisit> <visitIp>1.2.4.5</visitIp> - <userId /> <actionDetails> <row> @@ -991,6 +990,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1076,7 +1076,6 @@ <idSite>1</idSite> <idVisit>11</idVisit> <visitIp>1.2.4.5</visitIp> - <userId /> <actionDetails> <row> @@ -1116,6 +1115,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1201,7 +1201,6 @@ <idSite>1</idSite> <idVisit>10</idVisit> <visitIp>1.2.4.4</visitIp> - <userId /> <actionDetails> <row> @@ -1272,6 +1271,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1357,7 +1357,6 @@ <idSite>1</idSite> <idVisit>9</idVisit> <visitIp>1.2.4.4</visitIp> - <userId /> <actionDetails> <row> @@ -1397,6 +1396,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1482,7 +1482,6 @@ <idSite>1</idSite> <idVisit>8</idVisit> <visitIp>1.2.4.3</visitIp> - <userId /> <actionDetails> <row> @@ -1536,6 +1535,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1621,7 +1621,6 @@ <idSite>1</idSite> <idVisit>30</idVisit> <visitIp>113.62.1.1</visitIp> - <userId /> <actionDetails> <row> @@ -1675,6 +1674,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1752,7 +1752,6 @@ <idSite>1</idSite> <idVisit>7</idVisit> <visitIp>1.2.4.3</visitIp> - <userId /> <actionDetails> <row> @@ -1792,6 +1791,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1877,7 +1877,6 @@ <idSite>1</idSite> <idVisit>29</idVisit> <visitIp>113.62.1.1</visitIp> - <userId /> <actionDetails> <row> @@ -1917,6 +1916,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2002,7 +2002,6 @@ <idSite>1</idSite> <idVisit>6</idVisit> <visitIp>1.2.4.2</visitIp> - <userId /> <actionDetails> <row> @@ -2073,6 +2072,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2158,7 +2158,6 @@ <idSite>1</idSite> <idVisit>28</idVisit> <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp> - <userId /> <actionDetails> <row> @@ -2229,6 +2228,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2306,7 +2306,6 @@ <idSite>1</idSite> <idVisit>5</idVisit> <visitIp>1.2.4.2</visitIp> - <userId /> <actionDetails> <row> @@ -2346,6 +2345,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2431,7 +2431,6 @@ <idSite>1</idSite> <idVisit>27</idVisit> <visitIp>2001:db8:85a3::8a2e:370:7334</visitIp> - <userId /> <actionDetails> <row> @@ -2471,6 +2470,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2556,7 +2556,6 @@ <idSite>1</idSite> <idVisit>4</idVisit> <visitIp>1.2.4.1</visitIp> - <userId /> <actionDetails> <row> @@ -2610,6 +2609,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2695,7 +2695,6 @@ <idSite>1</idSite> <idVisit>22</idVisit> <visitIp>::ffff:137.82.130.49</visitIp> - <userId /> <actionDetails> <row> @@ -2749,6 +2748,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2834,7 +2834,6 @@ <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>137.82.0.0</visitIp> - <userId /> <actionDetails> <row> @@ -2888,6 +2887,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2965,7 +2965,6 @@ <idSite>1</idSite> <idVisit>34</idVisit> <visitIp>103.29.196.229</visitIp> - <userId /> <actionDetails> <row> @@ -3019,6 +3018,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3104,7 +3104,6 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>1.2.4.1</visitIp> - <userId /> <actionDetails> <row> @@ -3144,6 +3143,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3229,7 +3229,6 @@ <idSite>1</idSite> <idVisit>21</idVisit> <visitIp>::ffff:137.82.130.49</visitIp> - <userId /> <actionDetails> <row> @@ -3269,6 +3268,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3354,7 +3354,6 @@ <idSite>1</idSite> <idVisit>25</idVisit> <visitIp>137.82.0.0</visitIp> - <userId /> <actionDetails> <row> @@ -3394,6 +3393,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3479,7 +3479,6 @@ <idSite>1</idSite> <idVisit>33</idVisit> <visitIp>103.29.196.229</visitIp> - <userId /> <actionDetails> <row> @@ -3519,6 +3518,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3604,7 +3604,6 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>1.2.4.0</visitIp> - <userId /> <actionDetails> <row> @@ -3675,6 +3674,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3760,7 +3760,6 @@ <idSite>1</idSite> <idVisit>20</idVisit> <visitIp>194.57.91.215</visitIp> - <userId /> <actionDetails> <row> @@ -3831,6 +3830,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -3916,7 +3916,6 @@ <idSite>1</idSite> <idVisit>24</idVisit> <visitIp>137.82.130.0</visitIp> - <userId /> <actionDetails> <row> @@ -3987,6 +3986,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -4064,7 +4064,6 @@ <idSite>1</idSite> <idVisit>32</idVisit> <visitIp>151.100.101.92</visitIp> - <userId /> <actionDetails> <row> @@ -4135,6 +4134,7 @@ + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -4220,7 +4220,6 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>1.2.4.0</visitIp> - <userId /> <actionDetails> <row> @@ -4260,6 +4259,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4345,7 +4345,6 @@ <idSite>1</idSite> <idVisit>19</idVisit> <visitIp>194.57.91.215</visitIp> - <userId /> <actionDetails> <row> @@ -4385,6 +4384,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4470,7 +4470,6 @@ <idSite>1</idSite> <idVisit>23</idVisit> <visitIp>137.82.130.0</visitIp> - <userId /> <actionDetails> <row> @@ -4510,6 +4509,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4595,7 +4595,6 @@ <idSite>1</idSite> <idVisit>31</idVisit> <visitIp>151.100.101.92</visitIp> - <userId /> <actionDetails> <row> @@ -4635,6 +4634,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 11b3df7d80..61b4626535 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -26,7 +26,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -298,7 +298,7 @@ <searches>0</searches> <actions>6</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -400,7 +400,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -737,7 +737,7 @@ <searches>0</searches> <actions>15</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -839,7 +839,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -937,7 +937,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1103,7 +1103,7 @@ <searches>0</searches> <actions>6</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1201,7 +1201,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1534,7 +1534,7 @@ <searches>0</searches> <actions>15</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 11b3df7d80..61b4626535 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -26,7 +26,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -128,7 +128,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -298,7 +298,7 @@ <searches>0</searches> <actions>6</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -400,7 +400,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -737,7 +737,7 @@ <searches>0</searches> <actions>15</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -839,7 +839,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -937,7 +937,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1103,7 +1103,7 @@ <searches>0</searches> <actions>6</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1201,7 +1201,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -1534,7 +1534,7 @@ <searches>0</searches> <actions>15</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 db55cce7c1..06291c5c5f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -42,7 +42,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -180,7 +180,7 @@ <searches>0</searches> <actions>2</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -289,7 +289,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -439,7 +439,7 @@ <searches>0</searches> <actions>2</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -554,7 +554,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>0</visitConverted> @@ -680,7 +680,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -813,7 +813,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -935,7 +935,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1049,7 +1049,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1218,7 +1218,7 @@ <searches>0</searches> <actions>3</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -1336,7 +1336,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1462,7 +1462,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -1750,7 +1750,7 @@ <searches>0</searches> <actions>10</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -1862,7 +1862,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -1979,7 +1979,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -2112,7 +2112,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -2237,7 +2237,7 @@ <searches>0</searches> <actions>2</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -2369,7 +2369,7 @@ <searches>0</searches> <actions>3</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -2477,7 +2477,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -2585,7 +2585,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -2683,7 +2683,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -2791,7 +2791,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -2899,7 +2899,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3007,7 +3007,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3111,7 +3111,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3215,7 +3215,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3319,7 +3319,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3423,7 +3423,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3527,7 +3527,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3631,7 +3631,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3735,7 +3735,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3839,7 +3839,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -3943,7 +3943,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4047,7 +4047,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4151,7 +4151,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4255,7 +4255,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4359,7 +4359,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4463,7 +4463,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4567,7 +4567,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -4671,7 +4671,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 cfc7a48e6e..02678e9aee 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 @@ -43,7 +43,7 @@ - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -197,7 +197,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -320,7 +320,7 @@ - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -474,7 +474,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -597,7 +597,7 @@ - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -751,7 +751,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -866,7 +866,7 @@ - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 08efeed493..47c2f38c4e 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 @@ -181,7 +181,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -306,7 +306,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -445,7 +445,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -570,7 +570,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -726,7 +726,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -851,7 +851,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> 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 af635609ab..8c0eba69bb 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 @@ -74,7 +74,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -199,7 +199,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -355,7 +355,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -494,7 +494,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -619,7 +619,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -744,7 +744,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> 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 08efeed493..47c2f38c4e 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 @@ -181,7 +181,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -306,7 +306,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -445,7 +445,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -570,7 +570,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -726,7 +726,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -851,7 +851,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> 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 59c6334162..ce1748a73a 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -181,7 +181,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -306,7 +306,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -445,7 +445,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -570,7 +570,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -726,7 +726,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -851,7 +851,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -990,7 +990,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1115,7 +1115,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -1271,7 +1271,7 @@ - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> 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 b49b3c5e84..2ceb5d70bf 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 @@ -36,7 +36,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -224,7 +224,7 @@ <searches>1</searches> <actions>8</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 a7fdbfae5e..9175168a74 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 @@ -4,7 +4,6 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.0.0</visitIp> - <userId /> <actionDetails> <row> @@ -24,6 +23,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -101,7 +101,6 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.0.0</visitIp> - <userId /> <actionDetails> <row> @@ -131,6 +130,7 @@ + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 6b02eec11b..f77489d7a3 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 @@ -30,7 +30,7 @@ <lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime> <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -123,7 +123,7 @@ <lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime> <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -216,7 +216,7 @@ <lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime> <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml b/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml index 071ef336c0..6ab5630422 100644 --- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml @@ -54,4 +54,4 @@ <col name="5. Alexa">0</col> <col name="6. Babylon">0</col> </row> -</result> +</result>
\ No newline at end of file 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 b4156876a6..4d5a3bb878 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -25,7 +25,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> 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 46ba01f039..c5183f184f 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 @@ -150,6 +150,16 @@ </a> </li> <li> + <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(68,68,68);"> + Content Name + </a> + </li> + <li> + <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(68,68,68);"> + Content Piece + </a> + </li> + <li> <a href="#Events_getCategory" style="text-decoration:none; color: rgb(68,68,68);"> Event Categories </a> @@ -438,7 +448,7 @@ <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 + 0 </td> </tr> @@ -3818,6 +3828,16 @@ </h2> There is no data for this report. +<h2 id="Contents_getContentNames" style="color: rgb(126,115,99); font-size: 11pt;"> + Content Name +</h2> + + There is no data for this report. +<h2 id="Contents_getContentPieces" style="color: rgb(126,115,99); font-size: 11pt;"> + Content Piece +</h2> + + There is no data for this report. <h2 id="Events_getCategory" style="color: rgb(126,115,99); font-size: 11pt;"> Event Categories </h2> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 5fecafa369..7891c7d5ca 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index 4bab18470e..cc28b360a0 100644 --- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -16,7 +16,7 @@ </actionDetails> <lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime> <actions>1</actions> - <userId>0</userId> + <userId /> </row> <row> <idVisit>2</idVisit> @@ -45,11 +45,11 @@ </actionDetails> <lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime> <actions>2</actions> - <userId>0</userId> + <userId /> </row> <row> <idVisit>3</idVisit> - <visitorId>6be121d126d93581</visitorId> + <visitorId>9395988394d4568d</visitorId> <actionDetails> <row> <type>action</type> @@ -58,17 +58,10 @@ <pageIdAction>6</pageIdAction> <serverTimePretty>Sat 6 Mar 13:16:33</serverTimePretty> <pageId>4</pageId> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> - </actionDetails> - <lastActionDateTime>2010-03-06 13:16:33</lastActionDateTime> - <actions>1</actions> - <userId>0</userId> - </row> - <row> - <idVisit>4</idVisit> - <visitorId>9395988394d4568d</visitorId> - <actionDetails> <row> <type>action</type> <url>http://example.org/index.htm</url> @@ -91,11 +84,11 @@ </row> </actionDetails> <lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime> - <actions>2</actions> + <actions>3</actions> <userId>email@example.com</userId> </row> <row> - <idVisit>5</idVisit> + <idVisit>4</idVisit> <visitorId>c9ade7a5a103b2ed</visitorId> <actionDetails> <row> @@ -113,7 +106,7 @@ <userId>new-email@example.com</userId> </row> <row> - <idVisit>6</idVisit> + <idVisit>5</idVisit> <visitorId>c9ade7a5a103b2ed</visitorId> <actionDetails> <row> @@ -168,7 +161,7 @@ <userId>new-email@example.com</userId> </row> <row> - <idVisit>7</idVisit> + <idVisit>6</idVisit> <visitorId>5e15b4d842cc294d</visitorId> <actionDetails> <row> @@ -183,10 +176,10 @@ </actionDetails> <lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime> <actions>1</actions> - <userId>0</userId> + <userId /> </row> <row> - <idVisit>8</idVisit> + <idVisit>7</idVisit> <visitorId>9395988394d4568d</visitorId> <actionDetails> <row> @@ -204,7 +197,7 @@ <userId>email@example.com</userId> </row> <row> - <idVisit>9</idVisit> + <idVisit>8</idVisit> <visitorId>72d4b5565daf5546</visitorId> <actionDetails> <row> 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 index fae6d03541..ca85e8dede 100644 --- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_uniq_visitors>5</nb_uniq_visitors> <nb_users>2</nb_users> - <nb_visits>7</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>1</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>1623</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>1.4</nb_actions_per_visit> - <avg_time_on_site>232</avg_time_on_site> + <bounce_count>3</bounce_count> + <sum_visit_length>1983</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>1.7</nb_actions_per_visit> + <avg_time_on_site>331</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 index fb725dd44a..7731535795 100644 --- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_uniq_visitors>6</nb_uniq_visitors> <nb_users>3</nb_users> - <nb_visits>9</nb_visits> + <nb_visits>8</nb_visits> <nb_actions>12</nb_actions> <nb_visits_converted>1</nb_visits_converted> - <bounce_count>6</bounce_count> - <sum_visit_length>1623</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>1.3</nb_actions_per_visit> - <avg_time_on_site>180</avg_time_on_site> + <bounce_count>5</bounce_count> + <sum_visit_length>1983</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>63%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>248</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 index fae6d03541..ca85e8dede 100644 --- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_uniq_visitors>5</nb_uniq_visitors> <nb_users>2</nb_users> - <nb_visits>7</nb_visits> + <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> <nb_visits_converted>1</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>1623</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>1.4</nb_actions_per_visit> - <avg_time_on_site>232</avg_time_on_site> + <bounce_count>3</bounce_count> + <sum_visit_length>1983</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>50%</bounce_rate> + <nb_actions_per_visit>1.7</nb_actions_per_visit> + <avg_time_on_site>331</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 index 27c9a85e60..84850ee827 100644 --- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>9</nb_visits> + <nb_visits>8</nb_visits> <nb_actions>12</nb_actions> <nb_visits_converted>1</nb_visits_converted> - <bounce_count>6</bounce_count> - <sum_visit_length>1623</sum_visit_length> - <max_actions>2</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>1.3</nb_actions_per_visit> - <avg_time_on_site>180</avg_time_on_site> + <bounce_count>5</bounce_count> + <sum_visit_length>1983</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>63%</bounce_rate> + <nb_actions_per_visit>1.5</nb_actions_per_visit> + <avg_time_on_site>248</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 76e1434585..c287c4bf01 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 52c78b5310..25ac19a415 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 @@ -51,7 +51,7 @@ <searches>0</searches> <actions>0</actions> - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -262,7 +262,7 @@ <searches>0</searches> <actions>3</actions> - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> 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 0bd82be2b7..30ae50eb8f 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -127,7 +127,7 @@ <searches>0</searches> <actions>3</actions> - <userId>0</userId> + <userId /> <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>0</visitConverted> @@ -457,7 +457,7 @@ <searches>0</searches> <actions>6</actions> - <userId>0</userId> + <userId /> <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> @@ -677,7 +677,7 @@ <searches>0</searches> <actions>4</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 1afd49dd9c..b5f59686c4 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 @@ -195,6 +195,16 @@ </a> </li> <li> + <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(68,68,68);"> + Content Name + </a> + </li> + <li> + <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(68,68,68);"> + Content Piece + </a> + </li> + <li> <a href="#Events_getCategory" style="text-decoration:none; color: rgb(68,68,68);"> Event Categories </a> @@ -498,7 +508,7 @@ <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 + 0 </td> </tr> @@ -4873,6 +4883,16 @@ </h2> There is no data for this report. +<h2 id="Contents_getContentNames" style="color: rgb(126,115,99); font-size: 11pt;"> + Content Name +</h2> + + There is no data for this report. +<h2 id="Contents_getContentPieces" style="color: rgb(126,115,99); font-size: 11pt;"> + Content Piece +</h2> + + There is no data for this report. <h2 id="Events_getCategory" style="color: rgb(126,115,99); font-size: 11pt;"> Event Categories </h2> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 0bb4a30c17..e8e37848fd 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 0a241b4081..8112427124 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 @@ -25,7 +25,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -140,7 +140,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> @@ -311,7 +311,7 @@ <searches>0</searches> <actions>3</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> 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 e75075382d..20546709ec 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 @@ -68,7 +68,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> @@ -184,7 +184,7 @@ <searches>0</searches> <actions>1</actions> - <userId>0</userId> + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> |