diff options
269 files changed, 4587 insertions, 13200 deletions
diff --git a/.gitmodules b/.gitmodules index e0f8daca6e..2e55cc7826 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,6 +56,9 @@ [submodule "plugins/Provider"] path = plugins/Provider url = https://github.com/matomo-org/plugin-Provider.git +[submodule "plugins/CustomVariables"] + path = plugins/CustomVariables + url = https://github.com/matomo-org/plugin-CustomVariables.git # Add new Plugin submodule above this line ^^ diff --git a/config/global.ini.php b/config/global.ini.php index bf85adc92c..6fe210525e 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -997,7 +997,6 @@ Plugins[] = CoreConsole Plugins[] = ScheduledReports Plugins[] = UserCountryMap Plugins[] = Live -Plugins[] = CustomVariables Plugins[] = PrivacyManager Plugins[] = ImageGraph Plugins[] = Annotations diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index e292a6fb05..5003f6f279 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -184,11 +184,6 @@ abstract class Action return $this->actionType; } - public function getCustomVariables() - { - return $this->request->getCustomVariables($scope = 'page'); - } - // custom_float column public function getCustomFloatValue() { diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 86c01baae1..7957021143 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -16,6 +16,7 @@ use Piwik\Exception\InvalidRequestParameterException; use Piwik\Piwik; use Piwik\Plugin\Dimension\ConversionDimension; use Piwik\Plugin\Dimension\VisitDimension; +use Piwik\Plugin\Manager; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Plugins\Events\Actions\ActionEvent; use Piwik\Tracker; @@ -275,28 +276,31 @@ class GoalManager public function recordGoals(VisitProperties $visitProperties, Request $request) { $visitorInformation = $visitProperties->getProperties(); - $visitCustomVariables = $request->getMetadata('CustomVariables', 'visitCustomVariables') ?: array(); /** @var Action $action */ $action = $request->getMetadata('Actions', 'action'); $goal = $this->getGoalFromVisitor($visitProperties, $request, $action); - // Copy Custom Variables from Visit row to the Goal conversion - // Otherwise, set the Custom Variables found in the cookie sent with this request - $goal += $visitCustomVariables; - $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); - - for ($i = 1; $i <= $maxCustomVariables; $i++) { - if (isset($visitorInformation['custom_var_k' . $i]) - && strlen($visitorInformation['custom_var_k' . $i]) - ) { - $goal['custom_var_k' . $i] = $visitorInformation['custom_var_k' . $i]; - } - if (isset($visitorInformation['custom_var_v' . $i]) - && strlen($visitorInformation['custom_var_v' . $i]) - ) { - $goal['custom_var_v' . $i] = $visitorInformation['custom_var_v' . $i]; + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + // @todo move this to CustomVariables plugin if possible + // Copy Custom Variables from Visit row to the Goal conversion + // Otherwise, set the Custom Variables found in the cookie sent with this request + $visitCustomVariables = $request->getMetadata('CustomVariables', 'visitCustomVariables') ?: array(); + $goal += $visitCustomVariables; + $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); + + for ($i = 1; $i <= $maxCustomVariables; $i++) { + if (isset($visitorInformation['custom_var_k' . $i]) + && strlen($visitorInformation['custom_var_k' . $i]) + ) { + $goal['custom_var_k' . $i] = $visitorInformation['custom_var_k' . $i]; + } + if (isset($visitorInformation['custom_var_v' . $i]) + && strlen($visitorInformation['custom_var_v' . $i]) + ) { + $goal['custom_var_v' . $i] = $visitorInformation['custom_var_v' . $i]; + } } } diff --git a/core/Tracker/Model.php b/core/Tracker/Model.php index 684ed37fe2..f7bcee7dc1 100644 --- a/core/Tracker/Model.php +++ b/core/Tracker/Model.php @@ -369,11 +369,9 @@ class Model public function findVisitor($idSite, $configId, $idVisitor, $userId, $fieldsToRead, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead) { - $selectCustomVariables = ''; - $selectFields = implode(', ', $fieldsToRead); - $select = "SELECT $selectFields $selectCustomVariables "; + $select = "SELECT $selectFields "; $from = "FROM " . Common::prefixTable('log_visit'); // Two use cases: diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 591ccc0971..719db7e173 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -13,13 +13,11 @@ use Piwik\Common; use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Cookie; -use Piwik\DbHelper; use Piwik\Exception\InvalidRequestParameterException; use Piwik\Exception\UnexpectedWebsiteFoundException; use Piwik\IP; use Matomo\Network\IPUtils; use Piwik\Piwik; -use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Plugins\UsersManager\UsersManager; use Piwik\ProxyHttp; use Piwik\Tracker; @@ -543,69 +541,6 @@ class Request return Common::getRequestVar('ua', $default, 'string', $this->params); } - public function getCustomVariablesInVisitScope() - { - return $this->getCustomVariables('visit'); - } - - public function getCustomVariablesInPageScope() - { - return $this->getCustomVariables('page'); - } - - /** - * @deprecated since Piwik 2.10.0. Use Request::getCustomVariablesInPageScope() or Request::getCustomVariablesInVisitScope() instead. - * When we "remove" this method we will only set visibility to "private" and pass $parameter = _cvar|cvar as an argument instead of $scope - */ - public function getCustomVariables($scope) - { - if ($scope == 'visit') { - $parameter = '_cvar'; - } else { - $parameter = 'cvar'; - } - - $cvar = Common::getRequestVar($parameter, '', 'json', $this->params); - $customVar = Common::unsanitizeInputValues($cvar); - - if (!is_array($customVar)) { - return array(); - } - - $customVariables = array(); - $maxCustomVars = CustomVariables::getNumUsableCustomVariables(); - - foreach ($customVar as $id => $keyValue) { - $id = (int)$id; - - if ($id < 1 - || $id > $maxCustomVars - || count($keyValue) != 2 - || (!is_string($keyValue[0]) && !is_numeric($keyValue[0]) - || (!is_string($keyValue[1]) && !is_numeric($keyValue[1]))) - ) { - Common::printDebug("Invalid custom variables detected (id=$id)"); - continue; - } - - if (strlen($keyValue[1]) == 0) { - $keyValue[1] = ""; - } - // We keep in the URL when Custom Variable have empty names - // and values, as it means they can be deleted server side - - $customVariables['custom_var_k' . $id] = self::truncateCustomVariable($keyValue[0]); - $customVariables['custom_var_v' . $id] = self::truncateCustomVariable($keyValue[1]); - } - - return $customVariables; - } - - public static function truncateCustomVariable($input) - { - return substr(trim($input), 0, CustomVariables::getMaxLengthCustomVariables()); - } - protected function shouldUseThirdPartyCookie() { return (bool)Config::getInstance()->Tracker['use_third_party_id_cookie']; diff --git a/core/Tracker/TrackerCodeGenerator.php b/core/Tracker/TrackerCodeGenerator.php index 5758af8619..f736ceb972 100644 --- a/core/Tracker/TrackerCodeGenerator.php +++ b/core/Tracker/TrackerCodeGenerator.php @@ -11,6 +11,7 @@ namespace Piwik\Tracker; use Piwik\Common; use Piwik\DbHelper; use Piwik\Piwik; +use Piwik\Plugin\Manager; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\SettingsPiwik; @@ -88,41 +89,44 @@ class TrackerCodeGenerator $options .= ' _paq.push(["enableCrossDomainLinking"]);' . "\n"; } - $maxCustomVars = CustomVariables::getNumUsableCustomVariables(); + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $maxCustomVars = CustomVariables::getNumUsableCustomVariables(); - if ($visitorCustomVariables && count($visitorCustomVariables) > 0) { - $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each visitor' . "\n"; - $index = 1; - foreach ($visitorCustomVariables as $visitorCustomVariable) { - if (empty($visitorCustomVariable)) { - continue; - } + if ($visitorCustomVariables && count($visitorCustomVariables) > 0) { + $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each visitor' . "\n"; + $index = 1; + foreach ($visitorCustomVariables as $visitorCustomVariable) { + if (empty($visitorCustomVariable)) { + continue; + } - $options .= sprintf( - ' _paq.push(["setCustomVariable", %d, %s, %s, "visit"]);%s', - $index++, - json_encode($visitorCustomVariable[0]), - json_encode($visitorCustomVariable[1]), - "\n" - ); + $options .= sprintf( + ' _paq.push(["setCustomVariable", %d, %s, %s, "visit"]);%s', + $index++, + json_encode($visitorCustomVariable[0]), + json_encode($visitorCustomVariable[1]), + "\n" + ); + } } - } - if ($pageCustomVariables && count($pageCustomVariables) > 0) { - $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each action (page view, download, click, site search)' . "\n"; - $index = 1; - foreach ($pageCustomVariables as $pageCustomVariable) { - if (empty($pageCustomVariable)) { - continue; + if ($pageCustomVariables && count($pageCustomVariables) > 0) { + $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each action (page view, download, click, site search)' . "\n"; + $index = 1; + foreach ($pageCustomVariables as $pageCustomVariable) { + if (empty($pageCustomVariable)) { + continue; + } + $options .= sprintf( + ' _paq.push(["setCustomVariable", %d, %s, %s, "page"]);%s', + $index++, + json_encode($pageCustomVariable[0]), + json_encode($pageCustomVariable[1]), + "\n" + ); } - $options .= sprintf( - ' _paq.push(["setCustomVariable", %d, %s, %s, "page"]);%s', - $index++, - json_encode($pageCustomVariable[0]), - json_encode($pageCustomVariable[1]), - "\n" - ); } } + if ($customCampaignNameQueryParam) { $options .= ' _paq.push(["setCampaignNameKey", ' . json_encode($customCampaignNameQueryParam) . ']);' . "\n"; diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index 10fb9b60b9..7b4efdd0c1 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -11,7 +11,6 @@ namespace Piwik\Tracker; use Piwik\Common; use Piwik\EventDispatcher; use Piwik\Plugin\Dimension\VisitDimension; -use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Tracker\Visit\VisitProperties; /** @@ -282,11 +281,6 @@ class VisitorRecognizer array_unshift($fields, 'visit_first_action_time'); array_unshift($fields, 'visit_last_action_time'); - for ($index = 1; $index <= CustomVariables::getNumUsableCustomVariables(); $index++) { - $fields[] = 'custom_var_k' . $index; - $fields[] = 'custom_var_v' . $index; - } - $this->visitFieldsToSelect = array_unique($fields); } diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php index 658743417c..fa426a25b7 100644 --- a/core/Updates/4.0.0-b1.php +++ b/core/Updates/4.0.0-b1.php @@ -12,6 +12,7 @@ namespace Piwik\Updates; use Piwik\DataAccess\TableMetadata; use Piwik\Date; use Piwik\DbHelper; +use Piwik\Plugin\Manager; use Piwik\Plugins\CoreHome\Columns\VisitorSecondsSinceFirst; use Piwik\Plugins\CoreHome\Columns\VisitorSecondsSinceOrder; use Piwik\Plugins\UsersManager\Model; @@ -146,10 +147,11 @@ class Updates_4_0_0_b1 extends PiwikUpdates } } - // init new site search fields - $visitActionTable = Common::prefixTable('log_link_visit_action'); - $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_cat = custom_var_v4 WHERE custom_var_k4 = '_pk_scat'"); - $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_count = custom_var_v5 WHERE custom_var_k5 = '_pk_scount'"); + if (Manager::getInstance()->isPluginInstalled('CustomVariables')) { + $visitActionTable = Common::prefixTable('log_link_visit_action'); + $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_cat = custom_var_v4 WHERE custom_var_k4 = '_pk_scat'"); + $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_count = custom_var_v5 WHERE custom_var_k5 = '_pk_scount'"); + } if ($this->usesGeoIpLegacyLocationProvider()) { // activate GeoIp2 plugin for users still using GeoIp2 Legacy (others might have it disabled on purpose) diff --git a/plugins/API/SegmentMetadata.php b/plugins/API/SegmentMetadata.php index 2dc528621f..350b978e5a 100644 --- a/plugins/API/SegmentMetadata.php +++ b/plugins/API/SegmentMetadata.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\API; use Piwik\Category\CategoryList; -use Piwik\Columns\Dimension; use Piwik\Piwik; use Piwik\Plugin\Segment; use Piwik\Segment\SegmentsList; diff --git a/plugins/API/tests/System/AutoSuggestAPITest.php b/plugins/API/tests/System/AutoSuggestAPITest.php index 12582f1154..25650db650 100644 --- a/plugins/API/tests/System/AutoSuggestAPITest.php +++ b/plugins/API/tests/System/AutoSuggestAPITest.php @@ -14,14 +14,11 @@ use Piwik\ArchiveProcessor\Rules; use Piwik\Cache as PiwikCache; use Piwik\Columns\Dimension; use Piwik\Common; -use Piwik\DataTable\Manager; use Piwik\Date; use Piwik\Option; use Piwik\Plugins\API\API; use Piwik\Plugins\CustomVariables\Columns\CustomVariableName; use Piwik\Plugins\CustomVariables\Columns\CustomVariableValue; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP; use Piwik\Tests\Fixtures\ManyVisitsWithGeoIPAndEcommerce; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tracker\Cache; @@ -74,7 +71,6 @@ class AutoSuggestAPITest extends SystemTestCase */ public function testApi($api, $params) { - // Refresh cache for CustomVariables\Model Cache::clearCacheGeneral(); $this->runApiTests($api, $params); @@ -119,7 +115,6 @@ class AutoSuggestAPITest extends SystemTestCase )); } - // Refresh cache for CustomVariables\Model Cache::clearCacheGeneral(); // disable browser archiving so the APIs are used Option::set(Rules::OPTION_BROWSER_TRIGGER_ARCHIVING, 0); @@ -248,7 +243,6 @@ class AutoSuggestAPITest extends SystemTestCase public static function getSegmentsMetadata($onlyWithSuggestedValuesApi = false) { - // Refresh cache for CustomVariables\Model Cache::clearCacheGeneral(); PiwikCache::getTransientCache()->flushAll(); @@ -265,7 +259,7 @@ class AutoSuggestAPITest extends SystemTestCase if ($dimension instanceof CustomVariableName || $dimension instanceof CustomVariableValue ) { - continue; // added manually below + continue; // ignore custom variables dimensions as they are tested in the plugin } foreach ($dimension->getSegments() as $segment) { @@ -278,12 +272,6 @@ class AutoSuggestAPITest extends SystemTestCase $segments[] = $segment->getSegment(); } } - - // add CustomVariables manually since the data provider may not have access to the DB - for ($i = 1; $i != Model::DEFAULT_CUSTOM_VAR_COUNT + 1; ++$i) { - $segments = array_merge($segments, self::getCustomVariableSegments($i)); - } - $segments = array_merge($segments, self::getCustomVariableSegments()); } catch (\Exception $ex) { $exception = $ex; @@ -299,24 +287,6 @@ class AutoSuggestAPITest extends SystemTestCase return $segments; } - private static function getCustomVariableSegments($columnIndex = null) - { - $result = array( - 'customVariableName', - 'customVariableValue', - 'customVariablePageName', - 'customVariablePageValue', - ); - - if ($columnIndex !== null) { - foreach ($result as &$name) { - $name = $name . $columnIndex; - } - } - - return $result; - } - public static function getPathToTestDirectory() { return dirname(__FILE__); diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 7041b927dd..50f6f02561 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -121,8 +121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -139,6 +137,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -357,16 +357,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -383,6 +373,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -406,6 +406,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -416,7 +417,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -515,16 +515,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -541,6 +531,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -738,16 +738,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -764,6 +754,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -796,6 +796,7 @@ <row>Category3</row> <row>Category7</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -806,7 +807,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -905,16 +905,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -931,6 +921,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1178,16 +1178,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1204,6 +1194,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1227,6 +1227,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1237,7 +1238,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1336,16 +1336,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1362,6 +1352,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1559,16 +1559,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1585,6 +1575,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1608,6 +1608,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1618,7 +1619,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1717,16 +1717,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1743,6 +1733,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1961,16 +1961,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1987,6 +1977,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> @@ -2019,6 +2019,7 @@ <row>Category3</row> <row>Category4</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -2029,7 +2030,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2128,16 +2128,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2154,6 +2144,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> @@ -2380,16 +2380,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2406,6 +2396,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -2632,8 +2632,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2650,6 +2648,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2673,6 +2673,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -2683,7 +2684,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2782,16 +2782,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2808,6 +2798,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -2831,6 +2831,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -2841,7 +2842,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2940,16 +2940,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2966,6 +2956,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -3184,16 +3184,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3210,6 +3200,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> @@ -3428,8 +3428,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3446,6 +3444,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3469,6 +3469,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -3479,7 +3480,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3578,16 +3578,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3604,6 +3594,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> @@ -3627,6 +3627,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -3637,7 +3638,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3736,16 +3736,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3762,6 +3752,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> @@ -3959,16 +3959,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3985,6 +3975,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -4182,16 +4182,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4208,6 +4198,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -4405,8 +4405,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4423,6 +4421,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4620,16 +4620,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4646,6 +4636,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -4678,6 +4678,7 @@ <row>Category3</row> <row>Category1</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -4688,7 +4689,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4787,16 +4787,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4813,6 +4803,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -4845,6 +4845,7 @@ <row>Category3</row> <row>Category1</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -4855,7 +4856,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4954,16 +4954,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4980,6 +4970,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -5012,6 +5012,7 @@ <row>Category3</row> <row>Category1</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -5022,7 +5023,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5121,16 +5121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5147,6 +5137,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -5179,6 +5179,7 @@ <row>Category3</row> <row>Category1</row> </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -5189,7 +5190,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5288,16 +5288,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5314,6 +5304,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -5561,16 +5561,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5587,6 +5577,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -5834,16 +5834,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5860,6 +5850,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -6107,8 +6107,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6125,6 +6123,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6372,16 +6372,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6398,6 +6388,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -6421,6 +6421,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -6431,7 +6432,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6530,16 +6530,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6556,6 +6546,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -6579,6 +6579,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -6589,7 +6590,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6688,16 +6688,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6714,6 +6704,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -6737,6 +6737,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -6747,7 +6748,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6846,16 +6846,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6872,6 +6862,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -6895,6 +6895,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -6905,7 +6906,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7004,16 +7004,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7030,5 +7020,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index d301db94df..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 1 name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml deleted file mode 100644 index 04f59252bd..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>30</nb_visits> - <nb_actions>76</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>21091</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>703</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 3b00ef3096..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 5 name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml deleted file mode 100644 index 04f59252bd..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>30</nb_visits> - <nb_actions>76</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>21091</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>703</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 9c10ae8b37..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 1 name</row> - <row>Cvar 5 name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml deleted file mode 100644 index 04f59252bd..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>30</nb_visits> - <nb_actions>76</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>21091</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>703</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 8698fbbd4d..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 2 PAGE name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml deleted file mode 100644 index 339a0f2a62..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>17</nb_visits> - <nb_actions>17</nb_actions> - <nb_visits_converted>17</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>8</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml deleted file mode 100644 index d8bcdace18..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <nb_visits_converted>0</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>0</sum_visit_length> - <max_actions>0</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>0</nb_actions_per_visit> - <avg_time_on_site>0</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 3e34700999..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 5 PAGE name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml deleted file mode 100644 index 339a0f2a62..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>17</nb_visits> - <nb_actions>17</nb_actions> - <nb_visits_converted>17</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>8</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 769a3cf046..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar 2 PAGE name</row> - <row>Cvar 5 PAGE name</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml deleted file mode 100644 index 339a0f2a62..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>17</nb_visits> - <nb_actions>17</nb_actions> - <nb_visits_converted>17</nb_visits_converted> - <bounce_count>17</bounce_count> - <sum_visit_length>8</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 79849260d4..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar2 PAGE value is 0</row> - <row>Cvar2 PAGE value is 1</row> - <row>Cvar2 PAGE value is 2</row> - <row>Cvar2 PAGE value is 3</row> - <row>Cvar2 PAGE value is 4</row> - <row>Cvar2 PAGE value is 5</row> - <row>Cvar2 PAGE value is 6</row> - <row>Cvar2 PAGE value is 7</row> - <row>Cvar2 PAGE value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml deleted file mode 100644 index 88dae8fd6c..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>4</nb_visits_converted> - <bounce_count>4</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml deleted file mode 100644 index 4be0b7b205..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>9</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>9</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>14599</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>5</nb_actions_per_visit> - <avg_time_on_site>1622</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 9ce36b0f97..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar5 PAGE value is 0</row> - <row>Cvar5 PAGE value is 1</row> - <row>Cvar5 PAGE value is 2</row> - <row>Cvar5 PAGE value is 3</row> - <row>Cvar5 PAGE value is 4</row> - <row>Cvar5 PAGE value is 5</row> - <row>Cvar5 PAGE value is 6</row> - <row>Cvar5 PAGE value is 7</row> - <row>Cvar5 PAGE value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml deleted file mode 100644 index 88dae8fd6c..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>4</nb_visits_converted> - <bounce_count>4</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index eb1502c2fe..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar2 PAGE value is 0</row> - <row>Cvar2 PAGE value is 1</row> - <row>Cvar5 PAGE value is 0</row> - <row>Cvar5 PAGE value is 1</row> - <row>Cvar2 PAGE value is 2</row> - <row>Cvar2 PAGE value is 3</row> - <row>Cvar5 PAGE value is 2</row> - <row>Cvar5 PAGE value is 3</row> - <row>Cvar2 PAGE value is 4</row> - <row>Cvar2 PAGE value is 5</row> - <row>Cvar2 PAGE value is 6</row> - <row>Cvar2 PAGE value is 7</row> - <row>Cvar2 PAGE value is 8</row> - <row>Cvar5 PAGE value is 4</row> - <row>Cvar5 PAGE value is 5</row> - <row>Cvar5 PAGE value is 6</row> - <row>Cvar5 PAGE value is 7</row> - <row>Cvar5 PAGE value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml deleted file mode 100644 index 88dae8fd6c..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>4</nb_visits_converted> - <bounce_count>4</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/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 641de91df2..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar1 value is 0</row> - <row>Cvar1 value is 1</row> - <row>Cvar1 value is 2</row> - <row>Cvar1 value is 3</row> - <row>Cvar1 value is 4</row> - <row>Cvar1 value is 5</row> - <row>Cvar1 value is 6</row> - <row>Cvar1 value is 7</row> - <row>Cvar1 value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml deleted file mode 100644 index 7383e9718d..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>7</nb_visits> - <nb_actions>19</nb_actions> - <nb_visits_converted>7</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>4869</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>696</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index 4ad457f263..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar5 value is 0</row> - <row>Cvar5 value is 1</row> - <row>Cvar5 value is 2</row> - <row>Cvar5 value is 3</row> - <row>Cvar5 value is 4</row> - <row>Cvar5 value is 5</row> - <row>Cvar5 value is 6</row> - <row>Cvar5 value is 7</row> - <row>Cvar5 value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml deleted file mode 100644 index 7383e9718d..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>7</nb_visits> - <nb_actions>19</nb_actions> - <nb_visits_converted>7</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>4869</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>696</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml deleted file mode 100644 index bf4f5c750d..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Cvar1 value is 0</row> - <row>Cvar1 value is 1</row> - <row>Cvar5 value is 0</row> - <row>Cvar5 value is 1</row> - <row>Cvar1 value is 2</row> - <row>Cvar1 value is 3</row> - <row>Cvar5 value is 2</row> - <row>Cvar5 value is 3</row> - <row>Cvar1 value is 4</row> - <row>Cvar1 value is 5</row> - <row>Cvar1 value is 6</row> - <row>Cvar1 value is 7</row> - <row>Cvar1 value is 8</row> - <row>Cvar5 value is 4</row> - <row>Cvar5 value is 5</row> - <row>Cvar5 value is 6</row> - <row>Cvar5 value is 7</row> - <row>Cvar5 value is 8</row> -</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml deleted file mode 100644 index 7383e9718d..0000000000 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_visits>7</nb_visits> - <nb_actions>19</nb_actions> - <nb_visits_converted>7</nb_visits_converted> - <bounce_count>4</bounce_count> - <sum_visit_length>4869</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>57%</bounce_rate> - <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>696</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 8153eaa1b4..dde5c631d1 100755 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -374,8 +374,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -384,6 +382,8 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -759,8 +759,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -777,5 +775,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 8153eaa1b4..dde5c631d1 100755 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -374,8 +374,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -384,6 +382,8 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -759,8 +759,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -777,5 +775,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 8153eaa1b4..dde5c631d1 100755 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -374,8 +374,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -384,6 +382,8 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -759,8 +759,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -777,5 +775,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 8153eaa1b4..dde5c631d1 100755 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -374,8 +374,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -384,6 +382,8 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -759,8 +759,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -777,5 +775,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 8153eaa1b4..dde5c631d1 100755 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -374,8 +374,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -384,6 +382,8 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -759,8 +759,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -777,5 +775,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 3f706ab0ec..fb3456edb5 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -218,7 +218,11 @@ class Controller extends ControllerAdmin $view->defaultReportSiteName = Site::getNameFor($view->idSite); $view->defaultSiteRevenue = Site::getCurrencySymbolFor($view->idSite); - $view->maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); + $view->maxCustomVariables = 0; + + if (Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) { + $view->maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); + } $view->defaultSite = array('id' => $view->idSite, 'name' => $view->defaultReportSiteName); diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index d487ab5c44..859cd5f375 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -22,13 +22,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -125,11 +125,11 @@ <visitLocalHour>21</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -153,13 +153,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -256,11 +256,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -284,13 +284,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -387,11 +387,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -415,13 +415,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -518,11 +518,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -546,13 +546,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -649,11 +649,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -677,13 +677,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -780,11 +780,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -808,13 +808,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -911,11 +911,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -939,13 +939,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1042,11 +1042,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1070,13 +1070,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1173,11 +1173,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1201,13 +1201,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1304,10 +1304,10 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index 9b3fbdb290..a8de9feb4d 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -24,13 +24,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -64,13 +64,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -89,13 +89,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -114,13 +114,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -139,13 +139,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -164,13 +164,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -189,13 +189,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -214,13 +214,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -239,13 +239,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -262,13 +262,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -350,11 +350,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -378,13 +378,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -481,11 +481,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -514,21 +514,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName3>_pks</customVariablePageName3> - <customVariablePageValue3>SKU2</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>_pkn</customVariablePageName4> - <customVariablePageValue4>PRODUCT name</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -625,12 +617,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -647,6 +633,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -670,13 +662,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -773,12 +765,6 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>Forum status</customVariableName3> - <customVariableValue3>Anonymous</customVariableValue3> - </row> - </customVariables> <resolution>1280x800</resolution> <plugins>cookie, flash, java, pdf, windowsmedia</plugins> <pluginsIcons> @@ -803,6 +789,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -826,13 +818,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -929,15 +921,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -961,13 +953,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1064,15 +1056,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1098,13 +1090,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1136,13 +1128,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -1224,15 +1216,15 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1258,13 +1250,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.js</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -1283,13 +1275,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.css</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -1306,13 +1298,13 @@ <title>Download</title> <subtitle>http://piwik.net/other.png</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1394,15 +1386,15 @@ <visitLocalHour>18</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1426,13 +1418,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1529,15 +1521,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Bot</customVariableName1> <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1561,13 +1553,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1664,14 +1656,14 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> </result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml index d487ab5c44..859cd5f375 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -22,13 +22,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -125,11 +125,11 @@ <visitLocalHour>21</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -153,13 +153,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -256,11 +256,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -284,13 +284,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -387,11 +387,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -415,13 +415,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -518,11 +518,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -546,13 +546,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -649,11 +649,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -677,13 +677,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -780,11 +780,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -808,13 +808,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -911,11 +911,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -939,13 +939,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1042,11 +1042,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1070,13 +1070,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1173,11 +1173,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1201,13 +1201,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1304,10 +1304,10 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index 9b3fbdb290..a8de9feb4d 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -24,13 +24,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -64,13 +64,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -89,13 +89,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -114,13 +114,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -139,13 +139,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -164,13 +164,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -189,13 +189,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -214,13 +214,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -239,13 +239,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -262,13 +262,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -350,11 +350,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -378,13 +378,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -481,11 +481,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -514,21 +514,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName3>_pks</customVariablePageName3> - <customVariablePageValue3>SKU2</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>_pkn</customVariablePageName4> - <customVariablePageValue4>PRODUCT name</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -625,12 +617,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -647,6 +633,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -670,13 +662,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -773,12 +765,6 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>Forum status</customVariableName3> - <customVariableValue3>Anonymous</customVariableValue3> - </row> - </customVariables> <resolution>1280x800</resolution> <plugins>cookie, flash, java, pdf, windowsmedia</plugins> <pluginsIcons> @@ -803,6 +789,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -826,13 +818,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -929,15 +921,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -961,13 +953,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1064,15 +1056,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1098,13 +1090,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1136,13 +1128,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -1224,15 +1216,15 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1258,13 +1250,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.js</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -1283,13 +1275,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.css</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -1306,13 +1298,13 @@ <title>Download</title> <subtitle>http://piwik.net/other.png</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1394,15 +1386,15 @@ <visitLocalHour>18</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1426,13 +1418,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1529,15 +1521,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Bot</customVariableName1> <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -1561,13 +1553,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1664,14 +1656,14 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> </result>
\ No newline at end of file diff --git a/plugins/CustomDimensions/tests/System/expected/test___Live.getLastVisitsDetails_year.xml b/plugins/CustomDimensions/tests/System/expected/test___Live.getLastVisitsDetails_year.xml index 5833899e61..8aae0380c8 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___Live.getLastVisitsDetails_year.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___Live.getLastVisitsDetails_year.xml @@ -125,8 +125,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>345240</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -146,6 +144,8 @@ <dimension1 /> <dimension2 /> <dimension6 /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -272,8 +272,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -293,6 +291,8 @@ <dimension1>value1</dimension1> <dimension2>value2</dimension2> <dimension6 /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -419,8 +419,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>172440</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -440,6 +438,8 @@ <dimension1 /> <dimension2 /> <dimension6 /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -608,8 +608,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -629,6 +627,8 @@ <dimension1>value5 1</dimension1> <dimension2>en_US</dimension2> <dimension6>value6</dimension6> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -755,8 +755,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -776,5 +774,7 @@ <dimension1 /> <dimension2 /> <dimension6 /> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/CustomVariables b/plugins/CustomVariables new file mode 160000 +Subproject 9b96b7eff455fe63fd2247dbc6a18416905d0da diff --git a/plugins/CustomVariables/.gitignore b/plugins/CustomVariables/.gitignore deleted file mode 100644 index c8c9480010..0000000000 --- a/plugins/CustomVariables/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tests/System/processed/*xml
\ No newline at end of file diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php deleted file mode 100644 index 431692fe41..0000000000 --- a/plugins/CustomVariables/API.php +++ /dev/null @@ -1,181 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\API\Request; -use Piwik\Archive; -use Piwik\Container\StaticContainer; -use Piwik\DataTable; -use Piwik\Date; -use Piwik\Metrics; -use Piwik\Piwik; -use Piwik\Plugins\Actions\Actions\ActionSiteSearch; - -/** - * The Custom Variables API lets you access reports for your <a href='http://matomo.org/docs/custom-variables/' rel='noreferrer' target='_blank'>Custom Variables</a> names and values. - * - * @method static \Piwik\Plugins\CustomVariables\API getInstance() - */ -class API extends \Piwik\Plugin\API -{ - /** - * @param int $idSite - * @param string $period - * @param Date $date - * @param string $segment - * @param bool $expanded - * @param int $idSubtable - * - * @return DataTable|DataTable\Map - */ - protected function getDataTable($idSite, $period, $date, $segment, $expanded, $flat, $idSubtable) - { - $dataTable = Archive::createDataTableFromArchive(Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable); - $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors'); - - if ($flat) { - $dataTable->filterSubtables('Sort', array(Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); - $dataTable->queueFilterSubtables('ColumnDelete', 'nb_uniq_visitors'); - } - - return $dataTable; - } - - /** - * @param int $idSite - * @param string $period - * @param Date $date - * @param string|bool $segment - * @param bool $expanded - * @param bool $_leavePiwikCoreVariables - * @param bool $flat - * - * @return DataTable|DataTable\Map - */ - public function getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false, $_leavePiwikCoreVariables = false, $flat = false) - { - Piwik::checkUserHasViewAccess($idSite); - - $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded, $flat, $idSubtable = null); - - if ($dataTable instanceof DataTable - && !$_leavePiwikCoreVariables - ) { - $mapping = self::getReservedCustomVariableKeys(); - foreach ($mapping as $name) { - $row = $dataTable->getRowFromLabel($name); - if ($row) { - $dataTable->deleteRow($dataTable->getRowIdFromLabel($name)); - } - } - } - - - if ($flat) { - $dataTable->filterSubtables('Piwik\Plugins\CustomVariables\DataTable\Filter\CustomVariablesValuesFromNameId'); - } else { - $dataTable->filter('AddSegmentByLabel', array('customVariableName')); - } - - return $dataTable; - } - - /** - * @ignore - * @return array - */ - public static function getReservedCustomVariableKeys() - { - // Note: _pk_scat and _pk_scount has been used for site search, but aren't in use anymore - return array('_pks', '_pkn', '_pkc', '_pkp', '_pk_scat', '_pk_scount'); - } - - /** - * @param int $idSite - * @param string $period - * @param Date $date - * @param int $idSubtable - * @param string|bool $segment - * @param bool $_leavePriceViewedColumn - * - * @return DataTable|DataTable\Map - */ - public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = false) - { - Piwik::checkUserHasViewAccess($idSite); - - $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable); - - if (!$_leavePriceViewedColumn) { - $dataTable->deleteColumn('price_viewed'); - } else { - // Hack Ecommerce product price tracking to display correctly - $dataTable->renameColumn('price_viewed', 'price'); - } - - $dataTable->filter('Piwik\Plugins\CustomVariables\DataTable\Filter\CustomVariablesValuesFromNameId'); - - return $dataTable; - } - - /** - * Get a list of all available custom variable slots (scope + index) and which names have been used so far in - * each slot since the beginning of the website. - * - * @param int $idSite - * @return array - */ - public function getUsagesOfSlots($idSite) - { - Piwik::checkUserHasAdminAccess($idSite); - - $numVars = CustomVariables::getNumUsableCustomVariables(); - - $usedCustomVariables = array( - 'visit' => array_fill(1, $numVars, array()), - 'page' => array_fill(1, $numVars, array()), - ); - - /** @var DataTable $customVarUsages */ - $today = StaticContainer::get('CustomVariables.today'); - $date = '2008-12-12,' . $today; - $customVarUsages = Request::processRequest('CustomVariables.getCustomVariables', - array('idSite' => $idSite, 'period' => 'range', 'date' => $date, - 'format' => 'original') - ); - - foreach ($customVarUsages->getRows() as $row) { - $slots = $row->getMetadata('slots'); - - if (!empty($slots)) { - foreach ($slots as $slot) { - $usedCustomVariables[$slot['scope']][$slot['index']][] = array( - 'name' => $row->getColumn('label'), - 'nb_visits' => $row->getColumn('nb_visits'), - 'nb_actions' => $row->getColumn('nb_actions'), - ); - } - } - } - - $grouped = array(); - foreach ($usedCustomVariables as $scope => $scopes) { - foreach ($scopes as $index => $cvars) { - $grouped[] = array( - 'scope' => $scope, - 'index' => $index, - 'usages' => $cvars - ); - } - } - - return $grouped; - } -} - diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php deleted file mode 100644 index b8970b27e1..0000000000 --- a/plugins/CustomVariables/Archiver.php +++ /dev/null @@ -1,276 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Config; -use Piwik\DataAccess\LogAggregator; -use Piwik\DataArray; -use Piwik\DataTable; -use Piwik\DbHelper; -use Piwik\Metrics; -use Piwik\Tracker\GoalManager; -use Piwik\Tracker; - -class Archiver extends \Piwik\Plugin\Archiver -{ - const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined"; - const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName'; - - // Ecommerce reports use custom variables. - // We specifically set the limits high to get accurate Ecommerce reports - const MAX_ROWS_WHEN_ECOMMERCE = 50000; - - /** - * @var DataArray - */ - protected $dataArray; - protected $maximumRowsInDataTableLevelZero; - protected $maximumRowsInSubDataTable; - protected $newEmptyRow; - - private $metadata = array(); - private $metadataFlat = array(); - - function __construct($processor) - { - parent::__construct($processor); - - if ($processor->getParams()->getSite()->isEcommerceEnabled()) { - $this->maximumRowsInDataTableLevelZero = self::MAX_ROWS_WHEN_ECOMMERCE; - $this->maximumRowsInSubDataTable = self::MAX_ROWS_WHEN_ECOMMERCE; - } else { - $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_custom_variables']; - $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_variables']; - } - } - - public function aggregateMultipleReports() - { - $columnsAggregationOperation = array('slots' => 'uniquearraymerge'); - - $this->getProcessor()->aggregateDataTableRecords( - self::CUSTOM_VARIABLE_RECORD_NAME, - $this->maximumRowsInDataTableLevelZero, - $this->maximumRowsInSubDataTable, - $columnToSort = Metrics::INDEX_NB_VISITS, - $columnsAggregationOperation, - $columnsToRenameAfterAggregation = null, - $countRowsRecursive = array()); - } - - public function aggregateDayReport() - { - $this->dataArray = new DataArray(); - - $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); - for ($i = 1; $i <= $maxCustomVariables; $i++) { - $this->aggregateCustomVariable($i); - } - - $this->removeVisitsMetricsFromActionsAggregate(); - $this->dataArray->enrichMetricsWithConversions(); - $table = $this->dataArray->asDataTable(); - - foreach ($table->getRows() as $row) { - $label = $row->getColumn('label'); - if (!empty($this->metadata[$label])) { - foreach ($this->metadata[$label] as $name => $value) { - $row->addMetadata($name, $value); - } - } - } - - $blob = $table->getSerialized( - $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, - $columnToSort = Metrics::INDEX_NB_VISITS - ); - - $this->getProcessor()->insertBlobRecord(self::CUSTOM_VARIABLE_RECORD_NAME, $blob); - } - - protected function aggregateCustomVariable($slot) - { - $keyField = "custom_var_k" . $slot; - $valueField = "custom_var_v" . $slot; - $where = "%s.$keyField != ''"; - $dimensions = array($keyField, $valueField); - - $query = $this->getLogAggregator()->queryVisitsByDimension($dimensions, $where); - $this->aggregateFromVisits($query, $keyField, $valueField); - - // IF we query Custom Variables scope "page" either: Product SKU, Product Name, - // then we also query the "Product page view" price which was possibly recorded. - $additionalSelects = false; - - // Before Matomo 4.0.0 ecommerce views were tracked in custom variables - // So if Matomo was installed before still try to archive it the old way, as old data might be archived - if (version_compare(DbHelper::getInstallVersion(),'4.0.0-b2', '<') && in_array($slot, array(3, 4, 5))) { - $additionalSelects = array($this->getSelectAveragePrice()); - } - $query = $this->getLogAggregator()->queryActionsByDimension($dimensions, $where, $additionalSelects); - $this->aggregateFromActions($query, $keyField, $valueField); - - $query = $this->getLogAggregator()->queryConversionsByDimension($dimensions, $where); - $this->aggregateFromConversions($query, $keyField, $valueField); - } - - protected function getSelectAveragePrice() - { - $field = "custom_var_v2"; - return LogAggregator::getSqlRevenue("AVG(log_link_visit_action." . $field . ")") . " as `" . Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; - } - - protected function aggregateFromVisits($query, $keyField, $valueField) - { - while ($row = $query->fetch()) { - $key = $row[$keyField]; - $value = $this->cleanCustomVarValue($row[$valueField]); - - $this->addMetadata($keyField, $key, Model::SCOPE_VISIT); - - $this->dataArray->sumMetricsVisits($key, $row); - $this->dataArray->sumMetricsVisitsPivot($key, $value, $row); - } - } - - protected function cleanCustomVarValue($value) - { - if (strlen($value)) { - return $value; - } - return self::LABEL_CUSTOM_VALUE_NOT_DEFINED; - } - - protected function aggregateFromActions($query, $keyField, $valueField) - { - while ($row = $query->fetch()) { - $key = $row[$keyField]; - $value = $this->cleanCustomVarValue($row[$valueField]); - - $this->addMetadata($keyField, $key, Model::SCOPE_PAGE); - - $alreadyAggregated = $this->aggregateEcommerceCategories($key, $value, $row); - if (!$alreadyAggregated) { - $this->aggregateActionByKeyAndValue($key, $value, $row); - $this->dataArray->sumMetricsActions($key, $row); - } - } - } - - private function addMetadata($keyField, $label, $scope) - { - $index = (int) str_replace('custom_var_k', '', $keyField); - - if (!array_key_exists($label, $this->metadata)) { - $this->metadata[$label] = array('slots' => array()); - } - - $uniqueId = $label . 'scope' . $scope . 'index' . $index; - - if (!isset($this->metadataFlat[$uniqueId])) { - $this->metadata[$label]['slots'][] = array('scope' => $scope, 'index' => $index); - $this->metadataFlat[$uniqueId] = true; - } - } - - /** - * @param string $key - * @param string $value - * @param $row - * @return bool True if the $row metrics were already added to the ->metrics - */ - protected function aggregateEcommerceCategories($key, $value, $row) - { - $ecommerceCategoriesAggregated = false; - if ($key == '_pkc' - && $value[0] == '[' && $value[1] == '"' - ) { - // In case categories were truncated, try closing the array - if (substr($value, -2) != '"]') { - $value .= '"]'; - } - $decoded = json_decode($value); - if (is_array($decoded)) { - $count = 0; - foreach ($decoded as $category) { - if (empty($category) - || $count >= GoalManager::MAXIMUM_PRODUCT_CATEGORIES - ) { - continue; - } - $this->aggregateActionByKeyAndValue($key, $category, $row); - $ecommerceCategoriesAggregated = true; - $count++; - } - } - } - return $ecommerceCategoriesAggregated; - } - - protected function aggregateActionByKeyAndValue($key, $value, $row) - { - $this->dataArray->sumMetricsActionsPivot($key, $value, $row); - - if ($this->isReservedKey($key)) { - // Price tracking on Ecommerce product/category pages: - // the average is returned from the SQL query so the price is not "summed" like other metrics - $index = Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED; - if (!empty($row[$index])) { - $this->dataArray->setRowColumnPivot($key, $value, $index, (float)$row[$index]); - } - } - } - - protected static function isReservedKey($key) - { - return in_array($key, API::getReservedCustomVariableKeys()); - } - - protected function aggregateFromConversions($query, $keyField, $valueField) - { - if ($query === false) { - return; - } - while ($row = $query->fetch()) { - $key = $row[$keyField]; - - $value = $this->cleanCustomVarValue($row[$valueField]); - $this->dataArray->sumMetricsGoals($key, $row); - $this->dataArray->sumMetricsGoalsPivot($key, $value, $row); - } - } - - /** - * Delete Visit, Unique Visitor and Users metric from 'page' scope custom variables. - * - * - Custom variables of 'visit' scope: it is expected that these ones have the "visit" column set. - * - Custom variables of 'page' scope: we cannot process "Visits" count for these. - * Why? - * "Actions" column is processed with a SELECT count(*). - * A same visit can set the same custom variable of 'page' scope multiple times. - * We cannot sum the values of count(*) as it would be incorrect. - * The way we could process "Visits" Metric for 'page' scope variable is to issue a count(Distinct *) or so, - * but it is no implemented yet (this would likely be very slow for high traffic sites). - * - */ - protected function removeVisitsMetricsFromActionsAggregate() - { - $dataArray = & $this->dataArray->getDataArray(); - foreach ($dataArray as $key => &$row) { - if (!self::isReservedKey($key) - && DataArray::isRowActions($row) - ) { - unset($row[Metrics::INDEX_NB_UNIQ_VISITORS]); - unset($row[Metrics::INDEX_NB_VISITS]); - unset($row[Metrics::INDEX_NB_USERS]); - } - } - } - -} diff --git a/plugins/CustomVariables/Categories/CustomVariablesCategory.php b/plugins/CustomVariables/Categories/CustomVariablesCategory.php deleted file mode 100644 index 5b4c7ba266..0000000000 --- a/plugins/CustomVariables/Categories/CustomVariablesCategory.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Categories; - -use Piwik\Category\Category; - -class CustomVariablesCategory extends Category -{ - protected $id = 'CustomVariables_CustomVariables'; - protected $order = 8; - -} diff --git a/plugins/CustomVariables/Categories/CustomVariablesSubcategory.php b/plugins/CustomVariables/Categories/CustomVariablesSubcategory.php deleted file mode 100644 index 9edf7d33af..0000000000 --- a/plugins/CustomVariables/Categories/CustomVariablesSubcategory.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Categories; - -use Piwik\Category\Subcategory; - -class CustomVariablesSubcategory extends Subcategory -{ - protected $categoryId = 'General_Visitors'; - protected $id = 'CustomVariables_CustomVariables'; - protected $order = 45; - -} diff --git a/plugins/CustomVariables/Columns/Base.php b/plugins/CustomVariables/Columns/Base.php deleted file mode 100644 index 1d886a7b9b..0000000000 --- a/plugins/CustomVariables/Columns/Base.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables\Columns; - -use Piwik\Columns\DimensionSegmentFactory; -use Piwik\Piwik; -use Piwik\Plugin\Dimension\VisitDimension; -use Piwik\Plugins\CustomVariables\Segment; -use Piwik\Plugins\CustomVariables\CustomVariables; -use Piwik\Segment\SegmentsList; - -class Base extends VisitDimension -{ - protected function configureSegmentsFor($segmentNameSuffix, SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory) - { - $numCustomVariables = CustomVariables::getNumUsableCustomVariables(); - - $segment = new Segment(); - $segment->setType('dimension'); - $segment->setSegment('customVariable' . $segmentNameSuffix); - $segment->setName($this->getName() . ' (' . Piwik::translate('CustomVariables_ScopeVisit') . ')'); - $segment->setUnionOfSegments($this->getSegmentColumns('customVariable' . $segmentNameSuffix, $numCustomVariables)); - $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); - - $segment = new Segment(); - $segment->setType('dimension'); - $segment->setSegment('customVariablePage' . $segmentNameSuffix); - $segment->setName($this->getName() . ' (' . Piwik::translate('CustomVariables_ScopePage') . ')'); - $segment->setUnionOfSegments($this->getSegmentColumns('customVariablePage' . $segmentNameSuffix, $numCustomVariables)); - $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); - - $segmentSuffix = 'v'; - if (strtolower($segmentNameSuffix) === 'name') { - $segmentSuffix = 'k'; - } - - for ($i = 1; $i <= $numCustomVariables; $i++) { - $segment = new Segment(); - $segment->setSegment('customVariable' . $segmentNameSuffix . $i); - $segment->setSqlSegment('log_visit.custom_var_' . $segmentSuffix . $i); - $segment->setName(Piwik::translate('CustomVariables_ColumnCustomVariable' . $segmentNameSuffix) . ' ' . $i - . ' (' . Piwik::translate('CustomVariables_ScopeVisit') . ')'); - $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); - - $segment = new Segment(); - $segment->setSegment('customVariablePage' . $segmentNameSuffix . $i); - $segment->setSqlSegment('log_link_visit_action.custom_var_' . $segmentSuffix . $i); - $segment->setName(Piwik::translate('CustomVariables_ColumnCustomVariable' . $segmentNameSuffix) . ' ' . $i - . ' (' . Piwik::translate('CustomVariables_ScopePage') . ')'); - $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); - } - } - - private function getSegmentColumns($column, $numCustomVariables) - { - $columns = array(); - for ($i = 1; $i <= $numCustomVariables; ++$i) { - $columns[] = $column . $i; - } - return $columns; - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/Columns/CustomVariableName.php b/plugins/CustomVariables/Columns/CustomVariableName.php deleted file mode 100644 index cf8e8079e6..0000000000 --- a/plugins/CustomVariables/Columns/CustomVariableName.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Columns; - -use Piwik\Columns\DimensionSegmentFactory; -use Piwik\Piwik; -use Piwik\Segment\SegmentsList; - -class CustomVariableName extends Base -{ - public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory) - { - $this->configureSegmentsFor('Name', $segmentsList, $dimensionSegmentFactory); - } - - public function getName() - { - return Piwik::translate('CustomVariables_ColumnCustomVariableName'); - } - -}
\ No newline at end of file diff --git a/plugins/CustomVariables/Columns/CustomVariableValue.php b/plugins/CustomVariables/Columns/CustomVariableValue.php deleted file mode 100644 index aaf0299533..0000000000 --- a/plugins/CustomVariables/Columns/CustomVariableValue.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Columns; - -use Piwik\Columns\DimensionSegmentFactory; -use Piwik\Piwik; -use Piwik\Segment\SegmentsList; - -class CustomVariableValue extends Base -{ - public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory) - { - $this->configureSegmentsFor('Value', $segmentsList, $dimensionSegmentFactory); - } - - public function getName() - { - return Piwik::translate('CustomVariables_ColumnCustomVariableValue'); - } - -}
\ No newline at end of file diff --git a/plugins/CustomVariables/Commands/Info.php b/plugins/CustomVariables/Commands/Info.php deleted file mode 100644 index 9794e4fe80..0000000000 --- a/plugins/CustomVariables/Commands/Info.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ - -namespace Piwik\Plugins\CustomVariables\Commands; - -use Piwik\Common; -use Piwik\Plugin\ConsoleCommand; -use Piwik\Plugins\CustomVariables\CustomVariables; -use Piwik\Plugins\CustomVariables\Model; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; - -/** - */ -class Info extends ConsoleCommand -{ - protected function configure() - { - $this->setName('customvariables:info'); - $this->setDescription('Get info about configured custom variables'); - } - - protected function execute(InputInterface $input, OutputInterface $output) - { - $maxVars = CustomVariables::getNumUsableCustomVariables(); - - if ($this->hasEverywhereSameAmountOfVariables()) { - $this->writeSuccessMessage($output, array( - 'Your Piwik is configured for ' . $maxVars . ' custom variables.' - )); - return; - } - - $output->writeln('<error>There is a problem with your custom variables configuration:</error>'); - $output->writeln('<error>Some database tables miss custom variables columns.</error>'); - $output->writeln(''); - $output->writeln('Your Piwik seems to be configured for ' . $maxVars . ' custom variables.'); - $output->writeln('Executing "<comment>./console customvariables:set-max-custom-variables ' . $maxVars . '</comment>" might fix this issue.'); - $output->writeln('If not check the following tables whether they have the same columns starting with <comment>custom_var_</comment>: '); - foreach (Model::getScopes() as $scope) { - $output->writeln(Common::prefixTable($scope)); - } - } - - private function hasEverywhereSameAmountOfVariables() - { - $indexesBefore = null; - - foreach (Model::getScopes() as $scope) { - $model = new Model($scope); - $indexes = $model->getCustomVarIndexes(); - - if (is_null($indexesBefore)) { - $indexesBefore = $indexes; - } elseif ($indexes != $indexesBefore) { - return false; - } - } - - return true; - } -} diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php deleted file mode 100644 index aaa7ad2fcf..0000000000 --- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php +++ /dev/null @@ -1,204 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ - -namespace Piwik\Plugins\CustomVariables\Commands; - -use Piwik\Plugin\ConsoleCommand; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tracker\Cache; -use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; - -/** - */ -class SetNumberOfCustomVariables extends ConsoleCommand -{ - /** - * @var \Symfony\Component\Console\Helper\ProgressHelper - */ - private $progress; - - protected function configure() - { - $this->setName('customvariables:set-max-custom-variables'); - $this->setDescription('Change the number of available custom variables'); - $this->setHelp("Example: -./console customvariables:set-max-custom-variables 10 -=> 10 custom variables will be available in total -"); - $this->addArgument('maxCustomVars', InputArgument::REQUIRED, 'Set the number of max available custom variables'); - } - - protected function execute(InputInterface $input, OutputInterface $output) - { - $numVarsToSet = $this->getNumVariablesToSet($input); - $numChangesToPerform = $this->getNumberOfChangesToPerform($numVarsToSet); - - if (0 === $numChangesToPerform) { - $this->writeSuccessMessage($output, array( - 'Your Piwik is already configured for ' . $numVarsToSet . ' custom variables.' - )); - return; - } - - $output->writeln(''); - $output->writeln(sprintf('Configuring Piwik for %d custom variables', $numVarsToSet)); - - foreach (Model::getScopes() as $scope) { - $this->printChanges($scope, $numVarsToSet, $output); - } - - if ($input->isInteractive() && !$this->confirmChange($output)) { - return; - } - - $output->writeln(''); - $output->writeln('Starting to apply changes'); - $output->writeln(''); - - $this->progress = $this->initProgress($numChangesToPerform, $output); - - foreach (Model::getScopes() as $scope) { - $this->performChange($scope, $numVarsToSet, $output); - } - - Cache::clearCacheGeneral(); - $this->progress->finish(); - - $this->writeSuccessMessage($output, array( - 'Your Piwik is now configured for ' . $numVarsToSet . ' custom variables.' - )); - } - - private function initProgress($numChangesToPerform, OutputInterface $output) - { - /** @var \Symfony\Component\Console\Helper\ProgressHelper $progress */ - $progress = $this->getHelperSet()->get('progress'); - $progress->start($output, $numChangesToPerform); - - return $progress; - } - - private function performChange($scope, $numVarsToSet, OutputInterface $output) - { - $model = new Model($scope); - $numCurrentVars = $model->getCurrentNumCustomVars(); - $numDifference = $this->getAbsoluteDifference($numCurrentVars, $numVarsToSet); - - if ($numVarsToSet > $numCurrentVars) { - $this->addCustomVariables($model, $numDifference, $output); - return; - } - - $this->removeCustomVariables($model, $numDifference, $output); - } - - private function getNumVariablesToSet(InputInterface $input) - { - $maxCustomVars = $input->getArgument('maxCustomVars'); - - if (!is_numeric($maxCustomVars)) { - throw new \InvalidArgumentException('The number of available custom variables has to be a number'); - } - - $maxCustomVars = (int) $maxCustomVars; - - if ($maxCustomVars < 5) { - throw new \InvalidArgumentException('There has to be at least five custom variables'); - } - - return $maxCustomVars; - } - - private function confirmChange(OutputInterface $output) - { - $output->writeln(''); - - $dialog = $this->getHelperSet()->get('dialog'); - return $dialog->askConfirmation( - $output, - '<question>Are you sure you want to perform these actions? (y/N)</question>', - false - ); - } - - private function printChanges($scope, $numVarsToSet, OutputInterface $output) - { - $model = new Model($scope); - $scopeName = $model->getScopeName(); - $highestIndex = $model->getHighestCustomVarIndex(); - $numCurrentCustomVars = $model->getCurrentNumCustomVars(); - $numVarsDifference = $this->getAbsoluteDifference($numCurrentCustomVars, $numVarsToSet); - - $output->writeln(''); - $output->writeln(sprintf('Scope "%s"', $scopeName)); - - if ($numVarsToSet > $numCurrentCustomVars) { - - $indexes = $highestIndex + 1; - if (1 !== $numVarsDifference) { - $indexes .= ' - ' . ($highestIndex + $numVarsDifference); - } - - $output->writeln( - sprintf('%s new custom variables having the index(es) %s will be ADDED', $numVarsDifference, $indexes) - ); - - } elseif ($numVarsToSet < $numCurrentCustomVars) { - - $indexes = $highestIndex - $numVarsDifference + 1; - - if (1 !== $numVarsDifference) { - $indexes .= ' - ' . $highestIndex; - } - - $output->writeln( - sprintf("%s existing custom variables having the index(es) %s will be REMOVED.", $numVarsDifference, $indexes) - ); - $output->writeln('<comment>This is an irreversible change</comment>'); - } - } - - private function getAbsoluteDifference($currentNumber, $numberToSet) - { - return abs($numberToSet - $currentNumber); - } - - private function removeCustomVariables(Model $model, $numberOfVarsToRemove, OutputInterface $output) - { - for ($index = 0; $index < $numberOfVarsToRemove; $index++) { - $indexRemoved = $model->removeCustomVariable(); - $this->progress->advance(); - $output->writeln(' <info>Removed a variable in scope "' . $model->getScopeName() . '" having the index ' . $indexRemoved . '</info>'); - } - } - - private function addCustomVariables(Model $model, $numberOfVarsToAdd, OutputInterface $output) - { - for ($index = 0; $index < $numberOfVarsToAdd; $index++) { - $indexAdded = $model->addCustomVariable(); - $this->progress->advance(); - $output->writeln(' <info>Added a variable in scope "' . $model->getScopeName() . '" having the index ' . $indexAdded . '</info>'); - } - } - - private function getNumberOfChangesToPerform($numVarsToSet) - { - $numChangesToPerform = 0; - - foreach (Model::getScopes() as $scope) { - $model = new Model($scope); - $numCurrentCustomVars = $model->getCurrentNumCustomVars(); - $numChangesToPerform += $this->getAbsoluteDifference($numCurrentCustomVars, $numVarsToSet); - } - - return $numChangesToPerform; - } -} diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php deleted file mode 100644 index 96c234d120..0000000000 --- a/plugins/CustomVariables/Controller.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Common; -use Piwik\DataTable; -use Piwik\Piwik; -use Piwik\Site; - -class Controller extends \Piwik\Plugin\Controller -{ - public function manage() - { - $this->checkSitePermission(); - Piwik::checkUserHasAdminAccess($this->idSite); - - return $this->renderTemplate('manage', array()); - } - -} - diff --git a/plugins/CustomVariables/CustomDimension.php b/plugins/CustomVariables/CustomDimension.php deleted file mode 100644 index 1c03ca951e..0000000000 --- a/plugins/CustomVariables/CustomDimension.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Columns\Dimension; -use Piwik\Piwik; - -class CustomDimension extends Dimension -{ - protected $type = self::TYPE_TEXT; - - private $id; - - public function getId() - { - return $this->id; - } - - public function initCustomDimension($index, Model $scope) - { - $category = $scope->getScopeDescription(); - - $this->id = 'CustomVariables.CustomVariable' . ucfirst($scope->getScope()) . $index; - $this->nameSingular = Piwik::translate('CustomVariables_ColumnCustomVariableValue') . ' ' . $index . ' (' . $category .')'; - $this->columnName = 'custom_var_v' . (int) $index; - $this->category = 'CustomVariables_CustomVariables'; - $this->dbTableName = $scope->getUnprefixedTableName(); - } - -}
\ No newline at end of file diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php deleted file mode 100644 index 8338f673d5..0000000000 --- a/plugins/CustomVariables/CustomVariables.php +++ /dev/null @@ -1,158 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Tracker\Cache; - -class CustomVariables extends \Piwik\Plugin -{ - const MAX_NUM_CUSTOMVARS_CACHEKEY = 'CustomVariables.MaxNumCustomVariables'; - - /** - * @see \Piwik\Plugin::registerEvents - */ - public function registerEvents() - { - return array( - 'AssetManager.getJavaScriptFiles' => 'getJsFiles', - 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys', - 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', - 'Dimension.addDimensions' => 'addDimensions', - 'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields', - 'Tracker.setTrackerCacheGeneral' => 'getCacheGeneral' - ); - } - - public function install() - { - Model::install(); - } - - public function uninstall() - { - Model::uninstall(); - } - - public function addDimensions(&$instances) - { - foreach (Model::getScopes() as $scope) { - $model = new Model($scope); - try { - $highestIndex = $model->getHighestCustomVarIndex(); - } catch (\Exception $e) { - continue; // ignore error for tests to work as this might be executed before Piwik tables are installed - } - - foreach (range(1, $highestIndex) as $index) { - $custom = new CustomDimension(); - $custom->initCustomDimension($index, $model); - $instances[] = $custom; - } - } - } - - /** - * There are also some hardcoded places in JavaScript - * @return int - */ - public static function getMaxLengthCustomVariables() - { - return 200; - } - - /** - * Returns the number of available custom variables that can be used. - * - * "Can be used" is identifed by the minimum number of available custom variables across all relevant tables. Eg - * if there are 6 custom variables installed in log_visit but only 5 in log_conversion, we consider only 5 custom - * variables as usable. - * @return int - */ - public static function getNumUsableCustomVariables() - { - $cache = Cache::getCacheGeneral(); - $cacheKey = self::MAX_NUM_CUSTOMVARS_CACHEKEY; - - if (isset($cache[$cacheKey])) { - return $cache[$cacheKey]; - } - - return 0; - } - - public function getCacheGeneral(&$cacheContent) - { - $cacheContent[self::MAX_NUM_CUSTOMVARS_CACHEKEY] = self::fetchNumMaxCustomVariables(); - } - - private static function fetchNumMaxCustomVariables() - { - $minCustomVar = null; - - foreach (Model::getScopes() as $scope) { - $model = new Model($scope); - $highestIndex = $model->getHighestCustomVarIndex(); - - if (!isset($minCustomVar)) { - $minCustomVar = $highestIndex; - } - - if ($highestIndex < $minCustomVar) { - $minCustomVar = $highestIndex; - } - } - - if (!isset($minCustomVar)) { - $minCustomVar = 0; - } - - return $minCustomVar; - } - - public function getClientSideTranslationKeys(&$translationKeys) - { - $translationKeys[] = 'CustomVariables_CustomVariables'; - $translationKeys[] = 'CustomVariables_ManageDescription'; - $translationKeys[] = 'CustomVariables_ScopeX'; - $translationKeys[] = 'CustomVariables_Index'; - $translationKeys[] = 'CustomVariables_Usages'; - $translationKeys[] = 'CustomVariables_Unused'; - $translationKeys[] = 'CustomVariables_CreateNewSlot'; - $translationKeys[] = 'CustomVariables_UsageDetails'; - $translationKeys[] = 'CustomVariables_CurrentAvailableCustomVariables'; - $translationKeys[] = 'CustomVariables_ToCreateCustomVarExecute'; - $translationKeys[] = 'CustomVariables_CreatingCustomVariableTakesTime'; - $translationKeys[] = 'CustomVariables_SlotsReportIsGeneratedOverTime'; - $translationKeys[] = 'General_Loading'; - $translationKeys[] = 'General_TrackingScopeVisit'; - $translationKeys[] = 'General_TrackingScopePage'; - } - - public function getStylesheetFiles(&$stylesheets) - { - $stylesheets[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.less"; - } - - public function getJsFiles(&$jsFiles) - { - $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js"; - $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.controller.js"; - $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js"; - } - - public function provideActionDimensionFields(&$fields, &$joins) - { - $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); - - for ($i = 1; $i <= $maxCustomVariables; $i++) { - $fields[] = 'custom_var_k' . $i; - $fields[] = 'custom_var_v' . $i; - } - } -} diff --git a/plugins/CustomVariables/DataTable/Filter/CustomVariablesValuesFromNameId.php b/plugins/CustomVariables/DataTable/Filter/CustomVariablesValuesFromNameId.php deleted file mode 100644 index a541ce0959..0000000000 --- a/plugins/CustomVariables/DataTable/Filter/CustomVariablesValuesFromNameId.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\DataTable\Filter; - -use Piwik\DataTable\BaseFilter; -use Piwik\DataTable\Row; -use Piwik\DataTable; -use Piwik\Piwik; - -class CustomVariablesValuesFromNameId extends BaseFilter -{ - - /** - * Constructor. - * - * @param DataTable $table The table to eventually filter. - */ - public function __construct($table) - { - parent::__construct($table); - } - - /** - * @param DataTable $table - */ - public function filter($table) - { - $notDefinedLabel = Piwik::translate('General_NotDefined', Piwik::translate('CustomVariables_ColumnCustomVariableValue')); - - $table->queueFilter('ColumnCallbackReplace', array('label', function ($label) use ($notDefinedLabel) { - return $label === \Piwik\Plugins\CustomVariables\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED - ? $notDefinedLabel - : strval($label); - })); - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/Menu.php b/plugins/CustomVariables/Menu.php deleted file mode 100644 index 1bb0dcbe51..0000000000 --- a/plugins/CustomVariables/Menu.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Common; -use Piwik\Menu\MenuAdmin; -use Piwik\Piwik; -use Piwik\Plugins\UsersManager\UserPreferences; - -/** - * This class allows you to add, remove or rename menu items. - * To configure a menu (such as Admin Menu, Reporting Menu, User Menu...) simply call the corresponding methods as - * described in the API-Reference http://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract - */ -class Menu extends \Piwik\Plugin\Menu -{ - public function configureAdminMenu(MenuAdmin $menu) - { - $userPreferences = new UserPreferences(); - $default = $userPreferences->getDefaultWebsiteId(); - $idSite = Common::getRequestVar('idSite', $default, 'int'); - - if (Piwik::isUserHasAdminAccess($idSite)) { - $menu->addDiagnosticItem('CustomVariables_CustomVariables', $this->urlForAction('manage'), $orderId = 20); - } - } -} diff --git a/plugins/CustomVariables/Model.php b/plugins/CustomVariables/Model.php deleted file mode 100644 index bdc28f22f7..0000000000 --- a/plugins/CustomVariables/Model.php +++ /dev/null @@ -1,221 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Common; -use Piwik\Container\StaticContainer; -use Piwik\DataAccess\TableMetadata; -use Piwik\DataTable; -use Piwik\Db; -use Piwik\Log; -use Piwik\Piwik; -use Psr\Log\LoggerInterface; - -class Model -{ - const DEFAULT_CUSTOM_VAR_COUNT = 5; - - const SCOPE_PAGE = 'page'; - const SCOPE_VISIT = 'visit'; - const SCOPE_CONVERSION = 'conversion'; - - private $scope = null; - private $table = null; - private $tableUnprefixed = null; - - public function __construct($scope) - { - if (empty($scope) || !in_array($scope, $this->getScopes())) { - throw new \Exception('Invalid custom variable scope'); - } - - $this->scope = $scope; - $this->tableUnprefixed = $this->getTableNameFromScope($scope); - $this->table = Common::prefixTable($this->tableUnprefixed); - } - - public function getUnprefixedTableName() - { - return $this->tableUnprefixed; - } - - private function getTableNameFromScope($scope) - { - // actually we should have a class for each scope but don't want to overengineer it for now - switch ($scope) { - case self::SCOPE_PAGE: - return 'log_link_visit_action'; - case self::SCOPE_VISIT: - return 'log_visit'; - case self::SCOPE_CONVERSION: - return 'log_conversion'; - } - } - - public function getScope() - { - return $this->scope; - } - - public function getScopeName() - { - return ucfirst($this->scope); - } - - public function getScopeDescription() - { - switch ($this->scope) { - case Model::SCOPE_PAGE: - return Piwik::translate('CustomVariables_ScopePage'); - case Model::SCOPE_VISIT: - return Piwik::translate('CustomVariables_ScopeVisit'); - case Model::SCOPE_CONVERSION: - return Piwik::translate('CustomVariables_ScopeConversion'); - } - - return ucfirst($this->scope); - } - - /** - * @see getHighestCustomVarIndex() - * @return int - */ - public function getCurrentNumCustomVars() - { - $indexes = $this->getCustomVarIndexes(); - - return count($indexes); - } - - /** - * result of getHighestCustomVarIndex() can be different to getCurrentNumCustomVars() in case there are some missing - * custom variable indexes. For instance in case of manual changes on the DB - * - * custom_var_v1 - * custom_var_v2 - * custom_var_v4 - * - * getHighestCustomVarIndex() -> returns 4 - * getCurrentNumCustomVars() -> returns 3 - * - * @return int - */ - public function getHighestCustomVarIndex() - { - $indexes = $this->getCustomVarIndexes(); - - if (empty($indexes)) { - return 0; - } - - return max($indexes); - } - - public function getCustomVarIndexes() - { - $columns = $this->getCustomVarColumnNames(); - - if (empty($columns)) { - return array(); - } - - $indexes = array_map(function ($column) { - return Model::getCustomVariableIndexFromFieldName($column); - }, $columns); - - return array_values(array_unique($indexes)); - } - - private function getCustomVarColumnNames() - { - $tableMetadataAccess = new TableMetadata(); - $columns = $tableMetadataAccess->getColumns($this->table); - - $customVarColumns = array_filter($columns, function ($column) { - return false !== strpos($column, 'custom_var_'); - }); - - return $customVarColumns; - } - - public function removeCustomVariable() - { - $index = $this->getHighestCustomVarIndex(); - - if ($index < 1) { - return null; - } - - Db::exec(sprintf('ALTER TABLE %s ', $this->table) - . sprintf('DROP COLUMN custom_var_k%d,', $index) - . sprintf('DROP COLUMN custom_var_v%d;', $index)); - - return $index; - } - - public function addCustomVariable() - { - $index = $this->getHighestCustomVarIndex() + 1; - $maxLen = CustomVariables::getMaxLengthCustomVariables(); - - Db::exec(sprintf('ALTER TABLE %s ', $this->table) - . sprintf('ADD COLUMN custom_var_k%d VARCHAR(%d) DEFAULT NULL,', $index, $maxLen) - . sprintf('ADD COLUMN custom_var_v%d VARCHAR(%d) DEFAULT NULL;', $index, $maxLen)); - - return $index; - } - - public static function getCustomVariableIndexFromFieldName($fieldName) - { - $onlyNumber = str_replace(array('custom_var_k', 'custom_var_v'), '', $fieldName); - - if (is_numeric($onlyNumber)) { - return (int) $onlyNumber; - } - } - - public static function getScopes() - { - return array(self::SCOPE_PAGE, self::SCOPE_VISIT, self::SCOPE_CONVERSION); - } - - public static function install() - { - foreach (self::getScopes() as $scope) { - $model = new Model($scope); - - try { - $maxCustomVars = self::DEFAULT_CUSTOM_VAR_COUNT; - $customVarsToAdd = $maxCustomVars - $model->getCurrentNumCustomVars(); - - for ($index = 0; $index < $customVarsToAdd; $index++) { - $model->addCustomVariable(); - } - } catch (\Exception $e) { - StaticContainer::get(LoggerInterface::class)->error('Failed to add custom variable: {exception}', [ - 'exception' => $e, - 'ignoreInScreenWriter' => true, - ]); - } - } - } - - public static function uninstall() - { - foreach (self::getScopes() as $scope) { - $model = new Model($scope); - - while ($model->getHighestCustomVarIndex()) { - $model->removeCustomVariable(); - } - } - } - -} - diff --git a/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php b/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php deleted file mode 100644 index 4a3f47b31d..0000000000 --- a/plugins/CustomVariables/ProfileSummary/VisitScopeSummary.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ - -namespace Piwik\Plugins\CustomVariables\ProfileSummary; - -use Piwik\Common; -use Piwik\Piwik; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Plugins\Live\ProfileSummary\ProfileSummaryAbstract; -use Piwik\View; - -/** - * Class VisitScopeSummary - */ -class VisitScopeSummary extends ProfileSummaryAbstract -{ - /** - * @inheritdoc - */ - public function getName() - { - return Piwik::translate('CustomVariables_CustomVariables') . ' ' . Piwik::translate('General_TrackingScopeVisit'); - } - - /** - * @inheritdoc - */ - public function render() - { - if (empty($this->profile['customVariables']) || empty($this->profile['customVariables'][Model::SCOPE_VISIT])) { - return ''; - } - - $view = new View('@CustomVariables/_profileSummary.twig'); - $view->visitorData = $this->profile; - $view->scopeName = Piwik::translate('General_TrackingScopeVisit'); - $view->variables = $this->profile['customVariables'][Model::SCOPE_VISIT]; - return $view->render(); - } - - /** - * @inheritdoc - */ - public function getOrder() - { - return 15; - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/Reports/Base.php b/plugins/CustomVariables/Reports/Base.php deleted file mode 100644 index 65a39bf000..0000000000 --- a/plugins/CustomVariables/Reports/Base.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Reports; - -abstract class Base extends \Piwik\Plugin\Report -{ - protected $defaultSortColumn = 'nb_actions'; - - protected function init() - { - $this->categoryId = 'General_Visitors'; - $this->onlineGuideUrl = 'https://matomo.org/docs/custom-variables/'; - } - -} diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php deleted file mode 100644 index f2490dbc45..0000000000 --- a/plugins/CustomVariables/Reports/GetCustomVariables.php +++ /dev/null @@ -1,86 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Reports; - -use Piwik\DataTable; -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CustomVariables\Columns\CustomVariableName; - -class GetCustomVariables extends Base -{ - protected function init() - { - parent::init(); - $this->dimension = new CustomVariableName(); - $this->name = Piwik::translate('CustomVariables_CustomVariables'); - $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">', '</a>')); - $this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId'; - $this->order = 10; - - $this->subcategoryId = 'CustomVariables_CustomVariables'; - $this->hasGoalMetrics = true; - } - - public function configureView(ViewDataTable $view) - { - $view->config->columns_to_display = array('label', 'nb_actions', 'nb_visits'); - $view->config->addTranslation('label', Piwik::translate('CustomVariables_ColumnCustomVariableName')); - $view->requestConfig->filter_sort_column = 'nb_actions'; - $view->requestConfig->filter_sort_order = 'desc'; - - $that = $this; - $view->config->filters[] = function (DataTable $table) use ($view, $that) { - if($that->isReportContainsUnsetVisitsColumns($table)) { - $message = $that->getFooterMessageExplanationMissingMetrics(); - $view->config->show_footer_message = $message; - } - }; - } - - /** - * @return string - */ - public function getFooterMessageExplanationMissingMetrics() - { - $metrics = sprintf("'%s', '%s' %s '%s'", - Piwik::translate('General_ColumnNbVisits'), - Piwik::translate('General_ColumnNbUniqVisitors'), - Piwik::translate('General_And'), - Piwik::translate('General_ColumnNbUsers') - ); - $messageStart = Piwik::translate('CustomVariables_MetricsAreOnlyAvailableForVisitScope', array($metrics, "'visit'")); - - $messageEnd = Piwik::translate('CustomVariables_MetricsNotAvailableForPageScope', array("'page'", '\'-\'')); - - $message = $messageStart . ' ' . $messageEnd; - - if (!$this->isSubtableReport) { - // no footer message for subtables - $out = ''; - Piwik::postEvent('Template.afterCustomVariablesReport', array(&$out)); - if (!empty($message)) { - $message .= $out; - } - } - - return $message; - } - - /** - * @return bool - */ - public function isReportContainsUnsetVisitsColumns(DataTable $report) - { - $visits = $report->getColumn('nb_visits'); - $isVisitsMetricsSometimesUnset = in_array(false, $visits); - return $isVisitsMetricsSometimesUnset; - } -} diff --git a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php deleted file mode 100644 index 1cc1bcb021..0000000000 --- a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CustomVariables\Columns\CustomVariableValue; - -class GetCustomVariablesValuesFromNameId extends Base -{ - protected function init() - { - parent::init(); - $this->dimension = new CustomVariableValue(); - $this->name = Piwik::translate('CustomVariables_CustomVariables'); - $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">', '</a>')); - $this->isSubtableReport = true; - $this->order = 15; - } - - public function configureView(ViewDataTable $view) - { - $view->config->columns_to_display = array('label', 'nb_actions', 'nb_visits'); - $view->config->show_goals = true; - $view->config->show_search = false; - $view->config->show_exclude_low_population = false; - $view->config->addTranslation('label', Piwik::translate('CustomVariables_ColumnCustomVariableValue')); - $view->requestConfig->filter_sort_column = 'nb_actions'; - $view->requestConfig->filter_sort_order = 'desc'; - } - -} diff --git a/plugins/CustomVariables/Segment.php b/plugins/CustomVariables/Segment.php deleted file mode 100644 index 67459e21bd..0000000000 --- a/plugins/CustomVariables/Segment.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -/** - * CustomVariables segment base class - */ -class Segment extends \Piwik\Plugin\Segment -{ - protected function init() - { - $this->setCategory('CustomVariables_CustomVariables'); - } -} - diff --git a/plugins/CustomVariables/Tracker/CustomVariablesRequestProcessor.php b/plugins/CustomVariables/Tracker/CustomVariablesRequestProcessor.php deleted file mode 100644 index add8493fbc..0000000000 --- a/plugins/CustomVariables/Tracker/CustomVariablesRequestProcessor.php +++ /dev/null @@ -1,88 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables\Tracker; - -use Piwik\Common; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tracker\Action; -use Piwik\Tracker\Request; -use Piwik\Tracker\RequestProcessor; -use Piwik\Tracker\Visit\VisitProperties; - -/** - * Handles tracking of visit level custom variables. - * - * ### Request Metadata - * - * Defines the following request metadata for the **CustomVariables** plugin: - * - * * **visitCustomVariables**: An array of custom variable names & values. The data is stored - * as log_visit column name/value pairs, eg, - * - * ``` - * array( - * 'custom_var_k1' => 'the name', - * 'custom_var_v1' => 'the value', - * ... - * ) - * ``` - */ -class CustomVariablesRequestProcessor extends RequestProcessor -{ - public function processRequestParams(VisitProperties $visitProperties, Request $request) - { - // TODO: re-add optimization where if custom variables exist in request, don't bother selecting them in Visitor - $visitorCustomVariables = $request->getCustomVariables($scope = Model::SCOPE_VISIT); - if (!empty($visitorCustomVariables)) { - Common::printDebug("Visit level Custom Variables: "); - Common::printDebug($visitorCustomVariables); - } - - $request->setMetadata('CustomVariables', 'visitCustomVariables', $visitorCustomVariables); - } - - public function onNewVisit(VisitProperties $visitProperties, Request $request) - { - $visitCustomVariables = $request->getMetadata('CustomVariables', 'visitCustomVariables'); - - if (!empty($visitCustomVariables)) { - $visitProperties->setProperties(array_merge($visitProperties->getProperties(), $visitCustomVariables)); - } - } - - public function onExistingVisit(&$valuesToUpdate, VisitProperties $visitProperties, Request $request) - { - $visitCustomVariables = $request->getMetadata('CustomVariables', 'visitCustomVariables'); - - if (!empty($visitCustomVariables)) { - $valuesToUpdate = array_merge($valuesToUpdate, $visitCustomVariables); - } - } - - public function afterRequestProcessed(VisitProperties $visitProperties, Request $request) - { - $action = $request->getMetadata('Actions', 'action'); - - if (empty($action) || !($action instanceof Action)) { - return; - } - - $customVariables = $action->getCustomVariables(); - - if (!empty($customVariables)) { - Common::printDebug("Page level Custom Variables: "); - Common::printDebug($customVariables); - - foreach ($customVariables as $field => $value) { - $action->setCustomField($field, $value); - } - } - - } -} diff --git a/plugins/CustomVariables/VisitorDetails.php b/plugins/CustomVariables/VisitorDetails.php deleted file mode 100644 index bc4d36d455..0000000000 --- a/plugins/CustomVariables/VisitorDetails.php +++ /dev/null @@ -1,198 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables; - -use Piwik\Piwik; -use Piwik\Plugins\Actions\Actions\ActionSiteSearch; -use Piwik\Plugins\Live\VisitorDetailsAbstract; -use Piwik\View; - -class VisitorDetails extends VisitorDetailsAbstract -{ - public function extendVisitorDetails(&$visitor) - { - $customVariables = array(); - - $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); - - for ($i = 1; $i <= $maxCustomVariables; $i++) { - if (!empty($this->details['custom_var_k' . $i])) { - $customVariables[$i] = array( - 'customVariableName' . $i => $this->details['custom_var_k' . $i], - 'customVariableValue' . $i => $this->details['custom_var_v' . $i], - ); - } - } - - $visitor['customVariables'] = $customVariables; - } - - public function extendActionDetails(&$action, $nextAction, $visitorDetails) - { - $maxCustomVariables = CustomVariables::getNumUsableCustomVariables(); - $customVariablesPage = array(); - - for ($i = 1; $i <= $maxCustomVariables; $i++) { - if (!empty($action['custom_var_k' . $i])) { - $cvarKey = $action['custom_var_k' . $i]; - - if (in_array($cvarKey, ['_pk_scat', '_pk_scount'])) { - continue; // ignore old site search variables - } - - $customVariablesPage[$i] = array( - 'customVariablePageName' . $i => $cvarKey, - 'customVariablePageValue' . $i => $action['custom_var_v' . $i], - ); - } - unset($action['custom_var_k' . $i]); - unset($action['custom_var_v' . $i]); - } - if (!empty($customVariablesPage)) { - $action['customVariables'] = $customVariablesPage; - } - } - - public function renderActionTooltip($action, $visitInfo) - { - if (empty($action['customVariables'])) { - return []; - } - - $view = new View('@CustomVariables/_actionTooltip'); - $view->action = $action; - return [[ 40, $view->render() ]]; - } - - public function renderVisitorDetails($visitInfo) - { - if (empty($visitInfo['customVariables'])) { - return []; - } - - $view = new View('@CustomVariables/_visitorDetails'); - $view->visitInfo = $visitInfo; - return [[ 50, $view->render() ]]; - } - - protected $customVariables = []; - - public function initProfile($visits, &$profile) - { - $this->customVariables = [ - Model::SCOPE_PAGE => [], - Model::SCOPE_VISIT => [], - ]; - } - - public function handleProfileAction($action, &$profile) - { - if (empty($action['customVariables'])) { - return; - } - - foreach ($action['customVariables'] as $index => $customVariable) { - - $scope = Model::SCOPE_PAGE; - $name = $customVariable['customVariablePageName'.$index]; - $value = $customVariable['customVariablePageValue'.$index]; - - if (empty($value)) { - continue; - } - - if (!array_key_exists($name, $this->customVariables[$scope])) { - $this->customVariables[$scope][$name] = []; - } - - if (!array_key_exists($value, $this->customVariables[$scope][$name])) { - $this->customVariables[$scope][$name][$value] = 0; - } - - $this->customVariables[$scope][$name][$value]++; - } - } - - public function handleProfileVisit($visit, &$profile) - { - if (empty($visit['customVariables'])) { - return; - } - - foreach ($visit['customVariables'] as $index => $customVariable) { - - $scope = Model::SCOPE_VISIT; - $name = $customVariable['customVariableName'.$index]; - $value = $customVariable['customVariableValue'.$index]; - - if (empty($value)) { - continue; - } - - if (!array_key_exists($name, $this->customVariables[$scope])) { - $this->customVariables[$scope][$name] = []; - } - - if (!array_key_exists($value, $this->customVariables[$scope][$name])) { - $this->customVariables[$scope][$name][$value] = 0; - } - - $this->customVariables[$scope][$name][$value]++; - } - } - - public function finalizeProfile($visits, &$profile) - { - $customVariables = $this->customVariables; - foreach ($customVariables as $scope => &$variables) { - - if (empty($variables)) { - unset($customVariables[$scope]); - continue; - } - - foreach ($variables AS $name => &$values) { - arsort($values); - } - } - if (!empty($customVariables)) { - - $profile['customVariables'] = $this->convertForProfile($customVariables); - } - } - - protected function convertForProfile($customVariables) - { - $convertedVariables = []; - - foreach ($customVariables as $scope => $scopeVariables) { - - $convertedVariables[$scope] = []; - - foreach ($scopeVariables as $name => $values) { - - $variable = [ - 'name' => $name, - 'values' => [] - ]; - - foreach ($values as $value => $count) { - $variable['values'][] = [ - 'value' => $value, - 'count' => $count - ]; - } - - $convertedVariables[$scope][] = $variable; - } - } - - return $convertedVariables; - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.controller.js b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.controller.js deleted file mode 100644 index b6c99833a8..0000000000 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.controller.js +++ /dev/null @@ -1,22 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -(function () { - angular.module('piwikApp').controller('ManageCustomVarsController', ManageCustomVarsController); - - ManageCustomVarsController.$inject = ['manageCustomVarsModel', 'piwik', '$filter']; - - function ManageCustomVarsController(manageCustomVarsModel, piwik, $filter) { - manageCustomVarsModel.fetchUsages(); - - this.model = manageCustomVarsModel; - this.siteName = piwik.siteName; - this.scopes = [ - {value: 'visit', name: _pk_translate('General_TrackingScopeVisit')}, - {value: 'page', name: _pk_translate('General_TrackingScopePage')} - ]; - } -})();
\ No newline at end of file diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html deleted file mode 100644 index aaeb4adabe..0000000000 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html +++ /dev/null @@ -1,63 +0,0 @@ -<div class="manageCustomVars"> - <div piwik-content-intro> - <h2 piwik-enriched-headline - help-url="https://matomo.org/docs/custom-variables/"> - {{ 'CustomVariables_CustomVariables'|translate }} - </h2> - - <p> - <span ng-bind-html="'CustomVariables_ManageDescription'|translate:manageCustomVars.siteName"></span> - </p> - </div> - - <div class="alert alert-info" ng-show="!manageCustomVars.model.isLoading && manageCustomVars.model.hasCustomVariablesInGeneral && !manageCustomVars.model.hasAtLeastOneUsage"> - {{ 'CustomVariables_SlotsReportIsGeneratedOverTime'|translate }} - </div> - - <div ng-repeat="scope in manageCustomVars.scopes"> - <div piwik-content-block content-title="{{ 'CustomVariables_ScopeX'|translate:(scope.name) }}"> - <table piwik-content-table> - <thead> - <tr> - <th>{{'CustomVariables_Index'|translate }}</th> - <th>{{'CustomVariables_Usages'|translate }}</th> - </tr> - </thead> - <tbody> - <tr> - <td colspan="3" ng-show="manageCustomVars.model.isLoading">{{ 'General_Loading'|translate }}</td> - </tr> - <tr ng-repeat="customVariables in manageCustomVars.model.customVariables|filter:{scope: scope.value}"> - <td class="index">{{ customVariables.index }}</td> - <td> - <span ng-show="(customVariables.usages|length) === 0" - class="unused">{{'CustomVariables_Unused'|translate }}</span> - <span ng-show="customVariables.usages|length" ng-repeat="cvar in customVariables.usages|orderBy:'-nb_actions'"> - <span title="{{ 'CustomVariables_UsageDetails'|translate:(cvar.nb_visits ? cvar.nb_visits : 0):(cvar.nb_actions ? cvar.nb_actions : 0) }}">{{ cvar.name }}</span><span ng-show="!$last">, </span> - </span> - </td> - </tr> - </tbody> - </table> - </div> - </div> - - <div ng-show="!manageCustomVars.model.isLoading" - piwik-content-block - id="CustomVariablesCreateNewSlot" - content-title="{{ 'CustomVariables_CreateNewSlot'|translate }}"> - - <p ng-show="!manageCustomVars.model.isLoading"> - {{ 'CustomVariables_CreatingCustomVariableTakesTime'|translate }} - <br /><br /> - <span ng-bind-html="'CustomVariables_CurrentAvailableCustomVariables'|translate:('<strong>'+manageCustomVars.model.numSlotsAvailable+'</strong>')"></span> - <br /> - <br /> - {{ 'CustomVariables_ToCreateCustomVarExecute'|translate }} - <br /> - <pre piwik-select-on-focus><code>./console customvariables:set-max-custom-variables {{ manageCustomVars.model.numSlotsAvailable + 1 }}</code></pre> - </p> - - </div> - -</div> diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js deleted file mode 100644 index adbf957e75..0000000000 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -/** - * Usage: - * <div piwik-manage-custom-vars> - */ -(function () { - angular.module('piwikApp').directive('piwikManageCustomVars', piwikManageCustomVars); - - piwikManageCustomVars.$inject = ['piwik']; - - function piwikManageCustomVars(piwik){ - return { - restrict: 'A', - scope: {}, - templateUrl: 'plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html?cb=' + piwik.cacheBuster, - controller: 'ManageCustomVarsController', - controllerAs: 'manageCustomVars' - }; - } -})();
\ No newline at end of file diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.less b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.less deleted file mode 100644 index b666abebca..0000000000 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.less +++ /dev/null @@ -1,18 +0,0 @@ -.manageCustomVars { - .unused { - color: @color-silver; - } - - table, p { - width: 900px; - } - - .alert-info { - margin-top: 15px; - } - - .scope, .index { - width: 90px; - max-width: 90px; - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js deleted file mode 100644 index 6ce717be8f..0000000000 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js +++ /dev/null @@ -1,59 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -(function () { - angular.module('piwikApp').factory('manageCustomVarsModel', manageCustomVarsModel); - - manageCustomVarsModel.$inject = ['piwikApi']; - - function manageCustomVarsModel(piwikApi) { - - var model = { - customVariables : [], - extractions : [], - isLoading: false, - fetchUsages: fetchUsages, - hasCustomVariablesInGeneral: false, - hasAtLeastOneUsage: false, - numSlotsAvailable: 5, - }; - - return model; - - function fetchCustomVariables() { - return piwikApi.fetch({method: 'CustomVariables.getCustomVariables', period: 'year', date: 'today', filter_limit: 1}) - .then(function (customVariables) { - model.hasCustomVariablesInGeneral = (customVariables && customVariables.length > 0); - }); - } - - function fetchUsages() { - - model.isLoading = true; - - fetchCustomVariables().then(function () { - return piwikApi.fetch({method: 'CustomVariables.getUsagesOfSlots', filter_limit: '-1'}); - - }).then(function (customVariables) { - model.customVariables = customVariables; - - angular.forEach(customVariables, function (customVar) { - if (customVar.index > model.numSlotsAvailable) { - model.numSlotsAvailable = customVar.index; - } - - if (customVar.usages && customVar.usages.length > 0) { - model.hasAtLeastOneUsage = true; - } - }); - - })['finally'](function () { // .finally() is not IE8 compatible see https://github.com/angular/angular.js/commit/f078762d48d0d5d9796dcdf2cb0241198677582c - model.isLoading = false; - }); - } - - } -})();
\ No newline at end of file diff --git a/plugins/CustomVariables/config/config.php b/plugins/CustomVariables/config/config.php deleted file mode 100644 index cba8dd0f59..0000000000 --- a/plugins/CustomVariables/config/config.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php - -return array( - // in tests we do not use 'today' to make tests results deterministic - 'CustomVariables.today' => 'today', -); diff --git a/plugins/CustomVariables/config/test.php b/plugins/CustomVariables/config/test.php deleted file mode 100644 index d1ef28244a..0000000000 --- a/plugins/CustomVariables/config/test.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -return array( - 'CustomVariables.today' => '2015-01-01' -);
\ No newline at end of file diff --git a/plugins/CustomVariables/config/tracker.php b/plugins/CustomVariables/config/tracker.php deleted file mode 100644 index ca2affec34..0000000000 --- a/plugins/CustomVariables/config/tracker.php +++ /dev/null @@ -1,2 +0,0 @@ -<?php -return array(); diff --git a/plugins/CustomVariables/lang/ar.json b/plugins/CustomVariables/lang/ar.json deleted file mode 100644 index 8df046f557..0000000000 --- a/plugins/CustomVariables/lang/ar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "اسم المتغير المخصص", - "ColumnCustomVariableValue": "قيمة المتغير المخصص", - "CustomVariables": "المتغيرات المخصصة" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/be.json b/plugins/CustomVariables/lang/be.json deleted file mode 100644 index 810d7d6326..0000000000 --- a/plugins/CustomVariables/lang/be.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Назва карыстацкай зменнай", - "ColumnCustomVariableValue": "Значэнне карыстацкай зменнай", - "CustomVariables": "Карыстацкія зменныя" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/bg.json b/plugins/CustomVariables/lang/bg.json deleted file mode 100644 index c3ae8af833..0000000000 --- a/plugins/CustomVariables/lang/bg.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Име на променлива", - "ColumnCustomVariableValue": "Съдържание на променлива", - "CustomVariables": "Променливи", - "CustomVariablesReportDocumentation": "Този отчет съдържа информация за вашите Персонални променливи. Кликнете върху името на променлива, за да видите разпределението на стойностите. %1$s За повече информация отностно Персоналните Променливи в общ план, прочетете Документацията за %2$sПерсонални промеливи на matomo.org%3$s", - "ScopePage": "Разгледай страница", - "ScopeVisit": "Разгледай посещение" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ca.json b/plugins/CustomVariables/lang/ca.json deleted file mode 100644 index f8e9c2d891..0000000000 --- a/plugins/CustomVariables/lang/ca.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nom de la variable personalitzada", - "ColumnCustomVariableValue": "Valor de la variable personalitzada", - "CustomVariables": "Variables personalitzades", - "CustomVariablesReportDocumentation": "Aquest informe conté informació sobre les variables personaltizades. Feu click al nom d'una variable per veure la distribució dels valors. %1$s Per més informació sobre les variables personalitzades, podeu llegir la %2$sdocumentació sobre variables peronalitzades a matomo.org%3$s", - "ScopePage": "àmbit de la pàgina", - "ScopeVisit": "àmbit de la visita" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/cs.json b/plugins/CustomVariables/lang/cs.json deleted file mode 100644 index 3cb536662a..0000000000 --- a/plugins/CustomVariables/lang/cs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Název vlastní proměnné", - "ColumnCustomVariableValue": "Hodnota vlastní proměnné", - "CustomVariables": "Vlastní proměnné", - "CustomVariablesReportDocumentation": "Toto hlášení obsahuje informace o vašich vlastních proměnných. Klikněte na proměnnou pro zobrazení distribuce hodnot. %1$s Pro více informací si přečtěte %2$sdokumentaci o vlastních proměnných na matomo.org%3$s", - "ScopePage": "rozsah stránky", - "ScopeVisit": "rozsah návštěvy", - "ScopeConversion": "rozsah konverze", - "ManageDescription": "Tento přehled zobrazuje všechny sloty vlastních proměnných a jejich využití pro stránku '%s'. Jména v každém ze slotů jsou seřazena dle jejich celkového využití.", - "ScopeX": "Rozsah %s", - "Index": "Index", - "Usages": "Využití", - "Unused": "Nevyužito", - "CreateNewSlot": "Navýšit počet dostupných slotů vlastních proměnných", - "UsageDetails": "%1$s návštěv a %2$s akcí od založení tohoto webu.", - "CurrentAvailableCustomVariables": "Aktuálně můžete použít až %s vlastních proměnných na stránku.", - "SlotsReportIsGeneratedOverTime": "Data pro toto hlášení budou dostupná později. Než budou data vidět, může to den nebo dva trvat a poté několik týdnů než bude hlášení plně vypovídající.", - "MetricsAreOnlyAvailableForVisitScope": "Poznámka: Metriky %1$s jsou k dispozici pro vlastní proměnné pouze v rozsahu %2$s.", - "MetricsNotAvailableForPageScope": "Pro vlastní proměnné v rozsahu %1$s je hodnota sloupce s těmito metrikami %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/da.json b/plugins/CustomVariables/lang/da.json deleted file mode 100644 index 8793e117a2..0000000000 --- a/plugins/CustomVariables/lang/da.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Brugerdefineret variabelnavn", - "ColumnCustomVariableValue": "Brugerdefineret variabelværdi", - "CustomVariables": "Brugerdefinerede variabler", - "CustomVariablesReportDocumentation": "Rapporten indeholder oplysninger om brugerdefinerede variabler. Klik på et variabelnavn se fordeling af værdier. %1$s Yderligere oplysninger om brugerdefinerede variabler generelt, læs %2$sBrugerdefinerede variabel dokumentation på matomo.org%3$s", - "ScopePage": "virkefelt side", - "ScopeVisit": "virkefelt besøg", - "Index": "Indeks", - "Unused": "Ubrugt" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/de.json b/plugins/CustomVariables/lang/de.json deleted file mode 100644 index bce14022f0..0000000000 --- a/plugins/CustomVariables/lang/de.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Name der benutzerdefinierten Variable", - "ColumnCustomVariableValue": "Wert der benutzerdefinierten Variable", - "CustomVariables": "Benutzerdefinierte Variablen", - "CustomVariablesReportDocumentation": "Dieser Bericht enthält Informationen über Ihre benutzerdefinierten Variablen. Klicken Sie auf einen Variablennamen, um die Verteilung der Werte zu sehen. %1$s Für mehr Informationen über benutzerdefinierte Variablen, lesen Sie die %2$sDokumentation auf matomo.org%3$s", - "PluginDescription": "Benutzerdefinierte Variablen sind (Name, Wert)-Paare, welche Sie mit Hilfe der Javascript API Besuchern oder deren Aktionen zuweisen können. Matomo wird dann Besuche, Seiten, Konversionen für jede dieser benutzerdefinierten Namen und Werte protokollieren. Die detaillierten benutzerdefinierten Variablen lassen sich für jeden Benutzer und jede Aktion im Besucher Log anzeigen. Dieses Plugin wird benötigt für das Ecommerce Analytics Feature!", - "ScopePage": "Anwendungsbereich Seite", - "ScopeVisit": "Anwendungsbereich Besuch", - "ScopeConversion": "Anwendungsbereichkonversion", - "ManageDescription": "Diese Übersicht zeigt alle benutzerdefinierten Variablen und deren Gebrauch für Webseite %s. Die Namen auf jeder Position sind danach sortiert, wie oft sie insgesamt benützt wurden.", - "ScopeX": "Anwendungsbereich %s", - "Index": "Index", - "Usages": "Verwendungen", - "Unused": "Unbenutzt", - "CreateNewSlot": "Die Anzahl verfügbarer benutzerdefinierter Variablen erhöhen", - "UsageDetails": "%1$s Besuche und %2$s Aktionen seit der Erstellung dieser Website.", - "CreatingCustomVariableTakesTime": "Neue benutzerdefinierte Variablen zu erstellen kann viel Zeit beanspruchen, abhängig von der Größe Ihrer Datenbank. Deshalb ist dieser Vorgang nur über Kommandozeilen verfügbar.", - "CurrentAvailableCustomVariables": "Aktuell können Sie bis zu %s benutzerdefinierte Variablen pro Seite einsetzen.", - "ToCreateCustomVarExecute": "Um eine neue benutzerdefinierte Variable zu erstellen, führen Sie in Ihrer Matomo Installation folgenden Befehl aus:", - "SlotsReportIsGeneratedOverTime": "Daten für diesen Bericht werden periodisch veröffentlicht. Es mag ein oder zwei Tage dauern, bis Daten sichtbar sind und einige Wochen bis der Bericht vollständig aussagekräftig ist.", - "MetricsAreOnlyAvailableForVisitScope": "Hinweis: Die Metriken %1$s sind nur für benutzerdefinierte Variablen mit Geltungsbereich %2$s verfügbar.", - "MetricsNotAvailableForPageScope": "Für benutzerdefinierte Variablen mit Geltungsbereich %1$s ist der Wert für diese Metriken %2$s." - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/el.json b/plugins/CustomVariables/lang/el.json deleted file mode 100644 index 05313a979e..0000000000 --- a/plugins/CustomVariables/lang/el.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Ονομασία Προσαρμοσμένης Μεταβλητής", - "ColumnCustomVariableValue": "Τιμή Προσαρμοσμένης Μεταβλητής", - "CustomVariables": "Προσαρμοσμένες Μεταβλητές", - "CustomVariablesReportDocumentation": "Η αναφορά περιέχει πληροφορίες σχετικά με τις Προσαρμοσμένες Μεταβλητές. Κάντε κλικ στο όνομα μιας μεταβλητής για να δείτε την κατανομή των τιμών. %1$sΓια περισσότερες πληροφορίες σχετικά με τις Προσαρμοσμένες Μεταβλητές γενικά, διαβάστε την %2$sτεκμηρίωση για τις Προσαρμοσμένες Μεταβλητές στο matomo.org%3$s", - "PluginDescription": "Οι Προσαρμοσμένες Μεταβλητές είναι ζεύγη (όνομα, τιμή) που μπορείτε να ορίσετε με χρήση του Javascript API σε επισκέπτες ή σε οποιαδήποτε ενέργειά τους. Το Matomo θα αναφέρει τότε τον αριθμό των επισκέψεων, σελίδων, μετατροπών για κάθε ένα από αυτά τα ονόματα και τιμές. Δείτε τις λεπτομερείς Προσαρμοσμένες Μεταβλητές για κάθε χρήστη και ενέργεια στο Ημερολόγιο Επιοκεπτών. Το πρόσθετο απαιτείται για τη χρήση του χαρακτηριστικού Αναλυτικών Ηλεκτρονικού Εμπορίου!", - "ScopePage": "σελίδα σκοπού", - "ScopeVisit": "επίσκεψη σκοπού", - "ScopeConversion": "εύρος μετατροπής", - "ManageDescription": "Η σύνοψη αυτή δείχνει όλες τις σχισμές προσαρμοσμένων μεταβλητών και τις χρήσεις τους για τον ιστοτόπο '%s'. Τα ονόματα σε κάθε σχισμή ταξινομούνται με βάση το πόσο συχνά χρησιμοποιούνται στο σύνολο.", - "ScopeX": "Εμβέλεια %s", - "Index": "Ευρετήριο", - "Usages": "Χρήσεις", - "Unused": "Δεν χρησιμοποιούνται", - "CreateNewSlot": "Αυξήστε τον αριθμό των σχισμών Προσαρμοσμένων Μεταβλητών", - "UsageDetails": "%1$s επισκέψεις και %2$s ενέργειες από την στιγμή δημιουργίας του ιστοτόπου.", - "CreatingCustomVariableTakesTime": "Η δημιουργία νέας σχισμής προσαρμοσμένης μεταβλητής μπορεί να διαρκέσει αρκετό χρόνο ανάλογα με το μέγεθος της βάσης δεδομένων σας. Επομένως, είναι μόνο δυνατόν να το κάνετε αυτό μόνο μέσω εντολής που πρέπει να εκτελεστεί σε γραμμή εντολών.", - "CurrentAvailableCustomVariables": "Αυτή τη στιγμή μπορείτε να χρησιμοποιήσετε %s Προσαρμοσμένες Μεταβλητές ανά ιστοτόπο.", - "ToCreateCustomVarExecute": "Για να δημιουργήσετε μια σχισμή προσαρμοσμένης μεταβλητής πρέπει να εκτελέσετε την παρακάτω εντολή στην εγκατάσταση του Matomo σας:", - "SlotsReportIsGeneratedOverTime": "Τα δεδομένα για αυτή την αναφορά θα συμπληρώνονται με το πέρασμα του χρόνου. Μπορεί να χρειαστούν μία ή δύο μέρες για να δείτε δεδομένα και μερικές εβδομάδες μέχρι η αναφορά να είναι ακριβής.", - "MetricsAreOnlyAvailableForVisitScope": "Σημείωση: %1$s μετρικές είναι διαθέσιμες για τις Προσαρμοσμένες Μεταβλητές εμβέλειας %2$s μόνο.", - "MetricsNotAvailableForPageScope": "Για Προσαρμοσμένες Μεταβλητές εμβέλειας %1$s, η τιμή στήλης για τις μετρικές αυτές είναι %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json deleted file mode 100644 index 20fa625e53..0000000000 --- a/plugins/CustomVariables/lang/en.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Custom Variable name", - "ColumnCustomVariableValue": "Custom Variable value", - "CustomVariables": "Custom Variables", - "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on matomo.org%3$s", - "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Matomo will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log. This plugin is required to use Ecommerce Analytics feature!", - "ScopePage": "scope page", - "ScopeVisit": "scope visit", - "ScopeConversion": "scope conversion", - "ManageDescription": "This overview shows all custom variable slots and their usages for website '%s'. The names within each slot are ordered by how often they were used in total.", - "ScopeX": "Scope %s", - "Index": "Index", - "Usages": "Usages", - "Unused": "Unused", - "CreateNewSlot": "Increase the number of available Custom Variables slots", - "UsageDetails": "%1$s visits and %2$s actions since creation of this website.", - "CreatingCustomVariableTakesTime": "Creating a new custom variable slot can take a long time depending on the size of your database. Therefore, it is only possible to do this via a command which needs to be executed on the command line.", - "CurrentAvailableCustomVariables": "Currently you can use up to %s Custom Variables per site.", - "ToCreateCustomVarExecute": "To create a new custom variable slot execute the following command within your Matomo installation: ", - "SlotsReportIsGeneratedOverTime": "Data for this report will be populated over time. It may take a day or two to see any data and a few weeks until the report is fully accurate.", - "MetricsAreOnlyAvailableForVisitScope": "Note: %1$s metrics are available for Custom Variables of scope %2$s only.", - "MetricsNotAvailableForPageScope": "For Custom Variables of scope %1$s, the column value for these metrics is %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/es-ar.json b/plugins/CustomVariables/lang/es-ar.json deleted file mode 100644 index 9f77cf458b..0000000000 --- a/plugins/CustomVariables/lang/es-ar.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nombre de la variable personalizada", - "ColumnCustomVariableValue": "Valor de la variable personalizada", - "CustomVariables": "Variables personalizadas", - "CustomVariablesReportDocumentation": "Este informe contiene información sobre tus variables personalizadas. Hacé clic en el nombre de una variable para ver la distribución de los valores. %1$s Para más información sobre las variables personalizadas en general, leé la %2$sDocumentación de variables personalizadas en matomo.org%3$s.", - "PluginDescription": "Las variables personalizadas (nombre, valor) son pares que podés asignar usando la API de JavaScript a los visitantes o a cualquiera de sus acciones. Matomo informará la cantidad de visitas, páginas y conversiones para cada una de esos nombre y valores personalizados. Mirá las variables personalizadas en detalle para cada usuario y acción en el registro de visitas. ¡Se requiere este plugin para usar la función de análisis de comercio electrónico!", - "ScopePage": "ámbito de la página", - "ScopeVisit": "ámbito de la visita", - "ScopeConversion": "ámbito de la conversión", - "ManageDescription": "La vista general muestra todas las ranuras de variables personalizadas y sus usos para el sitio web \"%s\". Los nombres dentro de cada ranura están ordenados por su uso frecuente.", - "ScopeX": "Ámbito %s", - "Index": "Índice", - "Usages": "Usos", - "Unused": "Sin usar", - "CreateNewSlot": "Aumentar el número de ranuras de variables personalizadas", - "UsageDetails": "%1$s visitas y %2$s acciones desde la creación de este sitio web.", - "CreatingCustomVariableTakesTime": "Crear una nueva ranura de variable personalizada puede llevar mucho tiempo dependiendo del tamaño de tu base de datos. Por lo tanto, esto es posible de hacer sólo a través de un comando que necesita ejecutarse en una línea de comandos.", - "CurrentAvailableCustomVariables": "Actualmente, podés establecer hasta %s variables personalizadas por sitio web.", - "ToCreateCustomVarExecute": "Para crear una nueva ranura de variable personalizada, ejecutá el siguiente comando dentro de tu instalación de Matomo:", - "SlotsReportIsGeneratedOverTime": "Los datos para este informe será popularizados en el tiempo. Puede tomar un día o dos para ver cualquier dato, y algunas semanas hasta que el informe sea completamente preciso.", - "MetricsAreOnlyAvailableForVisitScope": "Nota: las mediciones de %1$s sólo están disponibles para variables personalizadas del ámbito de %2$s.", - "MetricsNotAvailableForPageScope": "Para variables personalizadas del ámbito de %1$s, el valor de columna de estas mediciones es %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/es.json b/plugins/CustomVariables/lang/es.json deleted file mode 100644 index 544d542fa9..0000000000 --- a/plugins/CustomVariables/lang/es.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nombre de la Variable Personalizada", - "ColumnCustomVariableValue": "Valor de la Variable Personalizada", - "CustomVariables": "Variables Personalizadas", - "CustomVariablesReportDocumentation": "Este informe contiene información sobre sus Variables Personalizadas. Haga clic en el nombre de una variable para ver la distribución de los valores. %1$s Para más información sobre las Variables Personalizadas en general, lea la %2$sdocumentación de Variables Personalizadas en matomo.org%3$s", - "PluginDescription": "Variables Personalizadas (nombre, valor) son pares que puede atribuir mediante la Javascript API a sus visitantes o a cualquiera de sus acciones. Matomo luego informará el número de visitas, páginas, las conversiones para cada uno de estos nombres y valores personalizados. Vea las variables personalizadas detalladas para cada usuario y sus acciones en el registro de visitantes. Este módulo es necesario para usar la función Ecommerce Analytics!", - "ScopePage": "ámbito de la página", - "ScopeVisit": "alcance de la visita", - "ScopeConversion": "alcance de la conversión", - "ManageDescription": "Esta visión general muestra todas las variantes personalizadas y su uso en los sitios '%s'. Los nombres dentro de cada espacio están clasificados por la frecuencia con que se utilizaron en su totalidad.", - "ScopeX": "Ambito %s", - "Index": "Índice", - "Usages": "Usos", - "Unused": "No usado", - "CreateNewSlot": "Aumente el número de variables personalizadas disponibles", - "UsageDetails": "%1$s visitas y %2$s acciones desde la creación de este sitio.", - "CreatingCustomVariableTakesTime": "Crear una nueva variable personalizada puede tomar un cierto tiempo dependiendo del tamaño de su base de datos. Por lo tanto, sólo es posible hacerlo vía un comando que necesita ser ejecutado desde la línea de comando.", - "CurrentAvailableCustomVariables": "Actualmente puede usar hasta %s variables personalizadas por sitio.", - "ToCreateCustomVarExecute": "Para crear una nueva variable personalizada ejecute el siguiente comando dentro de su instalación Matomo:", - "SlotsReportIsGeneratedOverTime": "Los datos de este informe irán aumentando con el tiempo. Puede tomar un día o dos para ver cualquier dato y unas pocas semanas hasta que el informe sea totalmente exacto.", - "MetricsAreOnlyAvailableForVisitScope": "Nota: Solo %1$s métricas están disponibles para las variables personalizadas de ámbito %2$s.", - "MetricsNotAvailableForPageScope": "Para variables personalizadas de ámbito %1$s, el valor de estas métricas es %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/et.json b/plugins/CustomVariables/lang/et.json deleted file mode 100644 index f31dad1d55..0000000000 --- a/plugins/CustomVariables/lang/et.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Kohandatud muutuja nimi", - "ColumnCustomVariableValue": "Kohandatud muutuja väärtus", - "CustomVariables": "Kohandatud muutujad", - "ScopePage": "skoop: lehekülg", - "ScopeVisit": "skoop: külastus", - "Index": "Indeks", - "Usages": "Kasutamised" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/fa.json b/plugins/CustomVariables/lang/fa.json deleted file mode 100644 index 8bf8706f20..0000000000 --- a/plugins/CustomVariables/lang/fa.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "نام متغیر سفارشی", - "ColumnCustomVariableValue": "مقدار متغیر سفارشی", - "CustomVariables": "متغیرهای سفارشی", - "ScopePage": "حوزه صفحه", - "ScopeVisit": "بازدید دامنه" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/fi.json b/plugins/CustomVariables/lang/fi.json deleted file mode 100644 index 95d48ea3f6..0000000000 --- a/plugins/CustomVariables/lang/fi.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Kustomoidun muuttujan nimi", - "ColumnCustomVariableValue": "Kustomoidun muuttujan arvo", - "CustomVariables": "Kustomoidut muuttujat", - "CustomVariablesReportDocumentation": "Tämä raportti sisältää tietoa kustomoiduista muuttujastasi. Voit tarkastella eri arvojen määrää klikkaamalla muuttujan nimeä. %1$s Saat lisätietoa kustomoiduista muuttujista %2$sCustom Variables%3$s-sivulta matomo.orgista (englanninkielinen)", - "ScopePage": "alueena sivu", - "ScopeVisit": "alueena käynti", - "ManageDescription": "Tämä on yleiskatsaus kaikista kustomoiduista muuttujista ja niiden käytöstä verkkosivulla '%s'. Nimet on järjestetty käyttömäärien mukaan.", - "ScopeX": "Alueena %s", - "Index": "Indeksi", - "Usages": "Käytöt", - "Unused": "Käyttämätön", - "UsageDetails": "%1$s käyntiä ja %2$s toimintoa tämän sivuston luomisen jälkeen." - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/fr.json b/plugins/CustomVariables/lang/fr.json deleted file mode 100644 index d8439adf6d..0000000000 --- a/plugins/CustomVariables/lang/fr.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nom de la variable personnalisée", - "ColumnCustomVariableValue": "Valeur de la variable personnalisée", - "CustomVariables": "Variables personnalisées", - "CustomVariablesReportDocumentation": "Ce rapport contient des informations à propos de vos Variables Personnalisées. Cliquez sur un nom de variable pour voir la répartition de la valeur. %1$s Pour plus d'informations à propos des variables personnalisées en général, lisez la %2$s documentation sur les variables personnalisées sur matomo.org%3$s", - "PluginDescription": "Les Variables Personnalisées sont des paires (nom, valeur) que vous pouvez assigner aux visiteurs, n'importe quelle de leurs actions en utilisant l'API JavaScript. Matomo rapportera ensuite combien de visites, pages, conversions pour chacun des ces noms et valeurs personnalisés. Consultez le détail des variables personnalisées pour chaque utilisateur et action dans le journal des visiteurs. Ce composant est requis afin d'utilise les fonctionnalités d'analyse e-commerce !", - "ScopePage": "Étendue page", - "ScopeVisit": "Étendue visite", - "ScopeConversion": "conversion de portée", - "ManageDescription": "Cette vue d'ensemble affiche tous les emplacements de variables personnalisées et leur utilisation pour le site web \"%s\". Les noms dans chacun des emplacements sont ordonnés par le nombre de fois qu'elles ont été utilisées au total.", - "ScopeX": "Etendue %s", - "Index": "Index", - "Usages": "Usages", - "Unused": "Inutilisé", - "CreateNewSlot": "Augmenter le nombre d'emplacement de variables personnalisées disponibles", - "UsageDetails": "%1$s visites et %2$s actions depuis la création de ce site web.", - "CreatingCustomVariableTakesTime": "La création d'un nouvel emplacement de variable personnalisée peut prendre du temps dépendamment de la taille de votre base de données. De ce fait il est possible d'effectuer cela uniquement via une commande qui doit être exécutée dans la console.", - "CurrentAvailableCustomVariables": "Pour l'instant vous pouvez utiliser jusqu'à %s Variables personnalisées par site.", - "ToCreateCustomVarExecute": "Pour créer un nouvel emplacement de variable personnalisée exécutez la commande suivante dans votre installation de Matomo :", - "SlotsReportIsGeneratedOverTime": "Les données pour ce rapport vont être peuplées avec le temps. Il se peut que cela prenne un jour ou deux pour voir des informations et quelques semaines avant que le rapport ne soit précis.", - "MetricsAreOnlyAvailableForVisitScope": "Note : %1$s les métriques sont disponibles pour les variables personnalisées de la portée %2$s uniquement.", - "MetricsNotAvailableForPageScope": "Pour les variables personnalisées de la portée %1$s, la valeur de colonne pour ces métriques est %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/he.json b/plugins/CustomVariables/lang/he.json deleted file mode 100644 index 89286c388a..0000000000 --- a/plugins/CustomVariables/lang/he.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "שם המשתנה", - "ColumnCustomVariableValue": "ערך המשתנה", - "CustomVariables": "משתנים מותאמים אישים" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/hi.json b/plugins/CustomVariables/lang/hi.json deleted file mode 100644 index 083326363a..0000000000 --- a/plugins/CustomVariables/lang/hi.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "विशेष चर नाम", - "ColumnCustomVariableValue": "विशेष चर मूल्य", - "CustomVariables": "विशेष चर", - "CustomVariablesReportDocumentation": "यह रिपोर्ट आपके कस्टम चर के बारे में जानकारी शामिल हैं. मूल्यों के वितरण को देखने के लिए एक चर के नाम पर क्लिक करें. %1$sसामान्य रूप में %2$sकस्टम चर के बारे में अधिक जानकारी के लिए, matomo.org %3$s पर कस्टम चर दस्तावेज़ पढ़ें", - "ScopePage": "प्रसार पृष्ठ", - "ScopeVisit": "प्रसार यात्रा" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/id.json b/plugins/CustomVariables/lang/id.json deleted file mode 100644 index 78db4630eb..0000000000 --- a/plugins/CustomVariables/lang/id.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nama Variabel Kustom", - "ColumnCustomVariableValue": "Nilai Variabel Kustom", - "CustomVariables": "Variabel Kustom", - "CustomVariablesReportDocumentation": "Laporan ini mengandung informasi tentang Variabel Kustom Anda. Klik di nama variabel untuk melihat distribusi nilai. %1$s Informasi lebih lengkap tentang Vabiabel Kustom, baca %2$sdokumentasi Vabiabel Kustom di matomo.org%3$s", - "ScopePage": "cakupan halaman", - "ScopeVisit": "cakupan kunjungan", - "Index": "Indeks", - "Usages": "Penggunaan", - "Unused": "Tidak digunakan" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/it.json b/plugins/CustomVariables/lang/it.json deleted file mode 100644 index 871a5abf49..0000000000 --- a/plugins/CustomVariables/lang/it.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nome Variabile Personalizzata", - "ColumnCustomVariableValue": "Valore Variabile Personalizzata", - "CustomVariables": "Variabile Personalizzata", - "CustomVariablesReportDocumentation": "Questo report contiene informazioni sulle variabili personalizzate. Clicca sul nome di una variabile per vedere la distribuzione dei valori. %1$s Per ulteriori informazioni sulle Variabili Personalizzate in generale, leggi la %2$sdocumentazione sulle Variabili Personalizzate su matomo.org%3$s", - "PluginDescription": "Le Variabili Personalizzate sono coppie (nome, valore) che è possibile assegnare utilizzando l'API di Javascript ai visitatori o una qualsiasi delle loro azioni. Matomo segnalerà quindi quante visite, pagine, conversioni per ciascuno di questi nomi e valori personalizzati. Visualizza le variabili personalizzate dettagliate per ogni utente e azione nel Registro Visitatori. Questo plug-in è necessario per utilizzare la funzione di Analisi Ecommerce!", - "ScopePage": "ambito pagina", - "ScopeVisit": "ambito visita", - "ScopeConversion": "conversione scope", - "ManageDescription": "Questa panoramica mostra tutti gli slot di variabili personali e il loro utilizzo nel sito '%s'. I nomi in ciascuno slot vengono ordinati a seconda di quanto sono stati utilizzati in totale.", - "ScopeX": "Ambito %s", - "Index": "Indice", - "Usages": "Usi", - "Unused": "Inutilizzate", - "CreateNewSlot": "Aumenta il numero degli slot di variabili personali disponibili", - "UsageDetails": "%1$s visite e %2$s azioni dalla creazione di questo sito web.", - "CreatingCustomVariableTakesTime": "La creazione di un nuovo slot di variabile personalizzata può richiedere molto tempo a seconda delle dimensioni del database. Pertanto, è possibile farlo solo tramite un comando che deve essere eseguito dalla riga di comando.", - "CurrentAvailableCustomVariables": "Attualmente puoi utilizzare fino a %s variabili personali per sito.", - "ToCreateCustomVarExecute": "Per creare un nuovo slot di variabili personalizzate esegui il comando seguente nella tua installazione di Matomo:", - "SlotsReportIsGeneratedOverTime": "I dati per questo report saranno popolati nel tempo. Ciò può richiedere un giorno o due per vedere dei dati, e qualche settimana perché il report sia totalmente accurato.", - "MetricsAreOnlyAvailableForVisitScope": "Nota: Sono disponibili %1$s metriche per le Variabili Speciali solo per l'ambito %2$s.", - "MetricsNotAvailableForPageScope": "Per le Variabili Speciali dell'ambito %1$s, il valore colonna è %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ja.json b/plugins/CustomVariables/lang/ja.json deleted file mode 100644 index 30cc32e763..0000000000 --- a/plugins/CustomVariables/lang/ja.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "カスタム変数名", - "ColumnCustomVariableValue": "カスタム変数値", - "CustomVariables": "カスタム変数", - "CustomVariablesReportDocumentation": "このレポートには、カスタム変数に関する情報が含まれています。値の分布を表示するには、変数名をクリックして下さい。%1$s 一般的なカスタム変数の詳細については、%2$sCustom Variables documentation on matomo.org%3$s をお読み下さい。", - "PluginDescription": "カスタム変数は、Javascript API を使用してビジターまたはそのアクションに割り当てることができる（名前、値）のペアです。 Matomo はこれらのカスタム名と値のそれぞれについて、ビジット数、ページ数、コンバージョン数をレポートします。 ビジターログの各ユーザーとアクションの詳細なカスタム変数を表示します。 このプラグインは、Eコマース分析機能を使用するために必要です。", - "ScopePage": "ページの範囲", - "ScopeVisit": "ビジットの範囲", - "ScopeConversion": "スコープコンバージョン", - "ManageDescription": "この概観では、すべてのカスタム変数スロットと、ウェブサイト '%s' の用途を示します。 各スロット内の名前は、合計で使用された頻度によって並べられます。", - "ScopeX": "範囲 %s", - "Index": "インデックス", - "Usages": "使用", - "Unused": "未使用", - "CreateNewSlot": "利用可能なカスタム変数スロットの数を増やす", - "UsageDetails": "このサイト作成以来、%1$s のビジット数と %2$s のアクション数", - "CreatingCustomVariableTakesTime": "データベースのサイズによっては、新しいカスタム変数スロットの作成に時間がかかることがあります。 したがって、コマンドラインで実行する必要があるコマンドを介してのみこれを実行できます。", - "CurrentAvailableCustomVariables": "現在は、1 サイトあたり最大 %s のカスタム変数を使用できます。", - "ToCreateCustomVarExecute": "新しいカスタム変数スロットを作成するには、Matomo インストール内で次のコマンドを実行します。", - "SlotsReportIsGeneratedOverTime": "このレポートのデータ集計には時間がかかります。 レポートが完全に正確になるまで、データを見るには1 ～2日、または数週間かかる場合があります。", - "MetricsAreOnlyAvailableForVisitScope": "注：%1$s メトリックは、スコープ %2$s のカスタム変数でのみ使用できます。", - "MetricsNotAvailableForPageScope": "スコープ %1$s のカスタム変数の場合、これらのメトリックの列値は %2$s です" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ko.json b/plugins/CustomVariables/lang/ko.json deleted file mode 100644 index 9dd491b719..0000000000 --- a/plugins/CustomVariables/lang/ko.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "맞춤 변수 이름", - "ColumnCustomVariableValue": "맞춤 변수 값", - "CustomVariables": "맞춤 변수", - "CustomVariablesReportDocumentation": "이 보고서는 맞춤 변수에 대한 정보를 포함합니다. 변수 이름을 클릭하여 값의 분포를 확인할 수 있습니다. %1$s 맞춤 변수에 대한 자세한 내용은 %2$smatomo.org의 맞춤 변수 설명서%3$s를 참조하세요.", - "ScopePage": "페이지 범위", - "ScopeVisit": "방문 범위" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/nb.json b/plugins/CustomVariables/lang/nb.json deleted file mode 100644 index 4173ad129d..0000000000 --- a/plugins/CustomVariables/lang/nb.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Navn på egendefinert variabel", - "ColumnCustomVariableValue": "Verdi på egendefinert variabel", - "CustomVariables": "Egendefinerte variabler", - "CustomVariablesReportDocumentation": "Denne rapporten inneholder informasjon om dine egendefinerte variabler. Klikk på et variabelnavn for å se fordelingen av verdier. %1$sFor mer informasjon om egendefinerte variabler, les %2$sdokumentasjonen om egendefinerte variabler på matomo.org%3$s", - "ScopePage": "gjelder side", - "ScopeVisit": "gjelder besøk", - "ManageDescription": "Dette sammendraget viser alle mulige egendefinerte variabler og deres bruk for nettstedet «%s». Navnene i hver «luke» er sortert etter hvor ofte de blir brukt.", - "ScopeX": "Gjelder %s", - "Index": "Indeks", - "Usages": "Bruk", - "Unused": "Ubrukt", - "CreateNewSlot": "Øk antallet tilgjengelige egendefinerte variabler", - "UsageDetails": "%1$s besøk og %2$s handlinger siden dette nettstedet ble laget.", - "CurrentAvailableCustomVariables": "Nå kan du bruke opp til %s egendefinerte variabler per nettsted.", - "SlotsReportIsGeneratedOverTime": "Data for denne rapporten vil bli synlige over tid. Det kan ta en dag eller to før du kan se data, og noen uker før rapportene er helt nøyaktige.", - "MetricsAreOnlyAvailableForVisitScope": "Merk: %1$s-måltall er kun tilgjengelige for egendefinerte variabler som gjelder %2$s.", - "MetricsNotAvailableForPageScope": "For egendefinerte variabler som gjelder %1$s, er kolonneverdien for disse måltallene %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/nl.json b/plugins/CustomVariables/lang/nl.json deleted file mode 100644 index 69fa838a1b..0000000000 --- a/plugins/CustomVariables/lang/nl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Naam aangepaste variabele", - "ColumnCustomVariableValue": "Waarde aangepaste variabele", - "CustomVariables": "Aangepaste variabelen", - "CustomVariablesReportDocumentation": "Dit rapport bevat informatie over uw aangepaste variabelen. Klik op de naam van een variabele om de verdeling van de waarden te zien. %1$s voor meer informatie over aangepaste variabelen in het algemeen, lees de %2$sCustom variabelen documentatie over matomo.org%3$s", - "PluginDescription": "Aangepaste Variabelen zijn (naam, waarde) paren welke je kan toekennen door de Javascritp API aan bezoekers of aan één van hun acties. Matomo rapporteert dan hoeveel bezoeken, pagina's, conversies voor elk van deze custom namen en waarden. Bekijk de gedetailleerde Aangepaste Variabelen voor elke gebruiker en actie in de Visitor Log. Deze plugin is nodig om de Ecommerce Analytics opties te gebruiken.", - "ScopePage": "omvang pagina", - "ScopeVisit": "omvang bezoek", - "ScopeConversion": "omvang conversie", - "ManageDescription": "Dit overzicht toont alle slots van custom variabelen en het gebruik voor websites '%s'. De namen in elk slot zijn gesorteerd op hoe vaak ze in totaal zijn gebruikt.", - "ScopeX": "Scope %s", - "Index": "Index", - "Usages": "Gebruikt", - "Unused": "Ongebruikt", - "CreateNewSlot": "Verhoog het aantal van beschikbare Custom Variabelen slots", - "UsageDetails": "%1$s bezoeken en %2$s acties sinds het maken van deze website.", - "CreatingCustomVariableTakesTime": "Het maken van een nieuw custom variabele slot kan lang duren afhankelijk van de grootte van de database. Daarom is het alleen mogelijk om dit te doen via een commando welke uitgevoerd dient te worden op de command line.", - "CurrentAvailableCustomVariables": "Op dit moment kan je in totaal %s Custom Variables per website gebruiken.", - "ToCreateCustomVarExecute": "Om een nieuw custom variabele slot aan te maken voer het volgende commando uit op je Matomo installatie:", - "SlotsReportIsGeneratedOverTime": "De data voor dit verslag wordt na verloop van tijd gegenereerd. Het kan een dag of twee duren voordat je de data ziet en een paar weken tot het rapport helemaal nauwkeurig is.", - "MetricsAreOnlyAvailableForVisitScope": "Opmerking: %1$s metrics zijn beeschikbaar voor Custom Variables alleen voor bereik %2$s .", - "MetricsNotAvailableForPageScope": "Voor Custom Variabelen met bereik %1$s, de kolom waarde deze metriek is %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/pl.json b/plugins/CustomVariables/lang/pl.json deleted file mode 100644 index 0eaa6c26fc..0000000000 --- a/plugins/CustomVariables/lang/pl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nazwa Zmiennej Niestandardowej", - "ColumnCustomVariableValue": "Wartość Zmiennej Niestandardowej", - "CustomVariables": "Zmienne Niestandardowe", - "CustomVariablesReportDocumentation": "Raport ten zawiera informacje na temat Zmiennych Niestandardowych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %1$sWięcej informacji o Zmiennych Niestandardowych, znajdziesz w dokumentacji %2$sZmienne Niestandardowe na matomo.org%3$s", - "ScopePage": "zakres stron", - "ScopeVisit": "zakres wizyt", - "ScopeConversion": "zakres konwersji", - "ManageDescription": "Ten przegląd pokazuje wszystkie pola Zmiennych Niestandardowych i ich wykorzystanie w serwisie '%s'. Każdy przedział zawiera nazwy uporządkowane według częstości ich łącznego wykorzystanie.", - "ScopeX": "Zakres %s", - "Index": "Indeks", - "Usages": "Wykorzystanie", - "Unused": "Niewykorzystane", - "CreateNewSlot": "Zwiększ liczbę dostępnych pól Zmiennych Niestandardowych", - "UsageDetails": "%1$s wizyt i %2$s akcji od utworzenia tego serwisu.", - "CurrentAvailableCustomVariables": "Obecnie możesz wykorzystać do %s Zmiennych Niestandardowych per serwis.", - "ToCreateCustomVarExecute": "Aby utworzyć nowe pole Zmiennej Niestandardowej wykonaj następujące polecenie w ramach swojej instalacji Matomo:", - "SlotsReportIsGeneratedOverTime": "Dane dla tego raportu pojawią się po jakimś czasie. Dzień lub dwa może potrwać zanim zobaczysz jakiekolwiek dane a uzyskanie dokładnego raportu może potrwać nawet parę tygodni.", - "MetricsAreOnlyAvailableForVisitScope": "NOTKA: wskaźniki %1$s są dostępne jedynie dla Zmiennych Niestandardowych tylko w zakresie %2$s.", - "MetricsNotAvailableForPageScope": "Dla Zmiennych Niestandardowych z zakresu %1$s, kolumna wartość dla tych wskaźników to %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/pt-br.json b/plugins/CustomVariables/lang/pt-br.json deleted file mode 100644 index 547bdedab7..0000000000 --- a/plugins/CustomVariables/lang/pt-br.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nome da Variável Personalizada", - "ColumnCustomVariableValue": "Valor de variável personalizado", - "CustomVariables": "Variáveis personalizadas", - "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as suas variáveis personalizadas. Clique em um nome de variável para ver a distribuição dos valores. %1$s para mais informações sobre variáveis personalizadas em geral, leia a documentação %2$sCustom Variáveis em matomo.org%3$s", - "PluginDescription": "As Variáveis Personalizadas são pares (nome, valor) que você pode atribuir utilizando a API Javascript para visitantes ou qualquer ação deles. Matomo informará quantas visitas, páginas e conversões para cada um desses nomes e valores personalizados. Veja as Variáveis Personalizadas detalhadas para cada usuário e a ação no Registro de Visitante. Este plugin é necessário para usar o características Ecommerce Analytics!", - "ScopePage": "página escopo", - "ScopeVisit": "visita escopo", - "ScopeConversion": "conversão de escopo", - "ManageDescription": "Esta visão geral mostra todos os compartimentos personalizados de variáveis e seus usos para o website '%s'. Os nomes dentro de cada compartimento são ordenados por quantas vezes foram utilizados no total.", - "ScopeX": "Escopo %s", - "Index": "Índice", - "Usages": "Utilizações", - "Unused": "Não utilizado", - "CreateNewSlot": "Aumentar o número de compartimentos de Variáveis Personalizadas disponíveis", - "UsageDetails": "%1$s visitas e %2$s ações desde a criação deste website.", - "CreatingCustomVariableTakesTime": "Criar um novo compartimento de variável personalizada pode levar um longo tempo, dependendo do tamanho do seu banco de dados. Portanto, só é possível fazer isso por meio de um comando que deve ser executado na linha de comando.", - "CurrentAvailableCustomVariables": "Atualmente você pode usar até %s Variáveis Personalizadas por site.", - "ToCreateCustomVarExecute": "Para criar uma nova variável personalizada execute o seguinte comando dentro da sua instalação Matomo:", - "SlotsReportIsGeneratedOverTime": "Os dados para este relatório serão preenchidos ao longo do tempo. Pode demorar um dia ou dois para ver todos os dados e algumas semanas até que o relatório seja totalmente preciso.", - "MetricsAreOnlyAvailableForVisitScope": "Nota: %1$s métricas estão disponíveis apenas para as Variáveis Personalizadas de alcance %2$s.", - "MetricsNotAvailableForPageScope": "Para as Variáveis Personalizadas de alcance %1$s, o valor da coluna para essas métricas é %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/pt.json b/plugins/CustomVariables/lang/pt.json deleted file mode 100644 index 8e8f14542c..0000000000 --- a/plugins/CustomVariables/lang/pt.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Nome da variável personalizada", - "ColumnCustomVariableValue": "Valor da variável personalizada", - "CustomVariables": "Variáveis personalizadas", - "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as Variáveis personalizadas. Clique no nome de uma variável para ver a distribuição dos valores. %1$s Para mais informações sobre Variáveis personalizadas em geral, deve consultar a %2$sdocumentação sobre Variáveis personalizadas em matomo.org %3$s", - "PluginDescription": "As variáveis personalizadas são pares (nome, valor) que pode, com recurso à API JavaScript, atribuir a visitantes ou qualquer uma das suas ações. O Matomo irá depois reportar quantas visitas, páginas, conversões para cada um destes nomes e valores personalizados. Consulte os detalhes das Variáveis personalizadas para cada utilizar e ação no Registo de visitantes. Esta extensão é necessária para utilizar a funcionalidade de Análise de comércio eletrónico!", - "ScopePage": "âmbito da página", - "ScopeVisit": "âmbito da visita", - "ScopeConversion": "âmbito da conversão", - "ManageDescription": "Esta visão geral mostra todos os espaços para variáveis personalizadas e as respetivas utilizações para o site '%s'. Os nomes em cada espaço são ordenados pelo total da frequência de utilização.", - "ScopeX": "Âmbito da %s", - "Index": "Índice", - "Usages": "Utilizações", - "Unused": "Não utilizado", - "CreateNewSlot": "Aumentar o número de espaços disponíveis para Variáveis personalizadas", - "UsageDetails": "%1$s visitas e %2$s ações desde a criação deste site.", - "CreatingCustomVariableTakesTime": "A criação de um novo espaço para uma variável personalizada pode demorar algum tempo, dependendo do tamanho da sua base de dados. Assim sendo, torna-se somente possível fazê-lo através de um comando que precisa de ser executado na linha de comandos.", - "CurrentAvailableCustomVariables": "Atualmente pode utilizar até %s variáveis personalizadas por site.", - "ToCreateCustomVarExecute": "Para criar um novo espaço para uma variável personalizada, execute o seguinte comando na sua instalação do Matomo:", - "SlotsReportIsGeneratedOverTime": "Os dados para este relatório serão apurados ao longo do tempo. Pode demorar um dia ou dois até serem apresentados alguns dados e algumas semanas até o relatório ser completamente fidedigno.", - "MetricsAreOnlyAvailableForVisitScope": "Nota: estão disponíveis %1$s métricas para Variáveis personalizadas especificamente de âmbito %2$s", - "MetricsNotAvailableForPageScope": "Para variáveis personalizadas de âmbito %1$s, o valor da coluna para estas métricas é %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ro.json b/plugins/CustomVariables/lang/ro.json deleted file mode 100644 index a22b32924a..0000000000 --- a/plugins/CustomVariables/lang/ro.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Denumirea variabilei personalizate", - "ColumnCustomVariableValue": "Valoarea variabilei personalizate", - "CustomVariables": "Variabile personalizate", - "CustomVariablesReportDocumentation": "Acest raport conține informații despre Variabilele Personalizate. Faceți clic pe un nume de variabilă pentru a vedea distribuția valorilor. %1$s Pentru mai multe informații despre variabile personalizate, în general, citiți %2$sdocumentatia Variabilelor Personalizate matomo.org%3$s", - "ScopePage": "scop pagină", - "ScopeVisit": "scop vizită" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ru.json b/plugins/CustomVariables/lang/ru.json deleted file mode 100644 index 80fb3c81b0..0000000000 --- a/plugins/CustomVariables/lang/ru.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Имя пользовательской переменной", - "ColumnCustomVariableValue": "Значение пользовательской переменной", - "CustomVariables": "Пользовательские переменные", - "CustomVariablesReportDocumentation": "Этот отчет отображает информацию по вашим Пользовательским Переменным. Кликните по переменной, чтобы увидеть распределение значений. %1$s Для большей информации о Пользов. Переменных в общих чертах ознакомьтесь с %2$sдокументацией по Пользов. переменных на сайте matomo.org%3$s", - "PluginDescription": "Пользовательские переменные — это пара (имя, значение), которую вы можете назначить с помощью Javascript API посетителям или любым их действиям. Затем Matomo сообщит, сколько посещений, страниц, конверсий для каждого из этих пользовательских имён и значений. Просмотрите подробные пользовательские переменные для каждого пользователя и действия в журнале посещений. Этот плагин необходим для использования функции Ecommerce Analytics!", - "ScopePage": "область страницы", - "ScopeVisit": "область визита", - "ScopeConversion": "область конверсии", - "ManageDescription": "Этот обзор показывает все слоты для пользовательских переменных и их использование для вебсайта «%s». Названия в пределах одного слота распределены по общей частоте использования.", - "ScopeX": "Область %s", - "Index": "Индекс", - "Usages": "Использование", - "Unused": "Не использовано", - "CreateNewSlot": "Увеличить количество доступных слотов Пользовательских переменных", - "UsageDetails": "%1$s посещений и %2$s действий с момента создания этого вебсайта.", - "CurrentAvailableCustomVariables": "В данный момент вы можете использовать до %s Пользовательских переменных на сайт.", - "ToCreateCustomVarExecute": "Чтобы создать новый пользовательский слот переменной, выполните следующую команду в вашей установке Matomo:", - "SlotsReportIsGeneratedOverTime": "Информация для этого отчета будет заполнена со временем. Это может занять день или два, чтобы увидеть какую-либо информацию, и несколько недель, чтобы получить точный отчет.", - "MetricsAreOnlyAvailableForVisitScope": "Замечание: %1$s метрика доступна только для Пользовательских переменных выборки %2$s.", - "MetricsNotAvailableForPageScope": "Для выборки Пользовательских переменных %1$s, значение столбца для этих метрик — %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/sk.json b/plugins/CustomVariables/lang/sk.json deleted file mode 100644 index 84445a2338..0000000000 --- a/plugins/CustomVariables/lang/sk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Názov vlastnej premennej", - "ColumnCustomVariableValue": "Hodnota vlastnej premennej", - "CustomVariables": "Vlastné premenné", - "ScopeX": "Rozsah %s", - "Index": "Index", - "Unused": "Nepoužité" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/sl.json b/plugins/CustomVariables/lang/sl.json deleted file mode 100644 index b01937df54..0000000000 --- a/plugins/CustomVariables/lang/sl.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "CustomVariables": { - "CustomVariables": "Dodatni parametri" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/sq.json b/plugins/CustomVariables/lang/sq.json deleted file mode 100644 index 30fbd3bab7..0000000000 --- a/plugins/CustomVariables/lang/sq.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Emër Ndryshoreje Vetjake", - "ColumnCustomVariableValue": "Vlerë Ndryshoreje Vetjake", - "CustomVariables": "Ndryshore Vetjake", - "CustomVariablesReportDocumentation": "Ky raport përmban të dhëna rreth Ndryshoreve tuaja Vetjake. Klikoni mbi një emër ndryshoreje që të shihni shpërndarjen e vlerave. %1$s Për më tepër të dhëna rreth Ndryshoresh Vetjake në përgjithësi, lexoni %2$sdokumentimin e Ndryshoreve Vetjake te matomo.org%3$s", - "PluginDescription": "Ndryshoret Vetjake janë çifte (emër, vlerë) që duke përdorur API-n Javascript mund t’ua përshoqëroni vizitorëve apo cilitdo veprimi të tyre. Matomo mandej do të raportojë sa vizita, faqe, shndërrime për secilin nga këto emra dhe vlera. Shihni në hollësi Ndryshore Vetjake për çdo përdorues dhe veprim te Regjistri i Vizitorëve.<br \/>E domosdoshme për të përdorur veçorinë <a href=\\\"https:\/\/matomo.org\/docs\/ecommerce-analytics\/\">Analiza E-tregtie<\/a>!", - "ScopePage": "faqe me qëllim", - "ScopeVisit": "vizitë me qëllim", - "ScopeConversion": "shndërrim me qëllim", - "ManageDescription": "Kjo përmbledhje tregon krejt vendet e ndryshoreve vetjake dhe përdorimin e tyre për sajtin '%s'. Emrat brenda secilit vend renditen sipas shpeshtisë së përdorimit të tyre gjithsej.", - "ScopeX": "Fusha %s", - "Index": "Tregues", - "Usages": "Përdorime", - "Unused": "I papërdorur", - "CreateNewSlot": "Rrite numrin e vendeve të mundshme të Ndryshoreve Vetjake", - "UsageDetails": "%1$s vizita dhe %2$s veprime që nga krijimi i sajtit.", - "CreatingCustomVariableTakesTime": "Krijimi i një vendi të ri ndryshoreje vetjake mund të dojë një kohë të gjatë, në varësi të madhësisë së bazës suaj të të dhënave. Ndaj kjo është e mundur të bëhet vetëm përmes një urdhri që lypset të xhirohet te rreshti i urdhrave.", - "CurrentAvailableCustomVariables": "Hëpërhë mund të përdorni deri në %s Ndryshore Vetjake për sajt.", - "ToCreateCustomVarExecute": "Për krijimin e një vendi të ri ndryshoreje vetjake përmbushni urdhrin vijues brenda instalimit tuaj të Matomo-s:", - "SlotsReportIsGeneratedOverTime": "Të dhënat për këtë raport do të mblidhen me kalimin e kohës. Mund të duhen një a dy ditë që të shihni çfarëdo të dhënash dhe ca javë përpara se raporti të jetë plotësisht i saktë.", - "MetricsAreOnlyAvailableForVisitScope": "Shënim: Vlerat %1$s janë të passhme vetëm për Ndryshore Vetjake të fushës %2$s.", - "MetricsNotAvailableForPageScope": "Për Ndryshore Vetjake të fushës %1$s, vlera e shtyllës për këto të dhëna është %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/sr.json b/plugins/CustomVariables/lang/sr.json deleted file mode 100644 index b8d92d873e..0000000000 --- a/plugins/CustomVariables/lang/sr.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Ime dodatnog parametra", - "ColumnCustomVariableValue": "Vrednost dodatnog parametra", - "CustomVariables": "Dodatni parametri", - "CustomVariablesReportDocumentation": "Ovaj izveštaj sadrži informacije o dodatnim parametrima. Kliknite na ime parametra kako biste videli distribuciju vrednosti. %1$s Za više informacija o dodatnim parametrima pogledajte %2$sCustom Variables na matomo.org%3$s", - "ScopePage": "oblast strana", - "ScopeVisit": "oblast poseta", - "ManageDescription": "Ovaj pregled prikazuje sve dodatne parametre i njihovu upotrebu za sajt '%s'. Nazivi su poređani po tome koliko često je koja upotrebljena.", - "ScopeX": "Oblast %s", - "Index": "Indeks", - "Usages": "Upotrebe", - "Unused": "Neiskorišćeno", - "CreateNewSlot": "Povećajte broj raspoloživih dodatnih parametara.", - "UsageDetails": "%1$s poseta i %2$sakcija od kreiranja ovog sajta.", - "CurrentAvailableCustomVariables": "Trenutno možete da koristite do %s dodatnih parametara po sajtu.", - "SlotsReportIsGeneratedOverTime": "Podaci za ovaj izveštaj će biti pripremani tokom vremena. Može proći dan ili dva pre nego što budete videli bilo kakve podatke i nekoliko nedelja pre nego što izveštaj bude bio potpuno precizan.", - "MetricsAreOnlyAvailableForVisitScope": "Pažnja: samo %1$s metrika je na raspolaganju za dodatne parametre u opsegu %2$s.", - "MetricsNotAvailableForPageScope": "Za dodatne parametre iz oblasti %1$s, vrednost kolone za te metrike je %2$s." - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/sv.json b/plugins/CustomVariables/lang/sv.json deleted file mode 100644 index f5aa28dcbb..0000000000 --- a/plugins/CustomVariables/lang/sv.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Anpassat variabelnamn", - "ColumnCustomVariableValue": "Anpassat variabelvärde", - "CustomVariables": "Anpassade variabler", - "CustomVariablesReportDocumentation": "Denna rapport innehåller information om din anpassade variabler. Klicka på ett variabelnamn för att se fördelningen av värdena. %1$s För mer information om anpassade variabler i allmänhet, läs %2$sdokumentationen om anpassade variabler på matomo.org%3$s", - "PluginDescription": "Anpassade variabler är namn-värde-par som du kan tillskriva genom att använda Javascript API till besökare eller någon av deras handlingar. Matomo kommer då rapportera hur många besök, sidor, omvandlingar för var och en av dessa anpassade namn och värden. Se de detaljerade anpassade variablerna för varje användare och handlingar i besöksloggen. Detta insticksprogram är nödvändigt för att använda funktionen Ecommerce Analytics.", - "ScopePage": "omfattning sida", - "ScopeVisit": "omfattning besök", - "ScopeConversion": "Omfattning av konvertering", - "ManageDescription": "Denna översikt visar alla anpassade variabler och dess användande för webbplatsen '%s'. Namnen för varje slot sorteras på hur ofta dom har använts totalt.", - "ScopeX": "Omfattning %s", - "Index": "Index", - "Usages": "Användningar", - "Unused": "Oanvänd", - "CreateNewSlot": "Öka antalet tillgängliga anpassade variabelspår", - "UsageDetails": "%1$s besök och %2$s händelser sedan webbplatsen skapandet av denna webbplats.", - "CreatingCustomVariableTakesTime": "Att skapa en plats för ny anpassad variabel kan ta lång tid beroende på storleken på databasen. Därför är det bara möjligt att göra detta via ett kommando som behöver exekveras på kommandoraden.", - "CurrentAvailableCustomVariables": "För tillfället kan du använda upp till %s anpassade variabler per webbsida.", - "ToCreateCustomVarExecute": "För att skapa en ny anpassad variabel använd följande kommando i din Matomo miljö:", - "SlotsReportIsGeneratedOverTime": "Data för den här rapporten kommer att samlas in allt eftersom. Det kan ta en dag eller två innan du ser någon data och ett par veckor innan rapporten är helt tillförlitlig.", - "MetricsAreOnlyAvailableForVisitScope": "Notering: %1$s mätvärden finns endast tillgängliga för Anpassade Variabler av omfattningen %2$s.", - "MetricsNotAvailableForPageScope": "För Anpassade Variabler av omfattningen %1$s är kolumnvärdet för dessa mätvärden %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/ta.json b/plugins/CustomVariables/lang/ta.json deleted file mode 100644 index 1b113263f6..0000000000 --- a/plugins/CustomVariables/lang/ta.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "தனிபயன் மாறியின் பெயர்", - "ColumnCustomVariableValue": "தனிப்பயன் மாறி அளவுரு", - "CustomVariables": "தனிபயன் மாறி", - "ScopePage": "நோக்க பக்கம்", - "ScopeVisit": "வருகை நோக்கம்" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/th.json b/plugins/CustomVariables/lang/th.json deleted file mode 100644 index ba77a96d85..0000000000 --- a/plugins/CustomVariables/lang/th.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "ชื่อตัวแปรที่กำหนดเอง", - "ColumnCustomVariableValue": "ค่าตัวแปรที่กำหนดเอง", - "CustomVariables": "ตัวแปรที่กำหนดเอง" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/tl.json b/plugins/CustomVariables/lang/tl.json deleted file mode 100644 index 1d6ccd975d..0000000000 --- a/plugins/CustomVariables/lang/tl.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Pangalan ng Custom na Variable", - "ColumnCustomVariableValue": "Halaga ng Custom na Variable", - "CustomVariables": "Mga Custom na Variable", - "CustomVariablesReportDocumentation": "Ang ulat na ito ay naglalaman ng mga impormasyon tunkol sa iyong mga Custom Variable. E-click ang pangalan ng variable upang makita ang pagkakabahagi ng mga laman nito. %1$s Upang makita ang pangkalahatang impormasyon tungkol sa Custom Variables basahin ang %2$sCustom Variables documentation sa matomo.org%3$s.", - "ScopePage": "saklaw na pahina", - "ScopeVisit": "Saklaw ng pagbisita" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/tr.json b/plugins/CustomVariables/lang/tr.json deleted file mode 100644 index b86954a94d..0000000000 --- a/plugins/CustomVariables/lang/tr.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Özel Değişken Adı", - "ColumnCustomVariableValue": "Özel Değişken Değeri", - "CustomVariables": "Özel Değişkenler", - "CustomVariablesReportDocumentation": "Bu rapor özel değişkenler hakkında bilgileri görüntüler. Değerlerinin dağılımını görüntülemek istediğiniz değişken adının üzerine tıklayın. %1$sGenel olarak özel değişkenlar hakkında ayrıntılı bilgi almak için %2$smatomo.org sitesindeki Özel Değişkenler belgesini okuyun%3$s", - "PluginDescription": "Özel değişkenler çiftler şeklinde (ad, değer) bulunur ve JavaScript API kullanılarak ziyaretçiler ve ziyaretçi işlemlerine atanabilir. Matomo böylece her bir özel ad ve değer için ziyaret sayısını, tutturulan hedefleri raporlar. Ziyaretçi günlüğünde her kullanıcı ve işlem için özel değişkenlerin ayrıntıları görüntülenir. E-ticaret istatistikleri özelliği için bu uygulama ekinin kullanılması gereklidir!", - "ScopePage": "aralık sayfası", - "ScopeVisit": "aralık ziyareti", - "ScopeConversion": "aralıkta hedef tutturma", - "ManageDescription": "Bu özette tüm özel değişken aralıkları ve '%s' web sitesindeki kullanımları görüntülenir. Her bir aralıktaki adlar toplam içinde ne kadar sık kullanıldıklarına göre sıralanır.", - "ScopeX": "%s aralığı", - "Index": "Dizin", - "Usages": "Kullanılan", - "Unused": "Kullanılmayan", - "CreateNewSlot": "Kullanılabilecek Özel Değişken aralıklarının sayısını arttır", - "UsageDetails": "Sitenin kuruluşundan beri %1$s ziyaret ve %2$s işlem.", - "CreatingCustomVariableTakesTime": "Yeni bir özel değişken aralığının oluşturulması veritabanınızın boyutuna göre uzun zaman alabilir. Bu nedenle bu işlem yalnız komut satırından yürütülmesi gereken bir komut ile yapılabilir.", - "CurrentAvailableCustomVariables": "Şu anda her site için en çok %s Özel Değişken kullanabilirsiniz.", - "ToCreateCustomVarExecute": "Yeni bir özel değişken aralığı eklemek için Matomo kopyanız üzerinde şu komutu yürütün:", - "SlotsReportIsGeneratedOverTime": "Bu raporun verileri zaman içinde oluşacak. Raporda verilerin görüntülenmesi 1 - 2 gün, bilgilerin tam doğru görüntülenmesi bir kaç hafta sürebilir.", - "MetricsAreOnlyAvailableForVisitScope": "Not: %1$s ölçütmleri yalnız %2$s aralığındaki Özel Değişkenler için kullanılabilir.", - "MetricsNotAvailableForPageScope": "%1$s aralığındaki Özel Değişkenler için bu ölçümlerin sütun değeri %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/uk.json b/plugins/CustomVariables/lang/uk.json deleted file mode 100644 index 2f76d6aa94..0000000000 --- a/plugins/CustomVariables/lang/uk.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Ім'я користувача змінної", - "ColumnCustomVariableValue": "Значення для користувцької змінної", - "CustomVariables": "Користувальницькі змінні", - "CustomVariablesReportDocumentation": "Цей звіт відображає інформацію по вашим Користувацьким змінним. Натисніть по змінній, щоб побачити розподіл значень. %1$s Для більшої інформації про користувальницькі змінні в загальних рисах ознайомтеся з %2$sдокументацією по Користувацьким змінним на сайті matomo.org%3$s", - "ScopePage": "область видимості сторінки", - "ScopeVisit": "область видимості візиту", - "ScopeConversion": "конверсія сфери", - "ManageDescription": "Цей огляд показує всі слоти для користувальницьких змінних і їх використання для вебсайту '%s'. Назви в межах одного слота розподілені по загальній частоті використання.", - "ScopeX": "Вибірка %s", - "Index": "Індекс", - "Usages": "Використання", - "Unused": "Не використано", - "CreateNewSlot": "Збільшити кількість доступних слотів для користувальницьких змінних", - "UsageDetails": "%1$s відвідувань і %2$s дій з моменту створення цього вебсайту.", - "CurrentAvailableCustomVariables": "В даний момент ви можете використовувати до %s користувальницьких змінних на сайт.", - "ToCreateCustomVarExecute": "Щоб створити новий користувальницький слот для змінної, виконайте наступну команду у вашій установці Matomo:", - "SlotsReportIsGeneratedOverTime": "Інформація для цього звіту буде заповнена з часом. Це може зайняти день або два, щоб побачити будь-яку інформацію, і кілька тижнів, щоб отримати точний звіт.", - "MetricsAreOnlyAvailableForVisitScope": "Увага: %1$s метрика доступна тільки для користувальницьких змінних вибірки %2$s.", - "MetricsNotAvailableForPageScope": "Для вибірки користувальницьких змінних %1$s, значення стовпця для цих метрик - %2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/vi.json b/plugins/CustomVariables/lang/vi.json deleted file mode 100644 index 1560e2f9b2..0000000000 --- a/plugins/CustomVariables/lang/vi.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "Tên biến tùy chọn", - "ColumnCustomVariableValue": "Giá trị của biến tùy chọn", - "CustomVariables": "Các biến tùy chọn", - "CustomVariablesReportDocumentation": "Báo cáo này chứa thông tin về các biến tùy chỉnh. Vui lòng chọn tên biến để xem phân bố của các giá trị. %1$s Để tìm hiểu thêm thông tin chung về các biến tùy chỉnh, đọc %2$s Tài liệu hướng dẫn về biến tùy chỉnh trên matomo.org %3$s", - "ScopePage": "Trang phạm vi", - "ScopeVisit": "sự viếng thăm trong phạm vi nào đó" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/zh-cn.json b/plugins/CustomVariables/lang/zh-cn.json deleted file mode 100644 index 8472b38a1b..0000000000 --- a/plugins/CustomVariables/lang/zh-cn.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "自定义变量名称", - "ColumnCustomVariableValue": "自定义变量值", - "CustomVariables": "自定义变量", - "CustomVariablesReportDocumentation": "本报表包含您的自定义变量的资料，点击变量名查看数据。%1$s 关于自定义变量的详情，请阅读 %2$smatomo.org 上的自定义变量文档%3$s", - "PluginDescription": "自定义变量是（名称、值），可以使用Javascript API将其分配给访问者或其任何操作。然后，Matomo将报告这些自定义名称和值的访问次数、页数、转换次数。查看访问者日志中每个用户和操作的详细自定义变量。此插件需要使用电子商务分析功能！", - "ScopePage": "页面范围", - "ScopeVisit": "访问范围", - "ScopeConversion": "范围转换", - "ManageDescription": "这个概览显示了所有的自定义变量位置和它们在各个站点“%s”的使用方法。各个位置的变量名字按总的使用频率进行排序。", - "ScopeX": "范围 %s", - "Index": "主页", - "Usages": "用法", - "Unused": "未使用", - "CreateNewSlot": "增加可用自定义变量的数量", - "UsageDetails": "本站建立开始共计有%1$s访问记录和%2$s 笔互动记录。", - "CreatingCustomVariableTakesTime": "根据数据库的大小，创建新的自定义变量槽可能需要很长时间。因此，只有通过需要在命令行上执行的命令才能执行此操作。", - "CurrentAvailableCustomVariables": "目前你可以在每个站点里使用高达 %s条自定义变量。", - "ToCreateCustomVarExecute": "要创建新的自定义变量槽，请在您的Matomo安装中执行以下命令：", - "SlotsReportIsGeneratedOverTime": "本报告的数据将随着时间的推移被填充。这可能需要一两天看到任何数据，并在几个星期之前，该报告是完全准确的。", - "MetricsAreOnlyAvailableForVisitScope": "注意：自定义变量%1$s只能用于 %2$s范围。", - "MetricsNotAvailableForPageScope": "自定义变量%1$s的列值范围为%2$s" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/zh-tw.json b/plugins/CustomVariables/lang/zh-tw.json deleted file mode 100644 index ac7ab747fb..0000000000 --- a/plugins/CustomVariables/lang/zh-tw.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "CustomVariables": { - "ColumnCustomVariableName": "自訂變數名稱", - "ColumnCustomVariableValue": "自訂變數值", - "CustomVariables": "自訂變數", - "CustomVariablesReportDocumentation": "這份報表包含你的自訂變數資訊。點擊變數名稱來查看分配的值。%1$s更多關於自訂變數的資訊請查看 %2$smatomo.org 上的自訂變數說明文件%3$s", - "PluginDescription": "自訂變數是透過 Javascript API 為訪客或他們的活動以 [名稱 => 值] 來配對。Matomo 接著會產生這些自訂名稱與值有多少訪問、頁面及轉換的報表。可以在訪客紀錄中查看每位使用者和活動的自定變數詳情。這個外掛必須要使用電子商務分析功能！", - "ScopePage": "網頁範圍", - "ScopeVisit": "訪客範圍", - "ScopeConversion": "範圍轉換", - "ManageDescription": "這個總覽顯示「%s」的所有自訂變數和它們的用途。每個欄位中的名稱將以總使用次數來排序。", - "ScopeX": "%s 範圍", - "Index": "索引", - "Usages": "用途", - "Unused": "未使用", - "CreateNewSlot": "增加自訂變數可用的欄位", - "UsageDetails": "自從此網站建立後已有 %1$s 次訪問數和 %2$s 個活動。", - "CurrentAvailableCustomVariables": "目前每個網站最多可以建立 %s 個自訂變數。", - "ToCreateCustomVarExecute": "要建立新的自訂變數欄位請在 Matomo 安裝路徑執行以下指令：", - "SlotsReportIsGeneratedOverTime": "這份報表的資料將會被補充。可能會花上一到兩天來產生資料，並且花上數周才會有完整準確的報表。", - "MetricsAreOnlyAvailableForVisitScope": "注意：%1$s只有自訂變數的範圍有數據%2$s。", - "MetricsNotAvailableForPageScope": "自訂變數範圍 %1$s 中，欄位數據的值為 %2$s。" - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/templates/_actionTooltip.twig b/plugins/CustomVariables/templates/_actionTooltip.twig deleted file mode 100644 index 3fbe510783..0000000000 --- a/plugins/CustomVariables/templates/_actionTooltip.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% if action.customVariables is defined %} - - {{ 'CustomVariables_CustomVariables'|translate }}:{% for id,customVariable in action.customVariables %} - {% set name = 'customVariablePageName' ~ id %} - {% set value = 'customVariablePageValue' ~ id %} - - {# line break above is important #} - - {{ customVariable[name]|rawSafeDecoded }} {% if customVariable[value]|length > 0 %} = {{ customVariable[value]|rawSafeDecoded }}{% endif %} - {% endfor %} -{% endif -%}
\ No newline at end of file diff --git a/plugins/CustomVariables/templates/_profileSummary.twig b/plugins/CustomVariables/templates/_profileSummary.twig deleted file mode 100644 index 3540faf5c6..0000000000 --- a/plugins/CustomVariables/templates/_profileSummary.twig +++ /dev/null @@ -1,13 +0,0 @@ -<div class="visitor-profile-summary visitor-profile-customvariables"> - <h1>{{ 'CustomVariables_CustomVariables'|translate }} ({{ scopeName }})</h1> - <div> - {%- for variable in variables -%} - <p> - <span>{{ variable.name }}: </span> - {%- for value in variable.values -%} - <strong title="{{ value.count }}x">{{ value.value }}</strong>{% if not loop.last %}, {% endif %} - {%- endfor -%} - </p> - {%- endfor -%} - </div> -</div> diff --git a/plugins/CustomVariables/templates/_visitorDetails.twig b/plugins/CustomVariables/templates/_visitorDetails.twig deleted file mode 100644 index 010f9f7d22..0000000000 --- a/plugins/CustomVariables/templates/_visitorDetails.twig +++ /dev/null @@ -1,11 +0,0 @@ -<div class="visitorCustomVariables"> - {% for id,customVariable in visitInfo.getColumn('customVariables') %} - {% set name='customVariableName' ~ id %} - {% set value='customVariableValue' ~ id %} - <br/> - <abbr class="visitorLogTooltip" title="{{ 'CustomVariables_CustomVariables'|translate }} ({{ 'CustomVariables_Index'|translate }} {{ id }})"> - {{ customVariable[name]|truncate(30) }} - </abbr> - {% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %} - {% endfor %} -</div>
\ No newline at end of file diff --git a/plugins/CustomVariables/templates/manage.twig b/plugins/CustomVariables/templates/manage.twig deleted file mode 100644 index e10e1ee047..0000000000 --- a/plugins/CustomVariables/templates/manage.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends 'admin.twig' %} - -{% block topcontrols %} - <div class="top_bar_sites_selector piwikTopControl"> - <div piwik-siteselector show-selected-site="true" class="sites_autocomplete"></div> - </div> -{% endblock %} - -{% block content %} - <div piwik-manage-custom-vars> -{% endblock %}
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php deleted file mode 100644 index 4b5828799b..0000000000 --- a/plugins/CustomVariables/tests/Commands/InfoTest.php +++ /dev/null @@ -1,52 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ - -namespace Piwik\Plugins\CustomVariables\tests\Commands; - -use Piwik\Plugins\CustomVariables\Commands\Info; -use Piwik\Plugins\CustomVariables\Model; -use Symfony\Component\Console\Application; -use Symfony\Component\Console\Tester\CommandTester; -use Piwik\Tests\Framework\TestCase\IntegrationTestCase; - -/** - * @group CustomVariables - * @group CustomVariablesTest - * @group Plugins - * @group Plugins - */ -class InfoTest extends IntegrationTestCase -{ - public function testExecute_ShouldOutputInfoSuccess_IfEverythingIsOk() - { - self::assertStringContainsString('Your Piwik is configured for 5 custom variables.', $this->executeCommand()); - } - - public function testExecute_ShouldOutputErrorMessage_IfColumnsDoNotMatch() - { - $model = new Model(Model::SCOPE_PAGE); - $model->removeCustomVariable(); - - self::assertStringContainsString('There is a problem with your custom variables configuration', $this->executeCommand()); - } - - private function executeCommand() - { - $infoCmd = new Info(); - - $application = new Application(); - $application->add($infoCmd); - $commandTester = new CommandTester($infoCmd); - - $commandTester->execute(array('command' => $infoCmd->getName())); - $result = $commandTester->getDisplay(); - - return $result; - } -} diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php deleted file mode 100644 index 6c83068f7c..0000000000 --- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php +++ /dev/null @@ -1,148 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ - -namespace Piwik\Plugins\CustomVariables\tests\Commands; - -use Piwik\Plugins\CustomVariables\Commands\SetNumberOfCustomVariables; -use Piwik\Plugins\CustomVariables\CustomVariables; -use Symfony\Component\Console\Application; -use Symfony\Component\Console\Tester\CommandTester; -use Piwik\Tests\Framework\TestCase\IntegrationTestCase; - -/** - * @group CustomVariables - * @group CustomVariablesTest - * @group Plugins - * @group Plugins - */ -class SetNumberOfCustomVariablesTest extends IntegrationTestCase -{ - public function testExecute_ShouldThrowException_IfArgumentIsMissing() - { - $this->expectException(\RuntimeException::class); - $this->expectExceptionMessage('Not enough arguments'); - - $this->executeCommand(null); - } - - public function testExecute_ShouldThrowException_HasToBeANumber() - { - $this->expectException(\InvalidArgumentException::class); - $this->expectExceptionMessage('The number of available custom variables has to be a number'); - - $this->executeCommand('a'); - } - - public function testExecute_ShouldThrowException_Minimum2CustomVarsRequired() - { - $this->expectException(\InvalidArgumentException::class); - $this->expectExceptionMessage('There has to be at least five custom variables'); - - $this->executeCommand(4); - } - - public function testExecute_ShouldThrowException_IfUserCancelsConfirmation() - { - $result = $this->executeCommand(7, false); - $this->assertStringEndsWith('Are you sure you want to perform these actions? (y/N)', $result); - } - - public function testExecute_ShouldDoNothingIfExpectedResult_IsAlreadyTheCase() - { - $result = $this->executeCommand(5); - - self::assertStringContainsString('Your Piwik is already configured for 5 custom variables', $result); - } - - public function testExecute_ShouldAddMaxCustomVars_IfNumberIsHigherThanActual() - { - $this->assertEquals(5, CustomVariables::getNumUsableCustomVariables()); - - $result = $this->executeCommand(6); - - self::assertStringContainsString('Configuring Piwik for 6 custom variables', $result); - self::assertStringContainsString('1 new custom variables having the index(es) 6 will be ADDED', $result); - self::assertStringContainsString('Starting to apply changes', $result); - self::assertStringContainsString('Added a variable in scope "Page" having the index 6', $result); - self::assertStringContainsString('Added a variable in scope "Visit" having the index 6', $result); - self::assertStringContainsString('Added a variable in scope "Conversion" having the index 6', $result); - self::assertStringContainsString('Your Piwik is now configured for 6 custom variables.', $result); - - $this->assertEquals(6, CustomVariables::getNumUsableCustomVariables()); - } - - public function testExecute_ShouldRemoveMaxCustomVars_IfNumberIsLessThanActual() - { - $this->executeCommand(6, true); - $this->assertEquals(6, CustomVariables::getNumUsableCustomVariables()); - - $result = $this->executeCommand(5); - - self::assertStringContainsString('Configuring Piwik for 5 custom variables', $result); - self::assertStringContainsString('1 existing custom variables having the index(es) 6 will be REMOVED.', $result); - self::assertStringContainsString('Starting to apply changes', $result); - self::assertStringContainsString('Removed a variable in scope "Page" having the index 6', $result); - self::assertStringContainsString('Removed a variable in scope "Visit" having the index 6', $result); - self::assertStringContainsString('Removed a variable in scope "Conversion" having the index 6', $result); - self::assertStringContainsString('Your Piwik is now configured for 5 custom variables.', $result); - - $this->assertEquals(5, CustomVariables::getNumUsableCustomVariables()); - } - - public function testExecute_AddMultiple_RemoveMultiple() - { - $this->assertEquals(5, CustomVariables::getNumUsableCustomVariables()); - - $this->executeCommand(9); - $this->assertEquals(9, CustomVariables::getNumUsableCustomVariables()); - - $this->executeCommand(6); - $this->assertEquals(6, CustomVariables::getNumUsableCustomVariables()); - } - - /** - * @param int|null $maxCustomVars - * @param bool $confirm - * - * @return string - */ - private function executeCommand($maxCustomVars, $confirm = true) - { - $setNumberCmd = new SetNumberOfCustomVariables(); - - $application = new Application(); - $application->add($setNumberCmd); - - $commandTester = new CommandTester($setNumberCmd); - - $dialog = $setNumberCmd->getHelper('dialog'); - $dialog->setInputStream($this->getInputStream($confirm ? 'yes' : 'no' . '\n')); - - if (is_null($maxCustomVars)) { - $params = array(); - } else { - $params = array('maxCustomVars' => $maxCustomVars); - } - - $params['command'] = $setNumberCmd->getName(); - $commandTester->execute($params); - $result = $commandTester->getDisplay(); - - return $result; - } - - protected function getInputStream($input) - { - $stream = fopen('php://memory', 'r+', false); - fputs($stream, $input); - rewind($stream); - - return $stream; - } -} diff --git a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php deleted file mode 100644 index 7ea7fea2e9..0000000000 --- a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php +++ /dev/null @@ -1,85 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Plugins\CustomVariables\tests\Fixtures; - -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Plugins\Goals\API; -use Piwik\Tests\Framework\Fixture; - -/** - * Adds one site with two goals and tracks two visits with custom variables. - */ -class VisitWithManyCustomVariables extends Fixture -{ - public $dateTime = '2010-01-03 11:22:33'; - public $idSite = 1; - public $idGoal1 = 1; - public $visitorId = '61e8cc2d51fea26d'; - private $numCustomVars = 8; - - public function setUp(): void - { - $this->setUpCustomVars(); - $this->setUpWebsitesAndGoals(); - $this->trackVisits(); - } - - public function tearDown(): void - { - // empty - } - - private function setUpCustomVars() - { - foreach (Model::getScopes() as $scope) { - $model = new Model($scope); - $model->addCustomVariable(); - $model->addCustomVariable(); - $model->addCustomVariable(); - } - } - - private function setUpWebsitesAndGoals() - { - // tests run in UTC, the Tracker in UTC - if (!self::siteCreated($idSite = 1)) { - self::createWebsite($this->dateTime); - } - - if (!self::goalExists($idSite = 1, $idGoal = 1)) { - API::getInstance()->addGoal($this->idSite, 'triggered js', 'manually', '', ''); - } - } - - private function trackVisits() - { - $idGoal = $this->idGoal1; - - $visitorA = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); - $visitorA->setUrl('http://localhost'); - // Used to test actual referrer + keyword position in Live! - $visitorA->setUrlReferrer(urldecode('http://www.google.com/url?sa=t&source=web&cd=1&ved=0CB4QFjAA&url=http%3A%2F%2Fpiwik.org%2F&rct=j&q=this%20keyword%20should%20be%20ranked&ei=V8WfTePkKKLfiALrpZWGAw&usg=AFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw&sig2=BvKAdCtNixsmfNWXjsNyMw')); - - // no campaign, but a search engine to attribute the goal conversion to - $attribution = array( - '', - '', - 1302306504, - 'http://www.google.com/search?q=piwik&ie=utf-8&oe=utf-8&aq=t&rls=org.mozilla:en-GB:official&client=firefox-a' - ); - $visitorA->setAttributionInfo(json_encode($attribution)); - - for ($index = 1; $index <= $this->numCustomVars; $index++) { - $visitorA->setCustomVariable($index, 'Name_VISIT_' . $index, 'Val_VISIT' . $index, 'visit'); - $visitorA->setCustomVariable($index, 'Name_PAGE_' . $index, 'Val_PAGE' . $index, 'page'); - } - - self::checkResponse($visitorA->doTrackPageView('Profile page')); - self::checkResponse($visitorA->doTrackGoal($idGoal)); - } -} diff --git a/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php b/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php deleted file mode 100644 index 67a32c9c23..0000000000 --- a/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php +++ /dev/null @@ -1,104 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables\tests\Integration; - -use Piwik\Plugins\CustomVariables\CustomVariables; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tracker\Cache; -use Piwik\Tests\Framework\TestCase\IntegrationTestCase; - -/** - * @group CustomVariables - * @group CustomVariablesTest - * @group Plugins - */ -class CustomVariablesTest extends IntegrationTestCase -{ - public function test_getNumUsableCustomVariables_ShouldDetectCorrectNumberOfVariables() - { - Cache::clearCacheGeneral(); - $this->assertSame(5, CustomVariables::getNumUsableCustomVariables()); - } - - public function test_getNumUsableCustomVariables_ShouldCacheTheResult() - { - CustomVariables::getNumUsableCustomVariables(); - $cache = Cache::getCacheGeneral(); - - $this->assertSame(5, $cache[CustomVariables::MAX_NUM_CUSTOMVARS_CACHEKEY]); - } - - public function test_getNumUsableCustomVariables_ShouldReadFromCacheIfPossible() - { - $cache = Cache::getCacheGeneral(); - $cache[CustomVariables::MAX_NUM_CUSTOMVARS_CACHEKEY] = 10; - Cache::setCacheGeneral($cache); - - $this->assertSame(10, CustomVariables::getNumUsableCustomVariables()); - } - - public function test_getNumUsableCustomVariables_ShouldReturnMinVariables_IfOneTableHasLessEntriesThanOthers() - { - $this->assertEquals(5, CustomVariables::getNumUsableCustomVariables()); - - $scopes = Model::getScopes(); - - // removing custom vars step by step... as soon as one custom var is removed, - // it should return the min count of available variables - for ($i = 4; $i != -1; $i--) { - foreach ($scopes as $scope) { - $this->dropCustomVar($scope); - $this->assertSame($i, CustomVariables::getNumUsableCustomVariables()); - } - } - - $this->assertEquals(0, CustomVariables::getNumUsableCustomVariables()); - - // add custom var, only once all custom vars are written it should write return a higher custom var number - for ($i = 1; $i != 7; $i++) { - foreach ($scopes as $index => $scope) { - $isLastIndex = $index === (count($scopes) - 1); - - $this->addCustomVar($scope); - - if ($isLastIndex) { - $this->assertSame($i, CustomVariables::getNumUsableCustomVariables()); - // all scopes have been added, it should consider all custom var counts - } else { - $this->assertSame($i - 1, CustomVariables::getNumUsableCustomVariables()); - // at least one scope is not added and should therefore return the old custom var count until all - // tables have been updated - } - } - } - - $this->assertEquals(6, CustomVariables::getNumUsableCustomVariables()); - } - - private function dropCustomVar($scope) - { - $this->clearCache(); - $model = new Model($scope); - $model->removeCustomVariable(); - } - - private function addCustomVar($scope) - { - $this->clearCache(); - $model = new Model($scope); - $model->addCustomVariable(); - } - - private function clearCache() - { - Cache::clearCacheGeneral(); - } - - -} diff --git a/plugins/CustomVariables/tests/Integration/ModelTest.php b/plugins/CustomVariables/tests/Integration/ModelTest.php deleted file mode 100644 index ae8b82a3e5..0000000000 --- a/plugins/CustomVariables/tests/Integration/ModelTest.php +++ /dev/null @@ -1,217 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables\tests; -use Piwik\Db; -use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tests\Framework\TestCase\IntegrationTestCase; - -/** - * @group CustomVariables - * @group ModelTest - * @group Plugins - * @group CustomVariables_ModelTest - */ -class ModelTest extends IntegrationTestCase -{ - private static $cvarScopes = array('page', 'visit', 'conversion'); - - public function setUp(): void - { - // do not call parent::setUp() since it expects database to be created, - // but DB for this test is removed in tearDown - - self::$fixture->performSetUp(); - } - - public function tearDown(): void - { - parent::tearDown(); - - self::$fixture->performTearDown(); - } - - public function test_construct_shouldFailInCaseOfEmptyScope() - { - $this->expectException(\Exception::class); - - new Model(null); - } - - public function test_construct_shouldFailInCaseOfInvalidScope() - { - $this->expectException(\Exception::class); - - new Model('inValId'); - } - - public function testGetAllScopes() - { - $this->assertEquals(self::$cvarScopes, Model::getScopes()); - } - - public function test_Install_Uninstall() - { - $this->assertEquals(5, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getConversionScope()->getCurrentNumCustomVars()); - - Model::uninstall(); - - $this->assertEquals(0, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(0, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(0, $this->getConversionScope()->getCurrentNumCustomVars()); - - $this->getPageScope()->addCustomVariable(); - $this->getPageScope()->addCustomVariable(); - $this->getVisitScope()->addCustomVariable(); - - $this->assertEquals(2, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(1, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(0, $this->getConversionScope()->getCurrentNumCustomVars()); - - Model::install(); - - $this->assertEquals(5, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getConversionScope()->getCurrentNumCustomVars()); - } - - public function testGetCustomVariableIndexFromFieldName() - { - $this->assertSame(0, Model::getCustomVariableIndexFromFieldName('custom_var_k0')); - $this->assertSame(0, Model::getCustomVariableIndexFromFieldName('custom_var_v0')); - $this->assertSame(5, Model::getCustomVariableIndexFromFieldName('custom_var_k5')); - $this->assertSame(5, Model::getCustomVariableIndexFromFieldName('custom_var_v5')); - $this->assertSame(938, Model::getCustomVariableIndexFromFieldName('custom_var_k938')); - $this->assertSame(938, Model::getCustomVariableIndexFromFieldName('custom_var_v938')); - $this->assertSame(null, Model::getCustomVariableIndexFromFieldName('otherfield')); - } - - public function testGetScopeName() - { - $this->assertEquals('Page', $this->getPageScope()->getScopeName()); - $this->assertEquals('Visit', $this->getVisitScope()->getScopeName()); - $this->assertEquals('Conversion', $this->getConversionScope()->getScopeName()); - } - - public function testGetScopeDescription() - { - $this->assertEquals('scope page', $this->getPageScope()->getScopeDescription()); - $this->assertEquals('scope visit', $this->getVisitScope()->getScopeDescription()); - $this->assertEquals('scope conversion', $this->getConversionScope()->getScopeDescription()); - } - - public function testGetUnprefixedTableName() - { - $this->assertEquals('log_link_visit_action', $this->getPageScope()->getUnprefixedTableName()); - $this->assertEquals('log_visit', $this->getVisitScope()->getUnprefixedTableName()); - $this->assertEquals('log_conversion', $this->getConversionScope()->getUnprefixedTableName()); - } - - public function testGetScope() - { - $this->assertEquals(Model::SCOPE_PAGE, $this->getPageScope()->getScope()); - $this->assertEquals(Model::SCOPE_VISIT, $this->getVisitScope()->getScope()); - } - - public function test_getCurrentNumCustomVars() - { - $this->assertEquals(5, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getConversionScope()->getCurrentNumCustomVars()); - - $this->getPageScope()->addCustomVariable(); - $this->getConversionScope()->removeCustomVariable(); - - $this->assertEquals(6, $this->getPageScope()->getCurrentNumCustomVars()); - $this->assertEquals(5, $this->getVisitScope()->getCurrentNumCustomVars()); - $this->assertEquals(4, $this->getConversionScope()->getCurrentNumCustomVars()); - } - - public function test_getCustomVarIndexes() - { - $this->assertEquals(array(1,2,3,4,5), $this->getPageScope()->getCustomVarIndexes()); - $this->assertEquals(array(1,2,3,4,5), $this->getVisitScope()->getCustomVarIndexes()); - $this->assertEquals(array(1,2,3,4,5), $this->getConversionScope()->getCustomVarIndexes()); - - $this->getPageScope()->addCustomVariable(); - $this->getConversionScope()->removeCustomVariable(); - - $this->assertEquals(array(1,2,3,4,5,6), $this->getPageScope()->getCustomVarIndexes()); - $this->assertEquals(array(1,2,3,4,5), $this->getVisitScope()->getCustomVarIndexes()); - $this->assertEquals(array(1,2,3,4), $this->getConversionScope()->getCustomVarIndexes()); - } - - public function test_getHighestCustomVarIndex_addCustomVariable_removeCustomVariable() - { - $this->assertEquals(5, $this->getPageScope()->getHighestCustomVarIndex()); - $this->assertEquals(5, $this->getVisitScope()->getHighestCustomVarIndex()); - $this->assertEquals(5, $this->getConversionScope()->getHighestCustomVarIndex()); - - $this->getPageScope()->addCustomVariable(); - $this->getConversionScope()->removeCustomVariable(); - - $this->assertEquals(6, $this->getPageScope()->getHighestCustomVarIndex()); - $this->assertEquals(5, $this->getVisitScope()->getHighestCustomVarIndex()); - $this->assertEquals(4, $this->getConversionScope()->getHighestCustomVarIndex()); - - $this->getConversionScope()->removeCustomVariable(); - $this->getPageScope()->addCustomVariable(); - $this->getVisitScope()->addCustomVariable(); - $this->getPageScope()->addCustomVariable(); - $this->getConversionScope()->removeCustomVariable(); - - $this->assertEquals(8, $this->getPageScope()->getHighestCustomVarIndex()); - $this->assertEquals(6, $this->getVisitScope()->getHighestCustomVarIndex()); - $this->assertEquals(2, $this->getConversionScope()->getHighestCustomVarIndex()); - } - - public function test_removeCustomVariable_shouldNotFailIfRemovesMoreThanExist() - { - $scope = $this->getPageScope(); - - $this->assertEquals(5, $scope->getHighestCustomVarIndex()); - - for ($index = 0; $index < 5; $index++) { - $scope->removeCustomVariable(); - $this->assertEquals(4 - $index, $scope->getHighestCustomVarIndex()); - } - - $this->assertNull($scope->removeCustomVariable()); - $this->assertEquals(0, $scope->getHighestCustomVarIndex()); - $this->assertEquals(0, $scope->getCurrentNumCustomVars()); - } - - public function test_removeCustomVariable_addCustomVariable_ReturnsIndex() - { - $scopeToAdd = $this->getPageScope(); - $scopeToRemove = $this->getVisitScope(); - - for ($index = 0; $index < 5; $index++) { - $this->assertEquals(5 - $index, $scopeToRemove->removeCustomVariable()); - $this->assertEquals(6 + $index, $scopeToAdd->addCustomVariable()); - } - } - - private function getPageScope() - { - return new Model(Model::SCOPE_PAGE); - } - - private function getVisitScope() - { - return new Model(Model::SCOPE_VISIT); - } - - private function getConversionScope() - { - return new Model(Model::SCOPE_CONVERSION); - } - -} diff --git a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php deleted file mode 100644 index 8da392c8ba..0000000000 --- a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\CustomVariables\tests\System; - -use Piwik\Plugins\CustomVariables\tests\Fixtures\VisitWithManyCustomVariables; -use Piwik\Tests\Framework\TestCase\SystemTestCase; - -/** - * @group CustomVariables - * @group CustomVariablesSystemTest - * @group Plugins - */ -class CustomVariablesSystemTest extends SystemTestCase -{ - /** - * @var VisitWithManyCustomVariables - */ - public static $fixture = null; // initialized below class definition - - public static function getOutputPrefix() - { - return 'CustomVariablesSystemTest'; - } - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - $apiToCall = array('CustomVariables.getCustomVariables', 'Live.getLastVisitsDetails'); - - return array( - array($apiToCall, array( - 'idSite' => self::$fixture->idSite, - 'date' => self::$fixture->dateTime, - 'periods' => array('day'), - )), - ); - } - - /** - * Path where expected/processed output files are stored. - */ - public static function getPathToTestDirectory() - { - return __DIR__; - } -} - -CustomVariablesSystemTest::$fixture = new VisitWithManyCustomVariables();
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index c8033f43ad..0000000000 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,523 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Name_VISIT_1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_1</segment> - <subtable> - <row> - <label>Val_VISIT1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_2</segment> - <subtable> - <row> - <label>Val_VISIT2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_3</segment> - <subtable> - <row> - <label>Val_VISIT3</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_4</segment> - <subtable> - <row> - <label>Val_VISIT4</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_5</segment> - <subtable> - <row> - <label>Val_VISIT5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>6</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_6</segment> - <subtable> - <row> - <label>Val_VISIT6</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>7</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_7</segment> - <subtable> - <row> - <label>Val_VISIT7</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>8</index> - </row> - </slots> - <segment>customVariableName==Name_VISIT_8</segment> - <subtable> - <row> - <label>Val_VISIT8</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>4</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_1</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_2</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_3</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_4</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_5</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>6</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_6</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>7</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_7</segment> - <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> - <slots> - <row> - <scope>page</scope> - <index>8</index> - </row> - </slots> - <segment>customVariableName==Name_PAGE_8</segment> - <subtable> - <row> - <label>Val_PAGE8</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 8547b1d796..0000000000 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,209 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <fingerprint>e16cf2bbaeea2c88</fingerprint> - <actionDetails> - <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - - <revenue>0</revenue> - <goalPageId /> - - <url>http://localhost</url> - <icon>plugins/Morpheus/images/goal.png</icon> - <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> - <title>Goal conversion</title> - <subtitle>triggered js</subtitle> - - </row> - <row> - <type>action</type> - <url>http://localhost</url> - <pageTitle>Profile page</pageTitle> - <pageIdAction>2</pageIdAction> - - - <pageId>1</pageId> - <bandwidth /> - <pageviewPosition>1</pageviewPosition> - <title>Profile page</title> - <subtitle>http://localhost</subtitle> - <icon /> - <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> - - <customVariables> - <row> - <customVariablePageName1>Name_PAGE_1</customVariablePageName1> - <customVariablePageValue1>Val_PAGE1</customVariablePageValue1> - </row> - <row> - <customVariablePageName2>Name_PAGE_2</customVariablePageName2> - <customVariablePageValue2>Val_PAGE2</customVariablePageValue2> - </row> - <row> - <customVariablePageName3>Name_PAGE_3</customVariablePageName3> - <customVariablePageValue3>Val_PAGE3</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>Name_PAGE_4</customVariablePageName4> - <customVariablePageValue4>Val_PAGE4</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Name_PAGE_5</customVariablePageName5> - <customVariablePageValue5>Val_PAGE5</customVariablePageValue5> - </row> - <row> - <customVariablePageName6>Name_PAGE_6</customVariablePageName6> - <customVariablePageValue6>Val_PAGE6</customVariablePageValue6> - </row> - <row> - <customVariablePageName7>Name_PAGE_7</customVariablePageName7> - <customVariablePageValue7>Val_PAGE7</customVariablePageValue7> - </row> - <row> - <customVariablePageName8>Name_PAGE_8</customVariablePageName8> - <customVariablePageValue8>Val_PAGE8</customVariablePageValue8> - </row> - </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> - </row> - </actionDetails> - <goalConversions>1</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <siteName>Piwik test</siteName> - - - - - - - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> - <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <secondsSinceFirstVisit>0</secondsSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <secondsSinceLastEcommerceOrder /> - <visitDuration>4</visitDuration> - <visitDurationPretty>4s</visitDurationPretty> - <searches>0</searches> - <actions>1</actions> - <interactions>1</interactions> - <referrerType>search</referrerType> - <referrerTypeName>Search Engines</referrerTypeName> - <referrerName>Google</referrerName> - <referrerKeyword>this keyword should be ranked</referrerKeyword> - <referrerKeywordPosition>1</referrerKeywordPosition> - <referrerUrl>http://www.google.com/url?source=web&cd=1&url=http://piwik.org/&rct=j&q=this keyword should be ranked&sig2=BvKAdCtNixsmfNWXjsNyMw</referrerUrl> - <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> - <referrerSocialNetworkUrl /> - <referrerSocialNetworkIcon /> - <languageCode>fr</languageCode> - <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel>Generic Desktop</deviceModel> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> - <events>0</events> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Name_VISIT_1</customVariableName1> - <customVariableValue1>Val_VISIT1</customVariableValue1> - </row> - <row> - <customVariableName2>Name_VISIT_2</customVariableName2> - <customVariableValue2>Val_VISIT2</customVariableValue2> - </row> - <row> - <customVariableName3>Name_VISIT_3</customVariableName3> - <customVariableValue3>Val_VISIT3</customVariableValue3> - </row> - <row> - <customVariableName4>Name_VISIT_4</customVariableName4> - <customVariableValue4>Val_VISIT4</customVariableValue4> - </row> - <row> - <customVariableName5>Name_VISIT_5</customVariableName5> - <customVariableValue5>Val_VISIT5</customVariableValue5> - </row> - <row> - <customVariableName6>Name_VISIT_6</customVariableName6> - <customVariableValue6>Val_VISIT6</customVariableValue6> - </row> - <row> - <customVariableName7>Name_VISIT_7</customVariableName7> - <customVariableValue7>Val_VISIT7</customVariableValue7> - </row> - <row> - <customVariableName8>Name_VISIT_8</customVariableName8> - <customVariableValue8>Val_VISIT8</customVariableValue8> - </row> - </customVariables> - <resolution>1024x768</resolution> - <plugins>cookie, flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> - <pluginName>cookie</pluginName> - </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - </row> -</result>
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/UI/.gitignore b/plugins/CustomVariables/tests/UI/.gitignore deleted file mode 100644 index f39be478e7..0000000000 --- a/plugins/CustomVariables/tests/UI/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/processed-ui-screenshots -/screenshot-diffs
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/UI/CustomVariables_spec.js b/plugins/CustomVariables/tests/UI/CustomVariables_spec.js deleted file mode 100644 index 734de0730b..0000000000 --- a/plugins/CustomVariables/tests/UI/CustomVariables_spec.js +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * Screenshot integration tests. - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -describe("CustomVariables", function () { - this.timeout(0); - - this.fixture = "Piwik\\Plugins\\CustomVariables\\tests\\Fixtures\\VisitWithManyCustomVariables"; - - it('should show an overview of all used custom variables', async function() { - await page.goto("?idSite=1&period=day&date=2010-01-03&module=CustomVariables&action=manage"); - await page.waitForNetworkIdle(); - - pageWrap = await page.$('.pageWrap'); - expect(await pageWrap.screenshot()).to.matchImage('manage'); - }); - - it('should be visible in the menu', async function() { - expect(await page.screenshotSelector('li:contains(Diagnostic)')).to.matchImage('link_in_menu'); - }); -});
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png deleted file mode 100644 index bd2d7ebead..0000000000 --- a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7eb4b316543d218cdc2fdd735ee0425a40a2fab7d058891151cda662ebe0f47 -size 18647 diff --git a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png deleted file mode 100644 index 2250c7b1ad..0000000000 --- a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f40c52a586e6af95bdb5de5ef6270233550bfaccdcfc45a6866bb6cf53998f9 -size 104289 diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache -Subproject 4e3761d7bdeb5f556e407423817a1f794b3f3dd +Subproject 5d7cd2b5ab2c8adfbdd98d7b4d28bb09a68ce60 diff --git a/plugins/Ecommerce/Columns/ProductViewCategory.php b/plugins/Ecommerce/Columns/ProductViewCategory.php index 0488c6c3a2..e7b773e828 100644 --- a/plugins/Ecommerce/Columns/ProductViewCategory.php +++ b/plugins/Ecommerce/Columns/ProductViewCategory.php @@ -16,7 +16,9 @@ use Piwik\Db; use Piwik\Log; use Piwik\Piwik; use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugin\Manager; use Piwik\Plugin\Segment; +use Piwik\Plugins\CustomVariables\Tracker\CustomVariablesRequestProcessor; use Piwik\Segment\SegmentsList; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -110,11 +112,13 @@ class ProductViewCategory extends ActionDimension } // fall back to custom variables (might happen if old logs are replayed) - $customVariables = $request->getCustomVariablesInPageScope(); - if (isset($customVariables['custom_var_k5']) && $customVariables['custom_var_k5'] === '_pkc') { - $categories = $this->handleCategoryParam($customVariables['custom_var_v5'] ?? ''); + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $customVariables = CustomVariablesRequestProcessor::getCustomVariablesInPageScope($request); + if (isset($customVariables['custom_var_k5']) && $customVariables['custom_var_k5'] === '_pkc') { + $categories = $this->handleCategoryParam($customVariables['custom_var_v5'] ?? ''); - return $categories[$this->categoryNumber - 1] ?? false; + return $categories[$this->categoryNumber - 1] ?? false; + } } return parent::onLookupAction($request, $action); diff --git a/plugins/Ecommerce/Columns/ProductViewName.php b/plugins/Ecommerce/Columns/ProductViewName.php index 687a3cd52b..63462d724b 100644 --- a/plugins/Ecommerce/Columns/ProductViewName.php +++ b/plugins/Ecommerce/Columns/ProductViewName.php @@ -12,6 +12,8 @@ use Piwik\Columns\Discriminator; use Piwik\Columns\Join\ActionNameJoin; use Piwik\Common; use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugin\Manager; +use Piwik\Plugins\CustomVariables\Tracker\CustomVariablesRequestProcessor; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -42,9 +44,11 @@ class ProductViewName extends ActionDimension } // fall back to custom variables (might happen if old logs are replayed) - $customVariables = $request->getCustomVariablesInPageScope(); - if (isset($customVariables['custom_var_k4']) && $customVariables['custom_var_k4'] === '_pkn') { - return $customVariables['custom_var_v4'] ?? false; + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $customVariables = CustomVariablesRequestProcessor::getCustomVariablesInPageScope($request); + if (isset($customVariables['custom_var_k4']) && $customVariables['custom_var_k4'] === '_pkn') { + return $customVariables['custom_var_v4'] ?? false; + } } return parent::onLookupAction($request, $action); diff --git a/plugins/Ecommerce/Columns/ProductViewPrice.php b/plugins/Ecommerce/Columns/ProductViewPrice.php index 2b8b96fbb6..d4a290e4c8 100644 --- a/plugins/Ecommerce/Columns/ProductViewPrice.php +++ b/plugins/Ecommerce/Columns/ProductViewPrice.php @@ -9,6 +9,8 @@ namespace Piwik\Plugins\Ecommerce\Columns; use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugin\Manager; +use Piwik\Plugins\CustomVariables\Tracker\CustomVariablesRequestProcessor; use Piwik\Tracker\Action; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -30,9 +32,11 @@ class ProductViewPrice extends ActionDimension } // fall back to custom variables (might happen if old logs are replayed) - $customVariables = $request->getCustomVariablesInPageScope(); - if (isset($customVariables['custom_var_k2']) && $customVariables['custom_var_k2'] === '_pkp') { - return $customVariables['custom_var_v2'] ?? false; + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $customVariables = CustomVariablesRequestProcessor::getCustomVariablesInPageScope($request); + if (isset($customVariables['custom_var_k2']) && $customVariables['custom_var_k2'] === '_pkp') { + return $customVariables['custom_var_v2'] ?? false; + } } return parent::onNewAction($request, $visitor, $action); diff --git a/plugins/Ecommerce/Columns/ProductViewSku.php b/plugins/Ecommerce/Columns/ProductViewSku.php index 140f125801..dab50f1094 100644 --- a/plugins/Ecommerce/Columns/ProductViewSku.php +++ b/plugins/Ecommerce/Columns/ProductViewSku.php @@ -12,6 +12,8 @@ use Piwik\Columns\Discriminator; use Piwik\Columns\Join\ActionNameJoin; use Piwik\Common; use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugin\Manager; +use Piwik\Plugins\CustomVariables\Tracker\CustomVariablesRequestProcessor; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -42,9 +44,11 @@ class ProductViewSku extends ActionDimension } // fall back to custom variables (might happen if old logs are replayed) - $customVariables = $request->getCustomVariablesInPageScope(); - if (isset($customVariables['custom_var_k3']) && $customVariables['custom_var_k3'] === '_pks') { - return $customVariables['custom_var_v3'] ?? false; + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $customVariables = CustomVariablesRequestProcessor::getCustomVariablesInPageScope($request); + if (isset($customVariables['custom_var_k3']) && $customVariables['custom_var_k3'] === '_pks') { + return $customVariables['custom_var_v3'] ?? false; + } } return parent::onLookupAction($request, $action); diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index e9297adce2..178974494a 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -137,20 +137,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>15480</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>VisitorName</customVariableName3> - <customVariableValue3>Great name!</customVariableValue3> - </row> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -167,6 +153,20 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -370,20 +370,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>68040</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>VisitorName</customVariableName3> - <customVariableValue3>Great name!</customVariableValue3> - </row> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -400,5 +386,19 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index bfb26b5933..9751f50a76 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -202,20 +202,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21240</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>VisitorName</customVariableName3> - <customVariableValue3>Great name!</customVariableValue3> - </row> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -232,6 +218,20 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -584,20 +584,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>5760</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>VisitorName</customVariableName3> - <customVariableValue3>Great name!</customVariableValue3> - </row> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -614,6 +600,20 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -817,16 +817,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -843,5 +833,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index ecbb8ef74b..ad0bd4121f 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -377,7 +377,7 @@ class API extends \Piwik\Plugin\API return; } - $rowNotDefined = $dataTable->getRowFromLabel(\Piwik\Plugins\CustomVariables\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED); + $rowNotDefined = $dataTable->getRowFromLabel('Value not defined'); if ($rowNotDefined) { $rowNotDefined->setColumn('label', $notDefinedStringPretty); } @@ -385,8 +385,8 @@ class API extends \Piwik\Plugin\API protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $segment, $idSubtable) { - if (in_array('nb_visits', $dataTable->getColumns())) { - // skip if table already contains visits + if (!Manager::getInstance()->isPluginActivated('CustomVariables') || in_array('nb_visits', $dataTable->getColumns())) { + // skip if CustomVariables plugin is not available or table already contains visits return; } diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 71dfad88bf..d49d6aed68 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -378,10 +378,6 @@ class Archiver extends \Piwik\Plugin\Archiver return false; } $label = "Value not defined"; - // Product Name/Category not defined" - if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) { - $label = \Piwik\Plugins\CustomVariables\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED; - } } return $label; } diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php index de9545fad1..cdb32d2d5e 100644 --- a/plugins/Live/tests/Integration/ModelTest.php +++ b/plugins/Live/tests/Integration/ModelTest.php @@ -284,7 +284,7 @@ class ModelTest extends IntegrationTestCase $idSite = 1, $dateStart, $dateEnd, - $segment = 'customVariablePageName1==Test', + $segment = 'siteSearchCategory==Test', $offset = 10, $limit = 100, $visitorId = 'abc', @@ -299,7 +299,7 @@ class ModelTest extends IntegrationTestCase AND log_visit.idvisitor = ? AND log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? ) - AND ( log_link_visit_action.custom_var_k1 = ? ) + AND ( log_link_visit_action.search_cat = ? ) GROUP BY log_visit.idvisit ORDER BY log_visit.idsite DESC, log_visit.visit_last_action_time DESC LIMIT 10, 100'; diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index 167476415c..b179e112cf 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -127,8 +127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -145,6 +143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -252,8 +252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -270,6 +268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -377,8 +377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -395,6 +393,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -502,8 +502,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -520,6 +518,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -627,8 +627,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -645,6 +643,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -752,8 +752,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -770,6 +768,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -877,8 +877,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -895,6 +893,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1002,8 +1002,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1020,6 +1018,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1127,8 +1127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1145,6 +1143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1252,8 +1252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1270,6 +1268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </lastVisits> diff --git a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml index 59d0cb2e38..dd4a83207c 100644 --- a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml @@ -106,8 +106,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -124,6 +122,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -231,8 +231,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -249,5 +247,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml index 354caa4104..75773aaa14 100644 --- a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml @@ -106,8 +106,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -124,6 +122,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -231,8 +231,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -249,6 +247,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -356,8 +356,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -374,6 +372,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -671,8 +671,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -689,5 +687,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index fc8faf9add..ec12c9ae00 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -127,8 +127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -145,6 +143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -252,8 +252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -270,6 +268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -377,8 +377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -395,6 +393,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -502,8 +502,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -520,6 +518,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -627,8 +627,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -645,6 +643,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -752,8 +752,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -770,6 +768,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -877,8 +877,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -895,6 +893,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1002,8 +1002,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1020,6 +1018,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1127,8 +1127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1145,6 +1143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1252,8 +1252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1270,6 +1268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1377,8 +1377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1395,6 +1393,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1502,8 +1502,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1520,6 +1518,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1627,8 +1627,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1645,6 +1643,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1752,8 +1752,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1770,6 +1768,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1877,8 +1877,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1895,6 +1893,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2002,8 +2002,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2020,6 +2018,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2127,8 +2127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2145,6 +2143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2252,8 +2252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2270,6 +2268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2377,8 +2377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2395,6 +2393,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2502,8 +2502,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2520,6 +2518,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </lastVisits> diff --git a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml index 575456cc65..1eb2a9a8d0 100644 --- a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml @@ -127,8 +127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -145,6 +143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -252,8 +252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -270,6 +268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -377,8 +377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -395,6 +393,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -502,8 +502,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -520,6 +518,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -627,8 +627,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -645,6 +643,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -752,8 +752,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -770,6 +768,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -877,8 +877,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -895,6 +893,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1002,8 +1002,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1020,6 +1018,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1127,8 +1127,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1145,6 +1143,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1252,8 +1252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86400</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1270,6 +1268,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </lastVisits> diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml index 354caa4104..75773aaa14 100644 --- a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml @@ -106,8 +106,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -124,6 +122,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -231,8 +231,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -249,6 +247,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -356,8 +356,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -374,6 +372,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -671,8 +671,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -689,5 +687,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php b/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php index 22bf243e92..eb26e27c8f 100644 --- a/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php +++ b/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php @@ -24,6 +24,7 @@ use Piwik\Tracker\Cache; * Class LogDataAnonymizationsTest * * @group Plugins + * @group LogDataAnonymizerTest */ class LogDataAnonymizerTest extends IntegrationTestCase { @@ -228,6 +229,12 @@ class LogDataAnonymizerTest extends IntegrationTestCase 'location_latitude' => null, 'location_longitude' => null, 'location_region' => null, + 'last_idlink_va' => null, + 'custom_dimension_1' => null, + 'custom_dimension_2' => null, + 'custom_dimension_3' => null, + 'custom_dimension_4' => null, + 'custom_dimension_5' => null, 'custom_var_k1' => null, 'custom_var_v1' => null, 'custom_var_k2' => null, @@ -238,12 +245,6 @@ class LogDataAnonymizerTest extends IntegrationTestCase 'custom_var_v4' => null, 'custom_var_k5' => null, 'custom_var_v5' => null, - 'last_idlink_va' => null, - 'custom_dimension_1' => null, - 'custom_dimension_2' => null, - 'custom_dimension_3' => null, - 'custom_dimension_4' => null, - 'custom_dimension_5' => null, ), $this->anonymizer->getAvailableVisitColumnsToAnonymize()); } diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml index 6febfafa4d..32886b417f 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml @@ -338,12 +338,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -360,6 +354,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -503,12 +503,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -525,6 +519,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -689,12 +689,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -711,6 +705,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -852,12 +852,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -874,6 +868,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1038,12 +1038,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1060,6 +1054,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1186,12 +1186,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1208,6 +1202,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1372,12 +1372,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -1390,6 +1384,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1533,12 +1533,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1555,6 +1549,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1894,12 +1894,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1916,6 +1910,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2059,12 +2059,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2081,6 +2075,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2245,12 +2245,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2267,6 +2261,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2408,12 +2408,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2430,6 +2424,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2594,12 +2594,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2616,6 +2610,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2742,12 +2742,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2764,6 +2758,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2928,12 +2928,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -2946,6 +2940,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -3089,12 +3089,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3111,6 +3105,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3450,12 +3450,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3472,6 +3466,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3615,12 +3615,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3637,6 +3631,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3801,12 +3801,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3823,6 +3817,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3964,12 +3964,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3986,6 +3980,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4150,12 +4150,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4172,6 +4166,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4298,12 +4298,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4320,6 +4314,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4484,12 +4484,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -4502,6 +4496,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4645,12 +4645,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4667,6 +4661,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4789,12 +4789,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4811,6 +4805,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5194,12 +5194,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5216,6 +5210,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5323,12 +5323,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5345,6 +5339,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5595,12 +5595,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5617,6 +5611,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -5739,12 +5739,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5761,6 +5755,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6144,12 +6144,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6166,6 +6160,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6273,12 +6273,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6295,6 +6289,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6545,12 +6545,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6567,6 +6561,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -6689,12 +6689,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6711,6 +6705,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7094,12 +7094,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7116,6 +7110,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7223,12 +7223,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7245,6 +7239,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7495,12 +7495,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7517,6 +7511,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7666,12 +7666,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7688,6 +7682,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7816,12 +7816,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7838,6 +7832,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -7987,12 +7987,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8009,6 +8003,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -8166,12 +8166,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8188,6 +8182,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -8337,12 +8337,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8359,6 +8353,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -8516,12 +8516,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8538,6 +8532,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8687,12 +8687,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8709,6 +8703,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8858,12 +8858,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -8876,6 +8870,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -9025,12 +9025,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9047,6 +9041,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -9196,12 +9196,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -9214,6 +9208,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -9363,12 +9363,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9385,6 +9379,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -9534,12 +9534,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -9552,6 +9546,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -9766,12 +9766,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9788,6 +9782,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -10002,12 +10002,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10024,6 +10018,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -10238,12 +10238,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10260,6 +10254,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10409,12 +10409,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10431,6 +10425,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10578,12 +10578,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10600,6 +10594,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10749,12 +10749,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10771,6 +10765,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -10920,12 +10920,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10942,6 +10936,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -11118,12 +11118,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11140,6 +11134,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -11289,12 +11289,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11311,6 +11305,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -11460,12 +11460,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11482,6 +11476,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -11658,12 +11658,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11680,6 +11674,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -11829,12 +11829,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11851,6 +11845,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12065,12 +12065,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12087,6 +12081,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -12301,12 +12301,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12323,6 +12317,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -12537,12 +12537,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12559,6 +12553,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12687,12 +12687,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12709,6 +12703,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12837,12 +12837,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12859,6 +12853,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -12987,12 +12987,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13009,6 +13003,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -13137,12 +13137,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13159,6 +13153,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -13287,12 +13287,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13309,6 +13303,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -13437,12 +13437,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13459,6 +13453,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13608,12 +13608,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13630,6 +13624,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -13779,12 +13779,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13801,6 +13795,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -13950,12 +13950,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13972,6 +13966,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14121,12 +14121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14143,6 +14137,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14447,12 +14447,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14469,6 +14463,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -14618,12 +14618,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14640,6 +14634,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -14944,12 +14944,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14966,6 +14960,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15115,12 +15115,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15137,6 +15131,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15441,12 +15441,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15463,6 +15457,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -15606,12 +15606,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15628,6 +15622,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -15771,12 +15771,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15793,6 +15787,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15936,12 +15936,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15958,6 +15952,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16107,12 +16107,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16129,6 +16123,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16272,12 +16272,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16294,6 +16288,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -16443,12 +16443,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16465,6 +16459,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -16608,12 +16608,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16630,6 +16624,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16779,12 +16779,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16801,6 +16795,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16944,12 +16944,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16966,6 +16960,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17115,12 +17115,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17137,6 +17131,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -17286,12 +17286,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17308,6 +17302,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -17457,12 +17457,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17479,6 +17473,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17631,12 +17631,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17653,6 +17647,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17802,12 +17802,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17824,6 +17818,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -17976,12 +17976,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17998,6 +17992,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -18147,12 +18147,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18169,6 +18163,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18321,12 +18321,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18343,6 +18337,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18492,12 +18492,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18514,6 +18508,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -18853,12 +18853,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18875,6 +18869,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19018,12 +19018,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19040,6 +19034,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19204,12 +19204,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19226,6 +19220,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19367,12 +19367,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19389,6 +19383,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19553,12 +19553,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19575,6 +19569,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19701,12 +19701,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19723,6 +19717,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19887,12 +19887,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -19905,6 +19899,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20048,12 +20048,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20070,6 +20064,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20192,12 +20192,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20214,6 +20208,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20597,12 +20597,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20619,6 +20613,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20726,12 +20726,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20748,6 +20742,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20998,12 +20998,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21020,6 +21014,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21169,12 +21169,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21191,6 +21185,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21319,12 +21319,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21341,6 +21335,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21490,12 +21490,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21512,6 +21506,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21661,12 +21661,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -21679,6 +21673,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21893,12 +21893,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21915,6 +21909,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22064,12 +22064,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22086,6 +22080,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22233,12 +22233,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22255,6 +22249,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22404,12 +22404,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22426,6 +22420,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22640,12 +22640,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22662,6 +22656,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22790,12 +22790,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22812,6 +22806,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22940,12 +22940,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22962,6 +22956,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23111,12 +23111,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23133,6 +23127,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23282,12 +23282,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23304,6 +23298,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23608,12 +23608,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23630,6 +23624,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23773,12 +23773,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23795,6 +23789,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23944,12 +23944,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23966,6 +23960,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24109,12 +24109,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24131,6 +24125,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24280,12 +24280,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24302,6 +24296,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24454,12 +24454,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24476,6 +24470,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24625,12 +24625,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24647,6 +24641,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24986,12 +24986,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25008,6 +25002,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -25151,12 +25151,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25173,6 +25167,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -25337,12 +25337,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25359,6 +25353,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -25500,12 +25500,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25522,6 +25516,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -25686,12 +25686,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25708,6 +25702,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -25834,12 +25834,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -25856,6 +25850,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -26020,12 +26020,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -26038,6 +26032,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -26181,12 +26181,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -26203,6 +26197,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -26542,12 +26542,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -26564,6 +26558,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -26707,12 +26707,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -26729,6 +26723,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -26893,12 +26893,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -26915,6 +26909,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -27056,12 +27056,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -27078,6 +27072,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -27242,12 +27242,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -27264,6 +27258,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -27390,12 +27390,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -27412,6 +27406,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -27576,12 +27576,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -27594,6 +27588,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -27737,12 +27737,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -27759,6 +27753,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -27881,12 +27881,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -27903,6 +27897,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -28286,12 +28286,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -28308,6 +28302,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -28415,12 +28415,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -28437,6 +28431,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -28687,12 +28687,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -28709,6 +28703,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -28831,12 +28831,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -28853,6 +28847,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -29236,12 +29236,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -29258,6 +29252,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -29365,12 +29365,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -29387,6 +29381,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -29637,12 +29637,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -29659,6 +29653,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -29808,12 +29808,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -29830,6 +29824,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -29958,12 +29958,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -29980,6 +29974,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -30129,12 +30129,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -30151,6 +30145,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -30279,12 +30279,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -30301,6 +30295,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -30450,12 +30450,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -30472,6 +30466,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -30621,12 +30621,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -30639,6 +30633,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -30788,12 +30788,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -30810,6 +30804,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -30959,12 +30959,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -30977,6 +30971,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -31191,12 +31191,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -31213,6 +31207,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -31427,12 +31427,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -31449,6 +31443,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -31598,12 +31598,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -31620,6 +31614,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -31767,12 +31767,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -31789,6 +31783,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -31938,12 +31938,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -31960,6 +31954,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -32109,12 +32109,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -32131,6 +32125,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -32278,12 +32278,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -32300,6 +32294,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -32449,12 +32449,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -32471,6 +32465,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -32685,12 +32685,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -32707,6 +32701,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -32921,12 +32921,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -32943,6 +32937,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -33071,12 +33071,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33093,6 +33087,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -33221,12 +33221,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33243,6 +33237,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -33371,12 +33371,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33393,6 +33387,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -33521,12 +33521,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33543,6 +33537,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -33692,12 +33692,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33714,6 +33708,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -33863,12 +33863,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -33885,6 +33879,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -34034,12 +34034,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -34056,6 +34050,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -34360,12 +34360,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -34382,6 +34376,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -34531,12 +34531,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -34553,6 +34547,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -34857,12 +34857,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -34879,6 +34873,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -35022,12 +35022,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35044,6 +35038,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -35187,12 +35187,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35209,6 +35203,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -35358,12 +35358,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35380,6 +35374,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -35523,12 +35523,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35545,6 +35539,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -35694,12 +35694,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35716,6 +35710,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -35859,12 +35859,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -35881,6 +35875,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -36030,12 +36030,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36052,6 +36046,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -36201,12 +36201,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36223,6 +36217,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -36375,12 +36375,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36397,6 +36391,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -36546,12 +36546,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36568,6 +36562,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -36720,12 +36720,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36742,6 +36736,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -36891,12 +36891,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -36913,6 +36907,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -37252,12 +37252,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -37274,6 +37268,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -37417,12 +37417,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -37439,6 +37433,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -37603,12 +37603,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -37625,6 +37619,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -37766,12 +37766,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -37788,6 +37782,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -37952,12 +37952,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -37974,6 +37968,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -38100,12 +38100,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -38122,6 +38116,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -38286,12 +38286,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -38304,6 +38298,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -38447,12 +38447,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -38469,6 +38463,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -38591,12 +38591,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -38613,6 +38607,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -38996,12 +38996,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39018,6 +39012,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -39125,12 +39125,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39147,6 +39141,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -39397,12 +39397,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39419,6 +39413,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -39568,12 +39568,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39590,6 +39584,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -39747,12 +39747,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39769,6 +39763,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -39918,12 +39918,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -39940,6 +39934,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -40089,12 +40089,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -40107,6 +40101,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -40321,12 +40321,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -40343,6 +40337,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -40492,12 +40492,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -40514,6 +40508,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -40690,12 +40690,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -40712,6 +40706,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -40861,12 +40861,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -40883,6 +40877,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -41097,12 +41097,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -41119,6 +41113,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -41247,12 +41247,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -41269,6 +41263,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -41397,12 +41397,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -41419,6 +41413,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -41568,12 +41568,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -41590,6 +41584,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -41739,12 +41739,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -41761,6 +41755,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -42065,12 +42065,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -42087,6 +42081,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -42230,12 +42230,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -42252,6 +42246,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -42401,12 +42401,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -42423,6 +42417,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -42566,12 +42566,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -42588,6 +42582,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -42737,12 +42737,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -42759,5 +42753,11 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml index 771a35c0ee..cda8a61f95 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml @@ -89,12 +89,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -111,6 +105,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -201,12 +201,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -223,6 +217,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -313,12 +313,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -335,6 +329,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -425,12 +425,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -447,6 +441,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -537,12 +537,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -559,6 +553,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -649,12 +649,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -671,6 +665,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -761,12 +761,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -779,6 +773,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -869,12 +869,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -891,6 +885,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -981,12 +981,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1003,6 +997,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1093,12 +1093,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1115,6 +1109,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1205,12 +1205,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1227,6 +1221,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1317,12 +1317,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1339,6 +1333,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1429,12 +1429,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1451,6 +1445,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1541,12 +1541,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1563,6 +1557,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1653,12 +1653,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -1671,6 +1665,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1761,12 +1761,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1783,6 +1777,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -1873,12 +1873,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1895,6 +1889,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -1985,12 +1985,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2007,6 +2001,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2097,12 +2097,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2119,6 +2113,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2209,12 +2209,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2231,6 +2225,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2321,12 +2321,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2343,6 +2337,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2433,12 +2433,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2455,6 +2449,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2545,12 +2545,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -2563,6 +2557,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -2653,12 +2653,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2675,6 +2669,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2765,12 +2765,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2787,6 +2781,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2877,12 +2877,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2899,6 +2893,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2989,12 +2989,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3011,6 +3005,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3101,12 +3101,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3123,6 +3117,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -3213,12 +3213,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3235,6 +3229,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -3325,12 +3325,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3347,6 +3341,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -3437,12 +3437,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3459,6 +3453,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -3549,12 +3549,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3571,6 +3565,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3661,12 +3661,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3683,6 +3677,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3773,12 +3773,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3795,6 +3789,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3885,12 +3885,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3907,6 +3901,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -3997,12 +3997,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4019,6 +4013,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4109,12 +4109,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4131,6 +4125,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4221,12 +4221,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4243,6 +4237,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -4333,12 +4333,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4355,6 +4349,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -4445,12 +4445,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4467,6 +4461,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4557,12 +4557,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4579,6 +4573,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -4669,12 +4669,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4691,6 +4685,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4781,12 +4781,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -4803,6 +4797,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4893,12 +4893,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -4911,6 +4905,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -5001,12 +5001,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5023,6 +5017,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -5113,12 +5113,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -5131,6 +5125,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -5221,12 +5221,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5243,6 +5237,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -5333,12 +5333,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -5351,6 +5345,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5441,12 +5441,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5463,6 +5457,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -5553,12 +5553,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5575,6 +5569,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -5665,12 +5665,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5687,6 +5681,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5777,12 +5777,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5799,6 +5793,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5889,12 +5889,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -5911,6 +5905,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6001,12 +6001,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6023,6 +6017,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6113,12 +6113,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6135,6 +6129,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6225,12 +6225,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6247,6 +6241,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6337,12 +6337,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6359,6 +6353,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -6449,12 +6449,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6471,6 +6465,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -6561,12 +6561,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6583,6 +6577,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -6673,12 +6673,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6695,6 +6689,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6785,12 +6785,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6807,6 +6801,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -6897,12 +6897,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -6919,6 +6913,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7009,12 +7009,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7031,6 +7025,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7121,12 +7121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7143,6 +7137,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7233,12 +7233,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7255,6 +7249,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -7345,12 +7345,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7367,6 +7361,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -7457,12 +7457,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7479,6 +7473,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7569,12 +7569,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7591,6 +7585,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -7681,12 +7681,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7703,6 +7697,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7793,12 +7793,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7815,6 +7809,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -7905,12 +7905,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -7927,6 +7921,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -8017,12 +8017,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8039,6 +8033,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8129,12 +8129,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8151,6 +8145,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8241,12 +8241,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8263,6 +8257,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -8353,12 +8353,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8375,6 +8369,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -8465,12 +8465,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8487,6 +8481,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -8577,12 +8577,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8599,6 +8593,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -8689,12 +8689,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8711,6 +8705,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8801,12 +8801,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8823,6 +8817,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -8913,12 +8913,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -8935,6 +8929,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -9025,12 +9025,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9047,6 +9041,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -9137,12 +9137,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9159,6 +9153,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -9249,12 +9249,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9271,6 +9265,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -9361,12 +9361,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9383,6 +9377,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -9473,12 +9473,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9495,6 +9489,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -9585,12 +9585,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9607,6 +9601,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -9697,12 +9697,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9719,6 +9713,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -9809,12 +9809,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9831,6 +9825,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -9921,12 +9921,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -9943,6 +9937,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -10033,12 +10033,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10055,6 +10049,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10145,12 +10145,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10167,6 +10161,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10257,12 +10257,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10279,6 +10273,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -10369,12 +10369,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10391,6 +10385,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -10481,12 +10481,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10503,6 +10497,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -10593,12 +10593,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10615,6 +10609,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -10705,12 +10705,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10727,6 +10721,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10817,12 +10817,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10839,6 +10833,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -10929,12 +10929,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -10951,6 +10945,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11041,12 +11041,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11063,6 +11057,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11153,12 +11153,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11175,6 +11169,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11265,12 +11265,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11287,6 +11281,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11377,12 +11377,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11399,6 +11393,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11489,12 +11489,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -11507,6 +11501,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11597,12 +11597,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11619,6 +11613,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11709,12 +11709,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11731,6 +11725,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11821,12 +11821,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11843,6 +11837,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -11933,12 +11933,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -11955,6 +11949,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12045,12 +12045,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12067,6 +12061,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12157,12 +12157,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12179,6 +12173,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12269,12 +12269,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12291,6 +12285,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12381,12 +12381,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12403,6 +12397,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12493,12 +12493,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -12511,6 +12505,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12601,12 +12601,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12623,6 +12617,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12713,12 +12713,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12735,6 +12729,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12825,12 +12825,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12847,6 +12841,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -12937,12 +12937,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -12959,6 +12953,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13049,12 +13049,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13071,6 +13065,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13161,12 +13161,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13183,6 +13177,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13273,12 +13273,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13295,6 +13289,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13385,12 +13385,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13407,6 +13401,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13497,12 +13497,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13519,6 +13513,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13609,12 +13609,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13631,6 +13625,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13721,12 +13721,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13743,6 +13737,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13833,12 +13833,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13855,6 +13849,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -13945,12 +13945,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -13967,6 +13961,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14057,12 +14057,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14079,6 +14073,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14169,12 +14169,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14191,6 +14185,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14281,12 +14281,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14303,6 +14297,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14393,12 +14393,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14415,6 +14409,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14505,12 +14505,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14527,6 +14521,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14617,12 +14617,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14639,6 +14633,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14729,12 +14729,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14751,6 +14745,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14841,12 +14841,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14863,6 +14857,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -14953,12 +14953,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -14975,6 +14969,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -15065,12 +15065,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -15083,6 +15077,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -15173,12 +15173,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15195,6 +15189,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15285,12 +15285,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15307,6 +15301,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15397,12 +15397,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15419,6 +15413,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15509,12 +15509,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15531,6 +15525,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15621,12 +15621,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15643,6 +15637,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15733,12 +15733,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15755,6 +15749,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15845,12 +15845,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -15867,6 +15861,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -15957,12 +15957,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -15975,6 +15969,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16065,12 +16065,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16087,6 +16081,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16177,12 +16177,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16199,6 +16193,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16289,12 +16289,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16311,6 +16305,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16401,12 +16401,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16423,6 +16417,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -16513,12 +16513,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>3</daysSinceLastVisit> <secondsSinceLastVisit>259200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16535,6 +16529,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16625,12 +16625,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16647,6 +16641,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16737,12 +16737,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16759,6 +16753,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16849,12 +16849,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16871,6 +16865,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -16961,12 +16961,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -16983,6 +16977,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17073,12 +17073,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17095,6 +17089,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17185,12 +17185,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>255600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17207,6 +17201,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -17297,12 +17297,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17319,6 +17313,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -17409,12 +17409,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17431,6 +17425,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17521,12 +17521,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17543,6 +17537,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17633,12 +17633,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -17651,6 +17645,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -17741,12 +17741,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17763,6 +17757,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -17853,12 +17853,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -17871,6 +17865,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -17961,12 +17961,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>252000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -17983,6 +17977,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18073,12 +18073,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18095,6 +18089,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -18185,12 +18185,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18207,6 +18201,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -18297,12 +18297,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18319,6 +18313,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -18409,12 +18409,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18431,6 +18425,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18521,12 +18521,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18543,6 +18537,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18633,12 +18633,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18655,6 +18649,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18745,12 +18745,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18767,6 +18761,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -18857,12 +18857,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>248400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18879,6 +18873,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -18969,12 +18969,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -18991,6 +18985,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19081,12 +19081,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19103,6 +19097,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19193,12 +19193,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19215,6 +19209,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -19305,12 +19305,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19327,6 +19321,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -19417,12 +19417,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19439,6 +19433,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19529,12 +19529,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>241200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19551,6 +19545,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -19641,12 +19641,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19663,6 +19657,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19753,12 +19753,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19775,6 +19769,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -19865,12 +19865,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>230400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19887,6 +19881,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -19977,12 +19977,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -19999,6 +19993,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -20089,12 +20089,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20111,6 +20105,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20201,12 +20201,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20223,6 +20217,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -20313,12 +20313,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20335,6 +20329,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20425,12 +20425,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20447,6 +20441,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20537,12 +20537,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>2</daysSinceLastVisit> <secondsSinceLastVisit>212400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20559,6 +20553,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -20649,12 +20649,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20671,6 +20665,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -20761,12 +20761,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20783,6 +20777,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -20873,12 +20873,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -20895,6 +20889,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -20985,12 +20985,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21007,6 +21001,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21097,12 +21097,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21119,6 +21113,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21209,12 +21209,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>104400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21231,6 +21225,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -21321,12 +21321,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21343,6 +21337,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>5</idSite> @@ -21433,12 +21433,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21455,6 +21449,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21545,12 +21545,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>200</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21567,6 +21561,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>200</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21657,12 +21657,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>14400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21679,6 +21673,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21769,12 +21769,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21791,6 +21785,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21881,12 +21881,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -21903,6 +21897,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -21993,12 +21993,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22015,6 +22009,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22105,12 +22105,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>28800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22127,6 +22121,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22217,12 +22217,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -22235,6 +22229,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22325,12 +22325,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22347,6 +22341,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22437,12 +22437,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22459,6 +22453,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22549,12 +22549,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>204</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22571,6 +22565,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>204</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22661,12 +22661,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22683,6 +22677,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22773,12 +22773,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>210</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22795,6 +22789,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>210</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22885,12 +22885,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -22907,6 +22901,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -22997,12 +22997,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23019,6 +23013,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23109,12 +23109,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23131,6 +23125,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23221,12 +23221,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>209</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> @@ -23239,6 +23233,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>209</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23329,12 +23329,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>201</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23351,6 +23345,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>201</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23441,12 +23441,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23463,6 +23457,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23553,12 +23553,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>205</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23575,6 +23569,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>205</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23665,12 +23665,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23687,6 +23681,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23777,12 +23777,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>207</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23799,6 +23793,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>207</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -23889,12 +23889,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>140400</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>202</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -23911,6 +23905,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>202</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24001,12 +24001,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>21600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24023,6 +24017,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24113,12 +24113,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>206</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24135,6 +24129,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>206</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24225,12 +24225,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24247,6 +24241,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24337,12 +24337,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>208</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24359,6 +24353,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>208</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24449,12 +24449,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24471,6 +24465,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24561,12 +24561,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>18000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24583,6 +24577,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24673,12 +24673,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>211</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24695,6 +24689,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>211</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -24785,12 +24785,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>90000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>myCustomUserId</customVariableName1> - <customVariableValue1>203</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -24807,5 +24801,11 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>myCustomUserId</customVariableName1> + <customVariableValue1>203</customVariableValue1> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/test_userIdAnonymized__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_userIdAnonymized__Live.getLastVisitsDetails_year.xml index f510299add..279a28911c 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_userIdAnonymized__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_userIdAnonymized__Live.getLastVisitsDetails_year.xml @@ -89,8 +89,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -107,6 +105,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -197,8 +197,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -215,5 +213,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php index 357c4ebf0a..f03718b1b7 100644 --- a/plugins/Widgetize/tests/System/WidgetTest.php +++ b/plugins/Widgetize/tests/System/WidgetTest.php @@ -275,14 +275,6 @@ class WidgetTest extends SystemTestCase 'small' => 1, ), ),array ( - 'name' => 'Custom Variables', - 'uniqueId' => 'widgetCustomVariablesgetCustomVariables', - 'parameters' => - array ( - 'module' => 'CustomVariables', - 'action' => 'getCustomVariables', - ), - ),array ( 'name' => 'Device type', 'uniqueId' => 'widgetDevicesDetectiongetType', 'parameters' => diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index aa0bb583de..c58528bc07 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -7,7 +7,6 @@ */ namespace Piwik\Tests\Fixtures; -use Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Plugins\SegmentEditor\API as APISegmentEditor; use Piwik\Plugins\UserCountry\LocationProvider; @@ -84,7 +83,7 @@ class ManySitesImportedLogs extends Fixture 'autoArchive' => true, 'enabledAllUsers' => true), - 'segmentNoAutoArchive' => array('definition' => 'customVariableName1==Not-bot', + 'segmentNoAutoArchive' => array('definition' => 'deviceBrand==Apple', 'idSite' => false, 'autoArchive' => false, 'enabledAllUsers' => true), @@ -97,7 +96,7 @@ class ManySitesImportedLogs extends Fixture 'segmentPreArchivedWithUrlEncoding' => array('definition'=> self::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED, 'idSite' => 1, 'autoArchive' => true, - 'enabledAllUsers' => true) + 'enabledAllUsers' => true), // fails randomly and I really could not find why. // 'segmentOnlySuperuser' => array('definition' => 'actions>1;customVariablePageName1=='.urlencode('HTTP-code'), diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index 267e584477..953a73aaf3 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -99,10 +99,11 @@ class ManyVisitsWithGeoIP extends Fixture } } + protected $calledCounter = 0; + private function trackVisits($visitorCount, $setIp = false, $useLocal = true, $doBulk = false) { - static $calledCounter = 0; - $calledCounter++; + $this->calledCounter++; $dateTime = $this->dateTime; $idSite = $this->idSite; @@ -120,7 +121,7 @@ class ManyVisitsWithGeoIP extends Fixture $t->setTokenAuth(self::getTokenAuth()); for ($i = 0; $i != $visitorCount; ++$i) { - $this->trackVisit($t, $calledCounter, $i, $doBulk, array('setIp' => $setIp)); + $this->trackVisit($t, $this->calledCounter, $i, $doBulk, array('setIp' => $setIp)); } if ($doBulk) { diff --git a/tests/PHPUnit/Integration/Category/CategoryListTest.php b/tests/PHPUnit/Integration/Category/CategoryListTest.php index 34ba8d27e6..eaacb5dead 100644 --- a/tests/PHPUnit/Integration/Category/CategoryListTest.php +++ b/tests/PHPUnit/Integration/Category/CategoryListTest.php @@ -45,9 +45,9 @@ class CategoryListTest extends IntegrationTestCase 'Events_Events', 'UserCountry_VisitLocation', 'Live!', - 'CustomVariables_CustomVariables', 'Marketplace_Marketplace', - 'ExampleUI_UiFramework' + 'ExampleUI_UiFramework', + 'CustomVariables_CustomVariables', ), array_keys($list->getCategories())); } diff --git a/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php index fc5641b041..58f356e30c 100644 --- a/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php +++ b/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Core\DataTable\Filter; use Piwik\API\Proxy; +use Piwik\Plugin\Manager; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; @@ -112,7 +113,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_ReturnsEmptyResult_WhenTableToFilterIsEmpty() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = new DataTable(); @@ -124,7 +125,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyCreatesPivotTable_WhenUsingSubtableReport() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); @@ -141,7 +142,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyCreatesPivotTable_WhenUsingSegment() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); @@ -164,7 +165,7 @@ class PivotByDimensionTest extends IntegrationTestCase */ public function test_filter_UsesCorrectSegment_WhenPivotingSegmentedReport() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); @@ -183,7 +184,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyCreatesPivotTable_WhenPivotMetricDoesNotExistInTable() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); @@ -200,6 +201,10 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyCreatesPivotTable_WhenSubtablesHaveNoRows() { + if (!Manager::getInstance()->isPluginInstalled('CustomVariables')) { + $this->markTestSkipped('Test requires CustomVariables plugin to run'); + } + Cache::setCacheGeneral(array(CustomVariables::MAX_NUM_CUSTOMVARS_CACHEKEY => 5)); $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); @@ -222,7 +227,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyDefaultsPivotByColumn_WhenNoneProvided() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); @@ -239,7 +244,7 @@ class PivotByDimensionTest extends IntegrationTestCase public function test_filter_CorrectlyLimitsTheColumnNumber_WhenColumnLimitProvided() { - $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); + $this->loadPlugins('Referrers', 'UserCountry'); $table = $this->getTableToFilter(true); diff --git a/tests/PHPUnit/Integration/Segment/SegmentsListTest.php b/tests/PHPUnit/Integration/Segment/SegmentsListTest.php index 6fbfea81bc..6626ee7549 100644 --- a/tests/PHPUnit/Integration/Segment/SegmentsListTest.php +++ b/tests/PHPUnit/Integration/Segment/SegmentsListTest.php @@ -55,7 +55,7 @@ class SegmentsListTest extends IntegrationTestCase $segments = $list->getSegments(); // there should be at least 100 segments in core - $this->assertGreaterThan(100, count($segments)); + $this->assertGreaterThan(99, count($segments)); // check some specific segments exists $this->assertNotNull($list->getSegment('pageUrl')); diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php index 1c7ab999cd..9c0e2464fe 100644 --- a/tests/PHPUnit/Integration/SegmentTest.php +++ b/tests/PHPUnit/Integration/SegmentTest.php @@ -37,7 +37,7 @@ class SegmentTest extends IntegrationTestCase { parent::setUp(); - // setup the access layer (required in Segment contrustor testing if anonymous is allowed to use segments) + // setup the access layer (required in Segment constructor testing if anonymous is allowed to use segments) FakeAccess::$superUser = true; Fixture::createWebsite('2015-01-01 00:00:00'); @@ -100,15 +100,6 @@ class SegmentTest extends IntegrationTestCase 'bind' => array('ff') )), - // test multiple column segments - array('customVariableName==abc;customVariableValue==def', array( - 'where' => ' (log_visit.custom_var_k1 = ? OR log_visit.custom_var_k2 = ? OR log_visit.custom_var_k3 = ? OR log_visit.custom_var_k4 = ? OR log_visit.custom_var_k5 = ?) AND (log_visit.custom_var_v1 = ? OR log_visit.custom_var_v2 = ? OR log_visit.custom_var_v3 = ? OR log_visit.custom_var_v4 = ? OR log_visit.custom_var_v5 = ? )', - 'bind' => array( - 'abc', 'abc', 'abc', 'abc', 'abc', - 'def', 'def', 'def', 'def', 'def', - ), - )), - array(urlencode('browserCode!=' . $encodedComplexValue . ',browserCode==' . $encodedComplexValue . ';browserCode!=' . $encodedComplexValue), [ 'where' => ' (( log_visit.config_browser_name IS NULL OR log_visit.config_browser_name <> ? ) OR log_visit.config_browser_name = ?) AND ( log_visit.config_browser_name IS NULL OR log_visit.config_browser_name <> ? ) ', 'bind' => [ @@ -159,7 +150,7 @@ class SegmentTest extends IntegrationTestCase $where = 'idsite = ?'; $bind = array(1); - $segment = 'customVariableName1==Test;visitorType==new'; + $segment = 'deviceBrand==Apple;visitorType==new'; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -174,8 +165,8 @@ class SegmentTest extends IntegrationTestCase WHERE ( idsite = ? ) AND - ( log_visit.custom_var_k1 = ? AND log_visit.visitor_returning = ? )", - "bind" => array(1, 'Test', 0)); + ( log_visit.config_device_brand = ? AND log_visit.visitor_returning = ? )", + "bind" => array(1, 'AP', 0)); $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); } @@ -187,7 +178,7 @@ class SegmentTest extends IntegrationTestCase $where = 'log_link_visit_action.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test;visitorType==new'; + $segment = 'siteSearchCategory==Test;visitorType==new'; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -203,7 +194,7 @@ class SegmentTest extends IntegrationTestCase WHERE ( log_link_visit_action.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? AND log_visit.visitor_returning = ? )", + ( log_link_visit_action.search_cat = ? AND log_visit.visitor_returning = ? )", "bind" => array(1, 'Test', 0)); $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); @@ -216,7 +207,7 @@ class SegmentTest extends IntegrationTestCase $where = 'log_visit.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test;visitorType==new'; + $segment = 'siteSearchCategory==Test;visitorType==new'; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -237,7 +228,7 @@ class SegmentTest extends IntegrationTestCase WHERE ( log_visit.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? AND log_visit.visitor_returning = ? ) + ( log_link_visit_action.search_cat = ? AND log_visit.visitor_returning = ? ) GROUP BY log_visit.idvisit ORDER BY NULL ) AS log_inner", @@ -253,7 +244,7 @@ class SegmentTest extends IntegrationTestCase $where = 'log_link_visit_action.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test;visitConvertedGoalId==1;customVariablePageName2==Test2'; + $segment = 'siteSearchCategory==Test;visitConvertedGoalId==1;siteSearchCount==5'; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -269,8 +260,8 @@ class SegmentTest extends IntegrationTestCase WHERE ( log_link_visit_action.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? AND log_link_visit_action.custom_var_k2 = ? )", - "bind" => array(1, 'Test', 1, 'Test2')); + ( log_link_visit_action.search_cat = ? AND log_conversion.idgoal = ? AND log_link_visit_action.search_count = ? )", + "bind" => array(1, 'Test', 1, 5)); $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); } @@ -282,7 +273,7 @@ class SegmentTest extends IntegrationTestCase $where = 'log_conversion.idvisit = ?'; $bind = array(1); - $segment = 'visitConvertedGoalId!=2;customVariablePageName1==Test;visitConvertedGoalId==1'; + $segment = 'visitConvertedGoalId!=2;siteSearchCategory==Test;visitConvertedGoalId==1'; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -298,7 +289,7 @@ class SegmentTest extends IntegrationTestCase WHERE ( log_conversion.idvisit = ? ) AND - ( ( log_conversion.idgoal IS NULL OR log_conversion.idgoal <> ? ) AND log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? )", + ( ( log_conversion.idgoal IS NULL OR log_conversion.idgoal <> ? ) AND log_link_visit_action.search_cat = ? AND log_conversion.idgoal = ? )", "bind" => array(1, 2, 'Test', 1)); $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); @@ -645,7 +636,7 @@ class SegmentTest extends IntegrationTestCase $where = false; $bind = array(); - $segment = 'visitConvertedGoalId==1;visitServerHour==12;customVariablePageName1==Test;pageUrl!='; + $segment = 'visitConvertedGoalId==1;visitServerHour==12;siteSearchCategory==Test;pageUrl!='; $segment = new Segment($segment, $idSites = array()); $query = $segment->getSelectQuery($select, $from, $where, $bind); @@ -663,7 +654,7 @@ class SegmentTest extends IntegrationTestCase LEFT JOIN " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit LEFT JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion ON log_conversion.idvisit = log_visit.idvisit WHERE - log_conversion.idgoal = ? AND HOUR(log_visit.visit_last_action_time) = ? AND log_link_visit_action.custom_var_k1 = ? + log_conversion.idgoal = ? AND HOUR(log_visit.visit_last_action_time) = ? AND log_link_visit_action.search_cat = ? AND ( log_link_visit_action.idaction_url IS NOT NULL AND log_link_visit_action.idaction_url <> '' @@ -943,7 +934,7 @@ class SegmentTest extends IntegrationTestCase $where = 'log_visit.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test'; + $segment = 'siteSearchCategory==Test'; $segment = new Segment($segment, $idSites = array()); $orderBy = false; @@ -966,7 +957,7 @@ class SegmentTest extends IntegrationTestCase WHERE ( log_visit.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? ) + ( log_link_visit_action.search_cat = ? ) ORDER BY NULL LIMIT 0, 33 ) AS log_inner", @@ -1080,7 +1071,7 @@ log_visit.visit_total_actions $where = 'log_visit.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test'; + $segment = 'siteSearchCategory==Test'; $segment = new Segment($segment, $idSites = array()); $orderBy = false; @@ -1104,7 +1095,7 @@ log_visit.visit_total_actions WHERE ( log_visit.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? ) + ( log_link_visit_action.search_cat = ? ) ORDER BY NULL LIMIT 10, 33 ) AS log_inner", @@ -1120,7 +1111,7 @@ log_visit.visit_total_actions $where = 'log_visit.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test'; + $segment = 'siteSearchCategory==Test'; $segment = new Segment($segment, $idSites = array()); $orderBy = false; @@ -1144,7 +1135,7 @@ log_visit.visit_total_actions WHERE ( log_visit.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? ) + ( log_link_visit_action.search_cat = ? ) ORDER BY NULL LIMIT 0, 33 ) AS log_inner", @@ -1160,7 +1151,7 @@ log_visit.visit_total_actions $where = 'log_visit.idvisit = ?'; $bind = array(1); - $segment = 'customVariablePageName1==Test'; + $segment = 'siteSearchCategory==Test'; $segment = new Segment($segment, $idSites = array()); $orderBy = false; @@ -1184,7 +1175,7 @@ log_visit.visit_total_actions WHERE ( log_visit.idvisit = ? ) AND - ( log_link_visit_action.custom_var_k1 = ? ) + ( log_link_visit_action.search_cat = ? ) GROUP BY log_visit.idvisit ORDER BY NULL ) AS log_inner", diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php index 501cd981bb..d4706c99e8 100644 --- a/tests/PHPUnit/Integration/Tracker/RequestTest.php +++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php @@ -11,8 +11,6 @@ namespace Piwik\Tests\Integration\Tracker; use Matomo\Network\IPUtils; use Piwik\Config; use Piwik\Piwik; -use Piwik\Plugins\CustomVariables\CustomVariables; -use Piwik\Plugins\UsersManager\API; use Piwik\Plugins\UsersManager\Model; use Piwik\Plugins\UsersManager\UsersManager; use Piwik\Tests\Framework\Fixture; @@ -135,153 +133,6 @@ class RequestTest extends IntegrationTestCase $this->assertEquals(IPUtils::stringToBinaryIP($ip), $this->request->getIp()); } - public function test_getCustomVariablesInVisitScope_ShouldReturnNoCustomVars_IfNoWerePassedInParams() - { - $this->assertEquals(array(), $this->request->getCustomVariablesInVisitScope()); - } - - public function test_getCustomVariablesInVisitScope_ShouldReturnNoCustomVars_IfPassedParamIsNotAnArray() - { - $this->assertCustomVariablesInVisitScope(array(), '{"mykey":"myval"}'); - } - - public function test_getCustomVariablesInVisitScope_ShouldReturnCustomVars_IfTheyAreValid() - { - $customVars = $this->buildCustomVars(array('mykey' => 'myval', 'test' => 'value')); - $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval', 'test' => 'value')); - - $this->assertCustomVariablesInVisitScope($expected, $customVars); - } - - public function test_getCustomVariablesInVisitScope_ShouldIgnoreIndexesLowerThan1() - { - $customVars = array( - array('mykey', 'myval'), - array('test', 'value'), - ); - $expected = $this->buildExpectedCustomVars(array('test' => 'value')); - - $this->assertCustomVariablesInVisitScope($expected, json_encode($customVars)); - } - - public function test_getCustomVariablesInVisitScope_ShouldTruncateValuesIfTheyAreTooLong() - { - $maxLen = CustomVariables::getMaxLengthCustomVariables(); - - $customVars = $this->buildCustomVars(array( - 'mykey' => 'myval', - 'test' => str_pad('test', $maxLen + 5, 't'), - )); - $expected = $this->buildExpectedCustomVars(array( - 'mykey' => 'myval', - 'test' => str_pad('test', $maxLen, 't'), - )); - - $this->assertCustomVariablesInVisitScope($expected, $customVars); - } - - public function test_getCustomVariablesInVisitScope_ShouldIgnoreVarsThatDoNotHaveKeyAndValue() - { - $customVars = array( - 1 => array('mykey', 'myval'), - 2 => array('test'), - ); - $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval')); - - $this->assertCustomVariablesInVisitScope($expected, json_encode($customVars)); - } - - public function test_getCustomVariablesInVisitScope_ShouldSetDefaultValueToEmptyStringAndHandleOtherTypes() - { - $input = array( - 'myfloat' => 5.55, - 'myint' => 53, - 'mystring' => '', - ); - $customVars = $this->buildCustomVars($input); - $expected = $this->buildExpectedCustomVars($input); - - $this->assertCustomVariablesInVisitScope($expected, $customVars); - } - - public function test_getCustomVariablesInPageScope_ShouldReturnNoCustomVars_IfNoWerePassedInParams() - { - $this->assertEquals(array(), $this->request->getCustomVariablesInPageScope()); - } - - public function test_getCustomVariablesInPageScope_ShouldReturnNoCustomVars_IfPassedParamIsNotAnArray() - { - $this->assertCustomVariablesInPageScope(array(), '{"mykey":"myval"}'); - } - - public function test_getCustomVariablesInPageScope_ShouldReturnCustomVars_IfTheyAreValid() - { - $customVars = $this->buildCustomVars(array('mykey' => 'myval', 'test' => 'value')); - $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval', 'test' => 'value')); - - $this->assertCustomVariablesInPageScope($expected, $customVars); - } - - public function test_getCustomVariablesInPageScope_ShouldIgnoreIndexesLowerThan1() - { - $customVars = array( - array('mykey', 'myval'), - array('test', 'value'), - ); - $expected = $this->buildExpectedCustomVars(array('test' => 'value')); - - $this->assertCustomVariablesInPageScope($expected, json_encode($customVars)); - } - - public function test_getCustomVariablesInPageScope_ShouldTruncateValuesIfTheyAreTooLong() - { - $maxLen = CustomVariables::getMaxLengthCustomVariables(); - - $customVars = $this->buildCustomVars(array( - 'mykey' => 'myval', - 'test' => str_pad('test', $maxLen + 5, 't'), - )); - $expected = $this->buildExpectedCustomVars(array( - 'mykey' => 'myval', - 'test' => str_pad('test', $maxLen, 't'), - )); - - $this->assertCustomVariablesInPageScope($expected, $customVars); - } - - public function test_getCustomVariablesInPageScope_ShouldIgnoreVarsThatDoNotHaveKeyAndValue() - { - $customVars = array( - 1 => array('mykey', 'myval'), - 2 => array('test'), - ); - $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval')); - - $this->assertCustomVariablesInPageScope($expected, json_encode($customVars)); - } - - public function test_getCustomVariablesInPageScope_ShouldSetDefaultValueToEmptyStringAndHandleOtherTypes() - { - $input = array( - 'myfloat' => 5.55, - 'myint' => 53, - 'mystring' => '', - ); - $customVars = $this->buildCustomVars($input); - $expected = $this->buildExpectedCustomVars($input); - - $this->assertCustomVariablesInPageScope($expected, $customVars); - } - - public function test_getCustomVariables_nonStringInput() - { - $input = array('mykey' => array('myarraykey' => 'myvalue'), 'myotherkey' => 2); - $customVars = $this->buildCustomVars($input); - // Int value should come through; array value is invalid so should be discarded - $expected = array('custom_var_k2' => 'myotherkey', 'custom_var_v2' => 2); - - $this->assertCustomVariablesInPageScope($expected, $customVars); - } public function test_isAuthenticated_ShouldBeNotAuthenticatedInTestsByDefault() { @@ -406,30 +257,6 @@ class RequestTest extends IntegrationTestCase return $token; } - public function test_internalBuildExpectedCustomVars() - { - $this->assertEquals(array(), $this->buildExpectedCustomVars(array())); - - $this->assertEquals(array('custom_var_k1' => 'key', 'custom_var_v1' => 'val'), - $this->buildExpectedCustomVars(array('key' => 'val'))); - - $this->assertEquals(array( - 'custom_var_k1' => 'key', 'custom_var_v1' => 'val', - 'custom_var_k2' => 'key2', 'custom_var_v2' => 'val2', - ), $this->buildExpectedCustomVars(array('key' => 'val', 'key2' => 'val2'))); - } - - public function test_internalBuildCustomVars() - { - $this->assertEquals('[]', $this->buildCustomVars(array())); - - $this->assertEquals('{"1":["key","val"]}', - $this->buildCustomVars(array('key' => 'val'))); - - $this->assertEquals('{"1":["key","val"],"2":["key2","val2"]}', - $this->buildCustomVars(array('key' => 'val', 'key2' => 'val2'))); - } - public function test_getIdSite_shouldTriggerEventAndReturnThatIdSite() { $self = $this; @@ -498,45 +325,6 @@ class RequestTest extends IntegrationTestCase $this->buildRequest(array('idsite' => '14'))->getIdSite(); } - private function assertCustomVariablesInVisitScope($expectedCvars, $cvarsJsonEncoded) - { - $request = $this->buildRequest(array('_cvar' => $cvarsJsonEncoded)); - $this->assertEquals($expectedCvars, $request->getCustomVariablesInVisitScope()); - } - - private function assertCustomVariablesInPageScope($expectedCvars, $cvarsJsonEncoded) - { - $request = $this->buildRequest(array('cvar' => $cvarsJsonEncoded)); - $this->assertEquals($expectedCvars, $request->getCustomVariablesInPageScope()); - } - - private function buildExpectedCustomVars($customVars) - { - $vars = array(); - $index = 1; - - foreach ($customVars as $key => $value) { - $vars['custom_var_k' . $index] = $key; - $vars['custom_var_v' . $index] = $value; - $index++; - } - - return $vars; - } - - private function buildCustomVars($customVars) - { - $vars = array(); - $index = 1; - - foreach ($customVars as $key => $value) { - $vars[$index] = array($key, $value); - $index++; - } - - return json_encode($vars); - } - private function buildRequest($params) { return new TestRequest($params); diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index 5f091f6dfa..e0d72dd5ae 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -11,11 +11,13 @@ namespace Piwik\Tests\Integration\Tracker; use Piwik\Config; use Piwik\Piwik; use Piwik\Plugins\SitesManager\SitesManager; +use Piwik\Tests\Framework\Mock\Plugin\Manager; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Piwik\Tracker\TrackerCodeGenerator; /** * @group Core + * @group TrackerCodeGenerator */ class TrackerCodeGeneratorTest extends IntegrationTestCase { @@ -44,12 +46,12 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); _paq.push([\"setCookieDomain\", \"*.localhost\"]); _paq.push([\"setDomains\", [\"*.localhost/piwik\",\"*.another-domain/piwik\",\"*.another-domain/piwik\"]]); - _paq.push([\"enableCrossDomainLinking\"]); + _paq.push([\"enableCrossDomainLinking\"]);" . ($this->hasCustomVariables() ? " // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]); // you can set up to 5 custom variables for each action (page view, download, click, site search) - _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]); + _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]);" : "") . " _paq.push([\"setCampaignNameKey\", \"campaignKey\"]); _paq.push([\"setCampaignKeywordKey\", \"keywordKey\"]); _paq.push([\"setDoNotTrack\", true]); @@ -118,12 +120,12 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase <script type="text/javascript"> var _paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); + _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);" . ($this->hasCustomVariables() ? " // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]); // you can set up to 5 custom variables for each action (page view, download, click, site search) - _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]); + _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]);" : "") . " _paq.push([\"setCampaignNameKey\", \"campaignKey\"]); _paq.push([\"setCampaignKeywordKey\", \"keywordKey\"]); _paq.push([\"setDoNotTrack\", true]); @@ -165,12 +167,12 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase <script type="text/javascript"> var _paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); + _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);" . ($this->hasCustomVariables() ? " // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]); // you can set up to 5 custom variables for each action (page view, download, click, site search) - _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]); + _paq.push([\"setCustomVariable\", 1, \"page cvar\", \"page cvar value\", \"page\"]);" : "") . " _paq.push([\"setCampaignNameKey\", \"campaignKey\"]); _paq.push([\"setCampaignKeywordKey\", \"keywordKey\"]); _paq.push([\"setDoNotTrack\", true]); @@ -246,11 +248,11 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase <script type="text/javascript"> var _paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); + _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);' . ($this->hasCustomVariables() ? ' // you can set up to 5 custom variables for each visitor _paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "visit"]); // you can set up to 5 custom variables for each action (page view, download, click, site search) - _paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "page"]); + _paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "page"]);' : '') . ' _paq.push(["setCampaignNameKey", "abc\"def"]); _paq.push(["setCampaignKeywordKey", "abc\"def"]); _paq.push([\'trackPageView\']); @@ -295,4 +297,9 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $this->assertEquals($expected, $jsTag); } + + private function hasCustomVariables() + { + return Manager::getInstance()->isPluginActivated('CustomVariables'); + } } diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index 1652b72ad7..5e886dc6db 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Integration; +use Piwik\Plugin\Manager; use Piwik\Widget\WidgetConfig; use Piwik\Plugins\Goals\API; use Piwik\Tests\Framework\Mock\FakeAccess; @@ -42,7 +43,7 @@ class WidgetsListTest extends IntegrationTestCase 'Dashboard_Dashboard' => 1, 'General_Actions' => 22, 'General_KpiMetric' => 1, - 'General_Visitors' => 33, + 'General_Visitors' => 32, 'SEO' => 1, 'Goals_Goals' => 3, 'Insights_WidgetCategory' => 2, @@ -51,6 +52,11 @@ class WidgetsListTest extends IntegrationTestCase 'About Matomo' => 11, 'Marketplace_Marketplace' => 3, ); + + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $numberOfWidgets['General_Visitors']++; + } + // number of main categories $this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory)); diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 3c4700b0e4..955e5a8196 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -229,6 +229,11 @@ class BackwardsCompatibility1XTest extends SystemTestCase 'VisitsSummary.getSumVisitsLengthPretty', ); + if (!Manager::getInstance()->isPluginActivated('CustomVariables')) { + // includes some columns that are not available when CustomVariables plugin is not available + $apiNotToCall[] = 'PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize'; + } + $apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately); $allReportsOptions = $defaultOptions; diff --git a/tests/PHPUnit/System/CsvExportTest.php b/tests/PHPUnit/System/CsvExportTest.php index 0f413692cf..54e23486b8 100644 --- a/tests/PHPUnit/System/CsvExportTest.php +++ b/tests/PHPUnit/System/CsvExportTest.php @@ -7,8 +7,8 @@ */ namespace Piwik\Tests\System; +use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents; use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * Test CSV export with Expanded rows, Translated labels, Different languages @@ -25,7 +25,7 @@ class CsvExportTest extends SystemTestCase $idSite = self::$fixture->idSite; $dateTime = self::$fixture->dateTime; - $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables'); + $apiToCall = array('VisitsSummary.get', 'Contents.getContentNames'); $enExtraParam = array('expanded' => 0, 'flat' => 1, 'include_aggregate_rows' => 0, 'translateColumnNames' => 1); @@ -78,7 +78,4 @@ class CsvExportTest extends SystemTestCase } } -CsvExportTest::$fixture = new TwoVisitsWithCustomVariables(); -CsvExportTest::$fixture->visitorId = null; -CsvExportTest::$fixture->useEscapedQuotes = false; -CsvExportTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file +CsvExportTest::$fixture = new TwoVisitsWithContents();
\ No newline at end of file diff --git a/tests/PHPUnit/System/FlattenReportsTest.php b/tests/PHPUnit/System/FlattenReportsTest.php index 312c32c424..0785639de1 100644 --- a/tests/PHPUnit/System/FlattenReportsTest.php +++ b/tests/PHPUnit/System/FlattenReportsTest.php @@ -9,6 +9,7 @@ namespace Piwik\Tests\System; use Piwik\EventDispatcher; use Piwik\Piwik; +use Piwik\Plugin\Manager; use Piwik\Plugins\Referrers\Reports\GetWebsites; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars; @@ -88,16 +89,20 @@ class FlattenReportsTest extends SystemTestCase )); // custom variables for multiple days - $return[] = array('CustomVariables.getCustomVariables', array( - 'idSite' => $idSite, - 'date' => $dateTime, - 'otherRequestParameters' => array( - 'date' => '2010-03-05,2010-03-08', - 'flat' => '1', - 'include_aggregate_rows' => '1', - 'expanded' => '0' - ) - )); + if (Manager::getInstance()->isPluginActivated('CustomVariables')) { + $return[] = array( + 'CustomVariables.getCustomVariables', array( + 'idSite' => $idSite, + 'date' => $dateTime, + 'otherRequestParameters' => array( + 'date' => '2010-03-05,2010-03-08', + 'flat' => '1', + 'include_aggregate_rows' => '1', + 'expanded' => '0' + ) + ) + ); + } // test expanded=1 w/ idSubtable=X $return[] = array('Actions.getPageUrls', array('idSite' => $idSite, diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php deleted file mode 100644 index 95576fa5bb..0000000000 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php +++ /dev/null @@ -1,74 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Tests\System; - -use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; - -/** - * Tests use of custom variable segments. - * - * @group Plugins - * @group TwoVisitsWithCustomVariablesSegmentContainsTest - */ -class TwoVisitsWithCustomVariablesSegmentContainsTest extends SystemTestCase -{ - public static $fixture = null; // initialized below class definition - - public static function getOutputPrefix() - { - return 'twoVisitsWithCustomVariables'; - } - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - $idSite = self::$fixture->idSite; - $dateTime = self::$fixture->dateTime; - - $return = array(); - - $api = array('Actions.getPageUrls', 'Actions.getPageTitles', 'VisitsSummary.get'); - $segmentsToTest = array( - // array( SegmentString , TestSuffix , Array of API to test) - array("pageTitle=@*_)%", '_SegmentPageTitleContainsStrangeCharacters', array('Actions.getPageTitles', 'VisitsSummary.get')), - array("pageUrl=@user/profile", '_SegmentPageUrlContains', $api), - array("pageTitle=@Profile pa", '_SegmentPageTitleContains', $api), - array("pageUrl!@user/profile", '_SegmentPageUrlExcludes', $api), - array("pageTitle!@Profile pa", '_SegmentPageTitleExcludes', $api), - // starts with - array('pageUrl=^example.org/home', '_SegmentPageUrlStartsWith', array('Actions.getPageUrls')), - array('pageTitle=^Profile pa', '_SegmentPageTitleStartsWith', array('Actions.getPageTitles')), - - // ends with - array('pageUrl=$er/profile', '_SegmentPageUrlEndsWith', array('Actions.getPageUrls')), - array('pageTitle=$page', '_SegmentPageTitleEndsWith', array('Actions.getPageTitles')), - ); - - foreach ($segmentsToTest as $segment) { - // Also test "Page URL / Page title CONTAINS string" feature - $return[] = array($segment[2], - array('idSite' => $idSite, 'date' => $dateTime, 'periods' => array('day'), - 'setDateLastN' => false, - 'segment' => $segment[0], - 'testSuffix' => $segment[1]) - ); - } - return $return; - } -} - -TwoVisitsWithCustomVariablesSegmentContainsTest::$fixture = new TwoVisitsWithCustomVariables(); -TwoVisitsWithCustomVariablesSegmentContainsTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php deleted file mode 100644 index ac3f43d1d2..0000000000 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Tests\System; - -use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; - -/** - * @group Plugins - * @group TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest - */ -class TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest extends SystemTestCase -{ - public static $fixture = null; // initialized below class definition - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables'); - - // Segment matching ALL - // + adding DOES NOT CONTAIN segment always matched, to test this particular operator - $resolution = self::$fixture->resolutionWidthToUse . 'x' . self::$fixture->resolutionHeightToUse; - $segment = 'resolution==' . $resolution . ';customVariableName1!@randomvalue does not exist'; - - return array( - array($apiToCall, array('idSite' => 'all', - 'date' => self::$fixture->dateTime, - 'periods' => array('day', 'week'), - 'setDateLastN' => true, - 'segment' => $segment)) - ); - } - - public static function getOutputPrefix() - { - return 'twoVisitsWithCustomVariables_segmentMatchALL_noGoalData'; - } -} - -TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest::$fixture = new TwoVisitsWithCustomVariables(); -TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php deleted file mode 100644 index 8ced3b1e20..0000000000 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php +++ /dev/null @@ -1,105 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Tests\System; - -use Piwik\Plugins\API\tests\System\AutoSuggestAPITest; -use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; -use Piwik\Tests\Framework\Fixture; - -/** - * testing a segment containing all supported fields - * - * @group Plugins - * @group TwoVisitsWithCustomVariablesSegmentMatchNONETest - */ -class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase -{ - public static $fixture = null; // initialized below class definition - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - if (!array_key_exists('segment', $params)) { - $params['segment'] = $this->getSegmentToTest(); // this method can access the DB, so we get it here instead of the data provider - } - - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - // we will test all segments from all plugins - $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables'); - - return array( - array($apiToCall, array('idSite' => 'all', - 'date' => self::$fixture->dateTime, - 'periods' => array('day', 'week'), - 'setDateLastN' => true)) - ); - } - - public function getSegmentToTest() - { - $segments = AutoSuggestAPITest::getSegmentsMetadata(); - - $minimumExpectedSegmentsCount = 55; // as of Piwik 1.12 - $this->assertGreaterThan($minimumExpectedSegmentsCount, count($segments)); - $segmentExpression = array(); - - $seenVisitorId = false; - foreach ($segments as $segment) { - $value = 'campaign'; - if ($segment == 'visitorId') { - $seenVisitorId = true; - $value = '34c31e04394bdc63'; - } - if ($segment == 'visitEcommerceStatus') { - $value = 'none'; - } - if ($segment == 'actionType') { - $value = 'pageviews'; - } - if ($segment == 'fingerprint') { - $value = 'abcdef1234567890'; //Needs to be a valid 16-char hex string - } - $matchNone = $segment . '!=' . $value; - - // deviceType != campaign matches ALL visits, but we want to match None - if ($segment == 'deviceType') { - $matchNone = $segment . '==car%20browser'; - } - - if ($segment == 'deviceBrand') { - $matchNone = $segment . '==Yarvik'; - } - - $segmentExpression[] = $matchNone; - } - - $segment = implode(";", $segmentExpression); - - // just checking that this segment was tested (as it has the only visible to admin flag) - $this->assertTrue($seenVisitorId); - $this->assertGreaterThan(100, strlen($segment)); - - return $segment; - } - - public static function getOutputPrefix() - { - return 'twoVisitsWithCustomVariables_segmentMatchNONE'; - } - -} - -TwoVisitsWithCustomVariablesSegmentMatchNONETest::$fixture = new TwoVisitsWithCustomVariables(); -TwoVisitsWithCustomVariablesSegmentMatchNONETest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php deleted file mode 100644 index a088d35af9..0000000000 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php +++ /dev/null @@ -1,169 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Tests\System; - -use Piwik\Archive\ArchivePurger; -use Piwik\Archive\Chunk; -use Piwik\Common; -use Piwik\Archive\ArchiveInvalidator; -use Piwik\Container\StaticContainer; -use Piwik\Date; -use Piwik\Db; -use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; - -/** - * Tests use of custom variable segments. - * - * @group Plugins - * @group TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest - */ -class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTestCase -{ - public static $fixture = null; // initialized below class definition - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public function getApiForTesting() - { - // Segment matching some - $segments = array('customVariableName1==VisitorType;customVariableValue1==LoggedIn', - 'customVariableName1==VisitorType;customVariableValue1=@LoggedI'); - - $apiToCall = array('Referrers.getKeywords', 'CustomVariables.getCustomVariables', 'VisitsSummary.get'); - - $periods = array('day', 'week'); - - // We run it twice just to check that running archiving twice for same input parameters doesn't create more records/overhead - $result = array(); - for ($i = 1; $i <= 2; $i++) { - foreach ($segments as $segment) { - $result[] = array( - $apiToCall, array('idSite' => 'all', - 'date' => self::$fixture->dateTime, - 'periods' => $periods, - 'setDateLastN' => true, - 'segment' => $segment) - ); - } - } - - return $result; - } - - /** - * @depends testApi - */ - public function testCheck() - { - // TODO: if we do this in archivewriter, we don't need this code - $archivePurger = StaticContainer::get(ArchivePurger::class); - $archivePurger->purgeInvalidatedArchivesFrom(Date::factory(self::$fixture->dateTime)); - $archivePurger->purgeInvalidatedArchivesFrom(Date::factory('2009-12-01')); - - // ---------------------------------------------- - // Implementation Checks - // ---------------------------------------------- - // Verify that, when a segment is specified, only the requested report is processed - // In this case, check that only the Custom Variables blobs have been processed - - $tests = array( - // 1) CHECK 'day' archive stored in January - // We expect 2 segments - // * (1 custom variable name + 2 ref metrics - // + 1 subtable chunk for the custom var values + 6 Referrers blob (2 of them subtables) - // ) - 'archive_blob_2010_01' => 20, - // This contains all 'last N' weeks & days, - // (6 metrics - // + 2 referrer metrics - // + 3 done flag ) - // * 2 segments - // for each "Last N" date that has data (just one date) - 'archive_numeric_2010_01' => 22, - - // 2) CHECK 'week' archive stored in December (week starts the month before) - // We expect 2 segments * (1 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 6 referrers blob (2 of them subtables)) - 'archive_blob_2009_12' => 20, - // 6 metrics, - // 2 Referrer metrics (Referrers_distinctSearchEngines/Referrers_distinctKeywords), - // 3 done flag (referrers, CustomVar, VisitsSummary), all for period = 2, day w/ visits is in new year, other days have no data - // X * 2 segments - 'archive_numeric_2009_12' => (6 + 2 + 3) * 2, - ); - foreach ($tests as $table => $expectedRows) { - $sql = "SELECT count(*) FROM " . Common::prefixTable($table); - $countBlobs = Db::get()->fetchOne($sql); - - if($expectedRows != $countBlobs) { - $output = Db::get()->fetchAll("SELECT * FROM " . Common::prefixTable($table) . " ORDER BY name, idarchive ASC"); - var_export('This is debug output from ' . __CLASS__ . ' in case of an error: '); - var_export($output); - } - $this->assertEquals($expectedRows, $countBlobs, "$table: %s"); - } - } - - /** - * Check that it merges all subtables into one blob entry - * - * @depends testApi - */ - public function test_checkArchiveRecords_shouldMergeSubtablesIntoOneRow() - { - $chunk = new Chunk(); - - $tests = array( - 'archive_blob_2010_01' => array( - $chunk->getRecordNameForTableId('CustomVariables_valueByName', 0) => 6, - $chunk->getRecordNameForTableId('Referrers_keywordBySearchEngine', 0) => 1, - $chunk->getRecordNameForTableId('Referrers_searchEngineByKeyword', 0) => 1 - ), - 'archive_blob_2009_12' => array( - $chunk->getRecordNameForTableId('CustomVariables_valueByName', 0) => 6, - $chunk->getRecordNameForTableId('Referrers_keywordBySearchEngine', 0) => 1, - $chunk->getRecordNameForTableId('Referrers_searchEngineByKeyword', 0) => 1, - ) - ); - $numTests = 0; - foreach ($tests as $table => $expectedSubtables) { - foreach ($expectedSubtables as $name => $expectedNumSubtables) { - $sql = "SELECT `value` FROM " . Common::prefixTable($table) . " WHERE `name` ='$name'"; - $blobs = Db::get()->fetchAll($sql); - - foreach ($blobs as $blob) { - $numTests++; - $blob = $blob['value']; - $blob = gzuncompress($blob); - $blob = unserialize($blob); - - $countSubtables = count($blob); - - $this->assertEquals($expectedNumSubtables, $countSubtables, "$name in $table expected to contain $expectedNumSubtables subtables, got $countSubtables"); - } - } - } - - // 6 _subtables entries + 6 _subtables entries for the segment - $this->assertEquals(12, $numTests, "$numTests were executed but expected 12"); - } - - public static function getOutputPrefix() - { - return 'twoVisitsWithCustomVariables_segmentMatchVisitorType'; - } -} - -TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest::$fixture = new TwoVisitsWithCustomVariables(); -TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php deleted file mode 100644 index 9f0e1c281a..0000000000 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php +++ /dev/null @@ -1,92 +0,0 @@ -<?php -/** - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -namespace Piwik\Tests\System; - -use Piwik\Tests\Framework\TestCase\SystemTestCase; -use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; - -/** - * Tests w/ two visits & custom variables. - * - * @group TwoVisitsWithCustomVariablesTest - * @group Plugins - */ -class TwoVisitsWithCustomVariablesTest extends SystemTestCase -{ - /** - * @var TwoVisitsWithCustomVariables - */ - public static $fixture = null; // initialized below class definition - - public function getApiForTesting() - { - $idSite = self::$fixture->idSite; - $dateTime = self::$fixture->dateTime; - - $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables'); - - $return = array( - array($apiToCall, array('idSite' => 'all', - 'date' => $dateTime, - 'periods' => array('day', 'week'), - 'setDateLastN' => true)), - - // test getProcessedReport w/ custom variables subtable - array('API.getProcessedReport', array('idSite' => $idSite, - 'date' => $dateTime, - 'periods' => 'day', - 'apiModule' => 'CustomVariables', - 'apiAction' => 'getCustomVariablesValuesFromNameId', - 'supertableApi' => 'CustomVariables.getCustomVariables', - 'testSuffix' => '__subtable')), - - // test w/ custom variable segments - array('VisitsSummary.get', array( - 'idSite' => self::$fixture->idSite, - 'date' => self::$fixture->dateTime, - 'periods' => array('day'), - 'testSuffix' => '_segmentCustomVarName', - 'segment' => 'customVariablePageName=@SET WITH', - )), - - array('VisitsSummary.get', array( - 'idSite' => self::$fixture->idSite, - 'date' => self::$fixture->dateTime, - 'periods' => array('day'), - 'testSuffix' => '_segmentCustomVarValue', - 'segment' => 'customVariableValue=@LoggedIn', - )), - - array('VisitsSummary.get', array( - 'idSite' => self::$fixture->idSite, - 'date' => self::$fixture->dateTime, - 'periods' => array('day'), - 'testSuffix' => '_segmentAll', - 'segment' => 'customVariableName=@Othercustom,customVariablePageValue=@abcdefghi', - )), - - ); - - return $return; - } - - /** - * @dataProvider getApiForTesting - */ - public function testApi($api, $params) - { - $this->runApiTests($api, $params); - } - - public static function getOutputPrefix() - { - return 'twoVisitsWithCustomVariables'; - } -} - -TwoVisitsWithCustomVariablesTest::$fixture = new TwoVisitsWithCustomVariables();
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index b0bd64ead9..4f29dfaf63 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -107,12 +107,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>6060</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -121,6 +115,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -229,12 +229,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>6060</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -251,6 +245,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -359,12 +359,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -373,6 +367,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -481,12 +481,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -503,6 +497,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -719,12 +719,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>4320</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -733,6 +727,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -949,12 +949,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>4320</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -971,6 +965,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1079,12 +1079,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>8940</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1093,6 +1087,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1201,12 +1201,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>9000</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1223,6 +1217,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1250,13 +1250,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1277,13 +1277,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play25%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1304,13 +1304,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play50%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1331,13 +1331,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play75%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1358,13 +1358,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "playEnd"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1386,13 +1386,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1414,13 +1414,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -1649,12 +1649,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1663,6 +1657,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1726,13 +1726,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1788,13 +1788,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play25%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1851,13 +1851,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play50%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1914,13 +1914,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play75%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1941,13 +1941,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "playEnd"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1969,13 +1969,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -1997,13 +1997,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2232,12 +2232,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2254,5 +2248,11 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 6a382015dc..6bfdc44e38 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -107,12 +107,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>6060</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -121,6 +115,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -229,12 +229,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -243,6 +237,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -459,12 +459,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>4320</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -473,6 +467,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -581,12 +581,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>8940</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -595,6 +589,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -622,13 +622,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -649,13 +649,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play25%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -676,13 +676,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play50%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -703,13 +703,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "play75%"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -730,13 +730,13 @@ <title>Event</title> <subtitle>Category: "Music', Action: "playEnd"</subtitle> <eventName>La fiancée de l'eau</eventName> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -758,13 +758,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>event</type> @@ -786,13 +786,13 @@ <subtitle>Category: "Music', Action: "rating"</subtitle> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Page Scope Custom var</customVariablePageName1> <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -1021,12 +1021,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1035,6 +1029,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1143,12 +1143,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>6060</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1157,6 +1151,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1265,12 +1265,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>6060</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1287,6 +1281,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1395,12 +1395,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1409,6 +1403,12 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1517,12 +1517,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1539,6 +1533,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1755,12 +1755,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>4320</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie</plugins> <pluginsIcons> @@ -1769,5 +1763,11 @@ <pluginName>cookie</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 8b06eb1295..95bda92aed 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>50</nb_actions> + <nb_actions>51</nb_actions> <slots> <row> <scope>page</scope> @@ -17,9 +17,9 @@ <subtable> <row> <label>200</label> - <nb_visits>39</nb_visits> - <nb_actions>41</nb_actions> - <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors> + <nb_visits>40</nb_visits> + <nb_actions>42</nb_actions> + <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml index 28ec275d90..939ffb7fd3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml @@ -72,7 +72,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>76</nb_actions> + <nb_actions>77</nb_actions> </row> <row> <name>Generation Time</name> @@ -99,7 +99,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>76</nb_actions> + <nb_actions>77</nb_actions> </row> </usages> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 352779c60e..3a16401686 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -24,13 +24,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -129,12 +129,6 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1366x768</resolution> <plugins>cookie, flash, java, pdf</plugins> <pluginsIcons> @@ -155,6 +149,12 @@ <pluginName>pdf</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -180,13 +180,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -218,13 +218,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -308,15 +308,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>1536x864</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Domain landed</customVariableName1> <customVariableValue1>piwik.org</customVariableValue1> </row> </customVariables> - <resolution>1536x864</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -340,13 +340,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -445,16 +445,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - <row> - <customVariableName2>Demo language</customVariableName2> - <customVariableValue2>English</customVariableValue2> - </row> - </customVariables> <resolution>1920x1200</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight</plugins> <pluginsIcons> @@ -483,6 +473,16 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + <row> + <customVariableName2>Demo language</customVariableName2> + <customVariableValue2>English</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -508,13 +508,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -546,13 +546,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -636,12 +636,6 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2880x1800</resolution> <plugins>cookie, flash, java, pdf, quicktime</plugins> <pluginsIcons> @@ -666,6 +660,12 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -689,13 +689,13 @@ <title>Outlink</title> <subtitle>http://demo.piwik.org/</subtitle> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -779,12 +779,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86406</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -809,6 +803,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -832,13 +832,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -937,12 +937,6 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1360x768</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> @@ -975,6 +969,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -998,13 +998,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1103,12 +1103,6 @@ <visitLocalHour>9</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2560x1440</resolution> <plugins>cookie, java, pdf, quicktime</plugins> <pluginsIcons> @@ -1129,6 +1123,12 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1154,13 +1154,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1259,12 +1259,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>360x640</resolution> <plugins>cookie, flash</plugins> <pluginsIcons> @@ -1277,6 +1271,12 @@ <pluginName>flash</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1302,13 +1302,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1407,12 +1407,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2560x1440</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> @@ -1445,6 +1439,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1470,13 +1470,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>403</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1510,13 +1510,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>download</type> @@ -1533,13 +1533,13 @@ <title>Download</title> <subtitle>http://builds.piwik.org/latest.zip</subtitle> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -1623,12 +1623,6 @@ <visitLocalHour>4</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1645,6 +1639,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1670,13 +1670,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1775,12 +1775,6 @@ <visitLocalHour>2</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1366x768</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -1805,6 +1799,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1830,13 +1830,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1935,12 +1935,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -1965,6 +1959,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1990,13 +1990,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2030,13 +2030,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2055,13 +2055,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2080,13 +2080,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2105,13 +2105,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2130,13 +2130,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2155,13 +2155,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2180,13 +2180,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2205,13 +2205,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2228,13 +2228,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -2318,11 +2318,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2346,13 +2346,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>182 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>182 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2451,11 +2451,11 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2479,13 +2479,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2584,11 +2584,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2614,13 +2614,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>355 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>302</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>355 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2652,13 +2652,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>5.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>5.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -2742,11 +2742,11 @@ <visitLocalHour>11</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -2772,6 +2772,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2786,7 +2787,6 @@ <customVariablePageValue3>404</customVariablePageValue3> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -2805,13 +2805,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -2843,6 +2843,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2857,7 +2858,6 @@ <customVariablePageValue3>200</customVariablePageValue3> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -2941,15 +2941,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>1800</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>User Name</customVariableName1> <customVariableValue1>user2</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -2975,13 +2975,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3013,6 +3013,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -3027,7 +3028,6 @@ <customVariablePageValue3>200</customVariablePageValue3> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -3111,15 +3111,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>User Name</customVariableName1> <customVariableValue1>user1</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -3145,13 +3145,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3183,6 +3183,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -3197,7 +3198,6 @@ <customVariablePageValue3>301</customVariablePageValue3> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -3281,15 +3281,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>User Name</customVariableName1> <customVariableValue1>user1</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -3313,13 +3313,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3418,11 +3418,11 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3451,21 +3451,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName3>_pks</customVariablePageName3> - <customVariablePageValue3>SKU2</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>_pkn</customVariablePageName4> - <customVariablePageValue4>PRODUCT name</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3564,12 +3556,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -3586,6 +3572,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3609,13 +3601,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3714,12 +3706,6 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>Forum status</customVariableName3> - <customVariableValue3>Anonymous</customVariableValue3> - </row> - </customVariables> <resolution>1280x800</resolution> <plugins>cookie, flash, java, pdf, windowsmedia</plugins> <pluginsIcons> @@ -3744,6 +3730,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3767,13 +3759,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>915 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>915 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -3872,11 +3864,11 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -3900,13 +3892,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>267 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>267 B</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4005,11 +3997,11 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4035,13 +4027,13 @@ <title>Event</title> <subtitle>Category: "cloudfront_rtmp', Action: "play"</subtitle> <eventName>myvideo</eventName> + <bandwidth_pretty>3.8 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.8 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -4125,11 +4117,11 @@ <visitLocalHour>23</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4154,13 +4146,13 @@ <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> <title>Event</title> <subtitle>Category: "cloudfront_rtmp', Action: "connect"</subtitle> + <bandwidth_pretty>2 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>2 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -4244,11 +4236,11 @@ <visitLocalHour>23</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -4272,13 +4264,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4377,15 +4369,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -4409,13 +4401,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4514,15 +4506,15 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -4548,13 +4540,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4586,13 +4578,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>1</goalConversions> @@ -4676,15 +4668,15 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -4710,13 +4702,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.js</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -4735,13 +4727,13 @@ <title>Download</title> <subtitle>http://piwik.net/thing.css</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>download</type> @@ -4758,13 +4750,13 @@ <title>Download</title> <subtitle>http://piwik.net/other.png</subtitle> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -4848,15 +4840,15 @@ <visitLocalHour>18</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -4880,13 +4872,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -4985,15 +4977,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Bot</customVariableName1> <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -5017,13 +5009,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5122,15 +5114,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -5154,13 +5146,13 @@ <title>Download</title> <subtitle>http://piwik.net/19.pdf</subtitle> + <bandwidth_pretty>4.1 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>4.1 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -5244,15 +5236,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -5276,13 +5268,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5381,15 +5373,15 @@ <visitLocalHour>16</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -5413,13 +5405,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5518,15 +5510,15 @@ <visitLocalHour>16</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> <customVariableValue1>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</customVariableValue1> </row> </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>1</idSite> @@ -5550,13 +5542,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5655,11 +5647,11 @@ <visitLocalHour>15</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5683,13 +5675,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5788,11 +5780,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5816,13 +5808,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -5921,11 +5913,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -5949,13 +5941,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6054,11 +6046,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6082,13 +6074,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6187,11 +6179,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6215,13 +6207,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6320,11 +6312,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6348,13 +6340,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6453,11 +6445,11 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6481,13 +6473,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6586,11 +6578,11 @@ <visitLocalHour>18</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6614,13 +6606,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6719,11 +6711,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6747,13 +6739,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6852,11 +6844,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -6880,13 +6872,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -6985,11 +6977,11 @@ <visitLocalHour>21</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7013,13 +7005,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7118,11 +7110,11 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7146,13 +7138,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7251,11 +7243,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7279,13 +7271,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7384,11 +7376,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7412,13 +7404,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7517,11 +7509,11 @@ <visitLocalHour>13</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7545,13 +7537,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7650,11 +7642,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7678,13 +7670,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7783,11 +7775,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7811,13 +7803,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -7916,11 +7908,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -7944,13 +7936,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -8049,11 +8041,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8077,13 +8069,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -8182,11 +8174,11 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -8210,13 +8202,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>3.5 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>3.5 K</bandwidth_pretty> </row> <row> <type>goal</type> @@ -8315,10 +8307,10 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index e820a70fde..920abd9f87 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -24,13 +24,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -114,12 +114,6 @@ <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1366x768</resolution> <plugins>cookie, flash, java, pdf</plugins> <pluginsIcons> @@ -140,6 +134,12 @@ <pluginName>pdf</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -165,13 +165,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>action</type> @@ -188,13 +188,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -278,15 +278,15 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> + <resolution>1536x864</resolution> + <plugins /> + <pluginsIcons /> <customVariables> <row> <customVariableName1>Domain landed</customVariableName1> <customVariableValue1>piwik.org</customVariableValue1> </row> </customVariables> - <resolution>1536x864</resolution> - <plugins /> - <pluginsIcons /> </row> <row> <idSite>3</idSite> @@ -310,13 +310,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -400,16 +400,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - <row> - <customVariableName2>Demo language</customVariableName2> - <customVariableValue2>English</customVariableValue2> - </row> - </customVariables> <resolution>1920x1200</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight</plugins> <pluginsIcons> @@ -438,6 +428,16 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + <row> + <customVariableName2>Demo language</customVariableName2> + <customVariableValue2>English</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -463,13 +463,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>action</type> @@ -486,13 +486,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -576,12 +576,6 @@ <visitLocalHour>19</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2880x1800</resolution> <plugins>cookie, flash, java, pdf, quicktime</plugins> <pluginsIcons> @@ -606,6 +600,12 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -629,13 +629,13 @@ <title>Outlink</title> <subtitle>http://demo.piwik.org/</subtitle> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -719,12 +719,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>1</daysSinceLastVisit> <secondsSinceLastVisit>86406</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -749,6 +743,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -772,13 +772,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -862,12 +862,6 @@ <visitLocalHour>17</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1360x768</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> @@ -900,6 +894,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -923,13 +923,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1013,12 +1013,6 @@ <visitLocalHour>9</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2560x1440</resolution> <plugins>cookie, java, pdf, quicktime</plugins> <pluginsIcons> @@ -1039,6 +1033,12 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1064,13 +1064,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1154,12 +1154,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>360x640</resolution> <plugins>cookie, flash</plugins> <pluginsIcons> @@ -1172,6 +1166,12 @@ <pluginName>flash</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1197,13 +1197,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1287,12 +1287,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>2560x1440</resolution> <plugins>cookie, flash, java, pdf, quicktime, silverlight, windowsmedia</plugins> <pluginsIcons> @@ -1325,6 +1319,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1350,13 +1350,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>403</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>action</type> @@ -1375,13 +1375,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>download</type> @@ -1398,13 +1398,13 @@ <title>Download</title> <subtitle>http://builds.piwik.org/latest.zip</subtitle> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1488,12 +1488,6 @@ <visitLocalHour>4</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1510,6 +1504,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1535,13 +1535,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1625,12 +1625,6 @@ <visitLocalHour>2</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1366x768</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -1655,6 +1649,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1680,13 +1680,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1770,12 +1770,6 @@ <visitLocalHour>1</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <resolution>1920x1080</resolution> <plugins>cookie, flash, java, pdf, silverlight</plugins> <pluginsIcons> @@ -1800,6 +1794,12 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1828,21 +1828,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName3>_pks</customVariablePageName3> - <customVariablePageValue3>SKU2</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>_pkn</customVariablePageName4> - <customVariablePageValue4>PRODUCT name</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -1926,12 +1918,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>10800</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1948,6 +1934,12 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -1971,13 +1963,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -2061,12 +2053,6 @@ <visitLocalHour>8</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName3>Forum status</customVariableName3> - <customVariableValue3>Anonymous</customVariableValue3> - </row> - </customVariables> <resolution>1280x800</resolution> <plugins>cookie, flash, java, pdf, windowsmedia</plugins> <pluginsIcons> @@ -2091,6 +2077,12 @@ <pluginName>windowsmedia</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> </row> <row> <idSite>3</idSite> @@ -2119,13 +2111,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>action</type> @@ -2146,17 +2138,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName3>_pks</customVariablePageName3> - <customVariablePageValue3>SKU VERY nice indeed</customVariablePageValue3> - </row> - <row> - <customVariablePageName4>_pkn</customVariablePageName4> - <customVariablePageValue4>PRODUCT name</customVariablePageValue4> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> <row> <type>action</type> @@ -2176,13 +2164,13 @@ <productViewCategories> <row>Electronics & Cameras</row> </productViewCategories> + <bandwidth_pretty>43 B</bandwidth_pretty> <customVariables> <row> - <customVariablePageName5>_pkc</customVariablePageName5> - <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>43 B</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -2266,12 +2254,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -2288,5 +2270,11 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 2f15b5f05f..9b8f622849 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -217,16 +217,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -243,6 +233,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -266,6 +266,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -276,7 +277,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -375,16 +375,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -401,6 +391,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -598,16 +598,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -624,5 +614,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index c55c9c41a5..551e35b58b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -22,6 +22,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -32,7 +33,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -131,16 +131,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -157,6 +147,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -375,16 +375,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -401,6 +391,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -424,6 +424,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -434,7 +435,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -533,16 +533,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -559,5 +549,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 460aef01bd..fd960a62e0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -121,8 +121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -139,6 +137,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -357,16 +357,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -383,6 +373,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -406,6 +406,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -416,7 +417,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -515,16 +515,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -541,6 +531,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -738,16 +738,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -764,6 +754,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -787,6 +787,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -797,7 +798,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -896,16 +896,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -922,6 +912,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1140,16 +1140,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1166,6 +1156,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1189,6 +1189,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1199,7 +1200,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1298,16 +1298,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1324,5 +1314,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 460aef01bd..fd960a62e0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -121,8 +121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -139,6 +137,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -357,16 +357,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -383,6 +373,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -406,6 +406,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -416,7 +417,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -515,16 +515,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -541,6 +531,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -738,16 +738,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -764,6 +754,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -787,6 +787,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -797,7 +798,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -896,16 +896,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -922,6 +912,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1140,16 +1140,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1166,6 +1156,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1189,6 +1189,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1199,7 +1200,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1298,16 +1298,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1324,5 +1314,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 6c6eb7d763..1eb0c7ecb7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -121,8 +121,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -139,6 +137,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -357,16 +357,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -383,6 +373,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -406,6 +406,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -416,7 +417,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -515,16 +515,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -541,6 +531,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -738,16 +738,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -764,6 +754,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -787,6 +787,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -797,7 +798,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -896,16 +896,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -922,6 +912,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1140,16 +1140,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1166,6 +1156,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1189,6 +1189,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1199,7 +1200,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1298,16 +1298,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1324,6 +1314,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1521,16 +1521,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1547,6 +1537,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1570,6 +1570,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2> @@ -1580,7 +1581,6 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>goal</type> @@ -1679,16 +1679,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>82800</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1705,6 +1695,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </row> <row> <idSite>1</idSite> @@ -1923,16 +1923,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <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> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1949,5 +1939,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <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> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 12228c949f..ebb5422327 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -123,8 +123,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -141,6 +139,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -404,8 +404,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -422,5 +420,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index d1cfb1a0b0..c95debc2bb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -106,8 +106,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -124,6 +122,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -248,8 +248,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -266,5 +264,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 0605ef2c40..0856f79866 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -21,13 +21,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365328800</timestamp> + <bandwidth_pretty>9.4 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>9.4 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -111,11 +111,11 @@ <visitLocalHour>10</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -138,13 +138,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365246000</timestamp> + <bandwidth_pretty>9.4 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>9.4 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -228,11 +228,11 @@ <visitLocalHour>11</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -255,13 +255,13 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365163200</timestamp> + <bandwidth_pretty>9.4 K</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> - <bandwidth_pretty>9.4 K</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -345,10 +345,10 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>unknown</resolution> <plugins /> <pluginsIcons /> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml index e4aef7f968..94e23329a9 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml @@ -106,8 +106,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>720</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -124,6 +122,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -250,8 +250,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>360</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -268,6 +266,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -375,8 +375,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>2880</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -393,6 +391,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -500,8 +500,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>720</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -518,6 +516,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -644,8 +644,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>7200</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -662,6 +660,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -769,8 +769,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -787,6 +785,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -894,8 +894,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -912,6 +910,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1019,8 +1019,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1037,6 +1035,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1144,8 +1144,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1162,6 +1160,8 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> <row> <idSite>1</idSite> @@ -1269,8 +1269,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -1287,5 +1285,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml index c6129e1ad7..2ff318219f 100644 --- a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml @@ -130,8 +130,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - </customVariables> <resolution>1024x768</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -148,5 +146,7 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 111dd119d9..ae1d9a518e 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1199,7 +1199,7 @@ </widgets> </row> <row> - <uniqueId>General_Visitors.CustomVariables_CustomVariables</uniqueId> + <uniqueId>General_Visitors.UserId_UserReportTitle</uniqueId> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -1207,21 +1207,21 @@ <icon>icon-reporting-visitors</icon> </category> <subcategory> - <id>CustomVariables_CustomVariables</id> - <name>Custom Variables</name> - <order>45</order> + <id>UserId_UserReportTitle</id> + <name>User IDs</name> + <order>40</order> </subcategory> <widgets> <row> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariables</action> - <order>110</order> + <name>User IDs</name> + <module>UserId</module> + <action>getUsers</action> + <order>109</order> <parameters> - <module>CustomVariables</module> - <action>getCustomVariables</action> + <module>UserId</module> + <action>getUsers</action> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariables</uniqueId> + <uniqueId>widgetUserIdgetUsers</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -1229,7 +1229,7 @@ </widgets> </row> <row> - <uniqueId>General_Visitors.UserId_UserReportTitle</uniqueId> + <uniqueId>General_Visitors.CustomVariables_CustomVariables</uniqueId> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -1237,21 +1237,21 @@ <icon>icon-reporting-visitors</icon> </category> <subcategory> - <id>UserId_UserReportTitle</id> - <name>User IDs</name> - <order>40</order> + <id>CustomVariables_CustomVariables</id> + <name>Custom Variables</name> + <order>45</order> </subcategory> <widgets> <row> - <name>User IDs</name> - <module>UserId</module> - <action>getUsers</action> - <order>109</order> + <name>Custom Variables</name> + <module>CustomVariables</module> + <action>getCustomVariables</action> + <order>110</order> <parameters> - <module>UserId</module> - <action>getUsers</action> + <module>CustomVariables</module> + <action>getCustomVariables</action> </parameters> - <uniqueId>widgetUserIdgetUsers</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariables</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 21dcfcbca8..e02e824eed 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__Contents.getContentNames_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__Contents.getContentNames_day.csv Binary files differnew file mode 100644 index 0000000000..9be6a321ae --- /dev/null +++ b/tests/PHPUnit/System/expected/test_csvExport_xp0__Contents.getContentNames_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv Binary files differdeleted file mode 100644 index 92a21d9706..0000000000 --- a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv +++ /dev/null diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv Binary files differindex 26adb45055..d97072ddc6 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__Contents.getContentNames_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__Contents.getContentNames_day.csv Binary files differnew file mode 100644 index 0000000000..a6afcbcaad --- /dev/null +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__Contents.getContentNames_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv Binary files differdeleted file mode 100644 index 36f5e57e75..0000000000 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv +++ /dev/null diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv Binary files differindex 58e88ae47a..0822d2e07a 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__Contents.getContentNames_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__Contents.getContentNames_day.csv Binary files differnew file mode 100644 index 0000000000..0519f01fcc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__Contents.getContentNames_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differdeleted file mode 100644 index 0a5dcbe230..0000000000 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ /dev/null diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv Binary files differindex 097ee448f7..702d365ca6 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml index c18d667592..d3e9551f4c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml @@ -80,16 +80,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -106,5 +96,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 01b8d3f0c5..bf72456eda 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -97,16 +97,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -123,6 +113,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -236,16 +236,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -262,6 +252,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -336,6 +336,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName4>Status user</customVariablePageName4> @@ -346,7 +347,6 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -363,6 +363,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Language</customVariablePageName1> @@ -377,7 +378,6 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>2</goalConversions> @@ -452,20 +452,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedIn</customVariableValue1> - </row> - <row> - <customVariableName2>SET WITH EMPTY VALUE</customVariableName2> - <customVariableValue2 /> - </row> - <row> - <customVariableName3>Value will be VERY long and truncated</customVariableName3> - <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -482,5 +468,19 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedIn</customVariableValue1> + </row> + <row> + <customVariableName2>SET WITH EMPTY VALUE</customVariableName2> + <customVariableValue2 /> + </row> + <row> + <customVariableName3>Value will be VERY long and truncated</customVariableName3> + <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 63f6bc21c4..af94c0011d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -131,16 +131,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -157,6 +147,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -279,16 +279,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -305,6 +295,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> </lastVisits> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml index c18d667592..d3e9551f4c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml @@ -80,16 +80,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -106,5 +96,15 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 01b8d3f0c5..bf72456eda 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -97,16 +97,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -123,6 +113,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -236,16 +236,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -262,6 +252,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -336,6 +336,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName4>Status user</customVariablePageName4> @@ -346,7 +347,6 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> <type>action</type> @@ -363,6 +363,7 @@ <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + <bandwidth_pretty>0 M</bandwidth_pretty> <customVariables> <row> <customVariablePageName1>Language</customVariablePageName1> @@ -377,7 +378,6 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> - <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>2</goalConversions> @@ -452,20 +452,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedIn</customVariableValue1> - </row> - <row> - <customVariableName2>SET WITH EMPTY VALUE</customVariableName2> - <customVariableValue2 /> - </row> - <row> - <customVariableName3>Value will be VERY long and truncated</customVariableName3> - <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -482,5 +468,19 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedIn</customVariableValue1> + </row> + <row> + <customVariableName2>SET WITH EMPTY VALUE</customVariableName2> + <customVariableValue2 /> + </row> + <row> + <customVariableName3>Value will be VERY long and truncated</customVariableName3> + <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3> + </row> + </customVariables> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 63f6bc21c4..af94c0011d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -131,16 +131,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>3600</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -157,6 +147,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> <row> <idSite>1</idSite> @@ -279,16 +279,6 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <secondsSinceLastVisit>0</secondsSinceLastVisit> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <resolution>1111x222</resolution> <plugins>cookie, flash, java</plugins> <pluginsIcons> @@ -305,6 +295,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> </row> </lastVisits> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml deleted file mode 100644 index f06aa00144..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml deleted file mode 100644 index 9cdfb2d5b7..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>364</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> - <avg_time_on_site>364</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml deleted file mode 100644 index f06aa00144..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml deleted file mode 100644 index 465557e8de..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml deleted file mode 100644 index 9cdfb2d5b7..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>364</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> - <avg_time_on_site>364</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleEndsWith__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleEndsWith__Actions.getPageTitles_day.xml deleted file mode 100644 index 5fbd10aa6b..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleEndsWith__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>50%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml deleted file mode 100644 index 5fbd10aa6b..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>50%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml deleted file mode 100644 index de6f2bc956..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> - <entry_sum_visit_length>725</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml deleted file mode 100644 index 06b9efca77..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>2</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>725</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>363</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleStartsWith__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleStartsWith__Actions.getPageTitles_day.xml deleted file mode 100644 index f06aa00144..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleStartsWith__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml deleted file mode 100644 index f06aa00144..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml deleted file mode 100644 index 465557e8de..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml deleted file mode 100644 index 9cdfb2d5b7..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>364</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> - <avg_time_on_site>364</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlEndsWith__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlEndsWith__Actions.getPageUrls_day.xml deleted file mode 100644 index 465557e8de..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlEndsWith__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>360</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml deleted file mode 100644 index 5fbd10aa6b..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label> Homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> - <entry_sum_visit_length>364</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>50%</exit_rate> - <segment>pageTitle==Homepage</segment> - </row> - <row> - <label> Profile page</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <segment>pageTitle==Profile%2Bpage</segment> - </row> - <row> - <label> Profile page for user *_)%</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageTitle==Profile%2Bpage%2Bfor%2Buser%2B%252A_%2529%2525</segment> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml deleted file mode 100644 index de6f2bc956..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> - <entry_sum_visit_length>725</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml deleted file mode 100644 index 06b9efca77..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>2</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>725</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>363</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlStartsWith__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlStartsWith__Actions.getPageUrls_day.xml deleted file mode 100644 index de6f2bc956..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlStartsWith__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/homepage</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>360</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> - <entry_sum_visit_length>725</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>180</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> - <url>http://example.org/homepage</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fhomepage</segment> - </row> - <row> - <label>user</label> - <nb_visits>1</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_page_load_time>0</avg_page_load_time> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fuser</segment> - <subtable> - <row> - <label>/profile</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <url>http://example.org/user/profile</url> - <segment>pageUrl==http%253A%252F%252Fexample.org%252Fuser%252Fprofile</segment> - </row> - </subtable> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index ebe6828cf0..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,347 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <row> - <label>VisitorType</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>722</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>3</nb_conversions> - <revenue>1000</revenue> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <row> - <label>LoggedOut</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>1000</revenue> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>var1</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==var1</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>var2</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==var2</segment> - <subtable> - <row> - <label>'looking at "\profile page"'</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>var3</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==var3</segment> - <subtable> - <row> - <label>\looking at "\profile page"\</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml deleted file mode 100644 index cc5f787ae8..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ /dev/null @@ -1,363 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <row> - <label>VisitorType</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>722</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>3</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>LoggedOut</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>4</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>var1</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==var1</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>var2</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==var2</segment> - <subtable> - <row> - <label>'looking at "\profile page"'</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>var3</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==var3</segment> - <subtable> - <row> - <label>\looking at "\profile page"\</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml deleted file mode 100644 index ab7f9f9a18..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>722</sum_visit_length> - <max_actions>4</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>241</avg_time_on_site> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml deleted file mode 100644 index cf97edbc9b..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>722</sum_visit_length> - <max_actions>4</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>241</avg_time_on_site> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml deleted file mode 100644 index 210611e0da..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <website>Piwik test</website> - <prettyDate>Sunday, January 3, 2010</prettyDate> - <metadata> - <category>Visitors</category> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariablesValuesFromNameId</action> - <dimension>Custom Variable value</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> - <onlineGuideUrl>https://matomo.org/docs/custom-variables/</onlineGuideUrl> - <isSubtableReport>1</isSubtableReport> - <metrics> - <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 they visit a page more than 30 minutes after their 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 they visit 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> - <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> - <avg_time_on_site>The average duration of a visit.</avg_time_on_site> - <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> - <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate> - </metricsDocumentation> - <processedMetrics> - <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> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2010-01-03&idSubtable=1</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariablesValuesFromNameId&period=day&date=2009-12-05,2010-01-03&idSubtable=1</imageGraphEvolutionUrl> - <uniqueId>CustomVariables_getCustomVariablesValuesFromNameId</uniqueId> - </metadata> - <columns> - <label>Custom Variable value</label> - <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> - <conversion_rate>Conversion Rate</conversion_rate> - </columns> - <reportData> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <conversion_rate>100%</conversion_rate> - <nb_actions_per_visit>4</nb_actions_per_visit> - <avg_time_on_site>00:06:01</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - </row> - <row> - <label>LoggedOut</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <conversion_rate>50%</conversion_rate> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>00:03:01</avg_time_on_site> - <bounce_rate>100%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - </row> - </reportData> - <reportMetadata /> - <reportTotal> - <nb_visits>7</nb_visits> - <nb_actions>24</nb_actions> - <nb_users>0</nb_users> - <max_actions>13</max_actions> - <sum_visit_length>1805</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <goals> - <row idgoal="1"> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>2000</revenue> - </row> - <row idgoal="2"> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>6</nb_conversions> - <revenue>2000</revenue> - <nb_actions_per_visit>11</nb_actions_per_visit> - </reportTotal> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentAll__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentAll__VisitsSummary.get_day.xml deleted file mode 100644 index 7621ab17ca..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentAll__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>361</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>181</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml deleted file mode 100644 index 15cb2d02f0..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>361</sum_visit_length> - <max_actions>4</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>4</nb_actions_per_visit> - <avg_time_on_site>361</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml deleted file mode 100644 index 15cb2d02f0..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>4</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>361</sum_visit_length> - <max_actions>4</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>4</nb_actions_per_visit> - <avg_time_on_site>361</avg_time_on_site> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index 43a0155666..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,293 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <row> - <label>VisitorType</label> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>725</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>3</nb_conversions> - <revenue>1000</revenue> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <row> - <label>LoggedOut</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>1000</revenue> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml deleted file mode 100644 index c5f437758b..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <row> - <label>VisitorType</label> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>725</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>3</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>LoggedOut</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>361</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>1000</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>1000</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__Goals.get_week.xml deleted file mode 100644 index a3a013c18d..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__Goals.get_week.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="From 2009-12-28 to 2010-01-03"> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - <conversion_rate>66.67%</conversion_rate> - <nb_conversions_new_visit>3</nb_conversions_new_visit> - <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> - <revenue_new_visit>1000</revenue_new_visit> - <conversion_rate_new_visit>66.67%</conversion_rate_new_visit> - </result> - <result date="From 2010-01-04 to 2010-01-10" /> - <result date="From 2010-01-11 to 2010-01-17" /> - <result date="From 2010-01-18 to 2010-01-24" /> - <result date="From 2010-01-25 to 2010-01-31" /> - <result date="From 2010-02-01 to 2010-02-07" /> - <result date="From 2010-02-08 to 2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml deleted file mode 100644 index 283758c4ec..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>725</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>242</avg_time_on_site> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml deleted file mode 100644 index cc445ea7dc..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>2</bounce_count> - <sum_visit_length>725</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>67%</bounce_rate> - <nb_actions_per_visit>1.7</nb_actions_per_visit> - <avg_time_on_site>242</avg_time_on_site> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData_withLogLinkVisitActionSegment__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData_withLogLinkVisitActionSegment__Goals.get_day.xml deleted file mode 100644 index 580ead80ab..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData_withLogLinkVisitActionSegment__Goals.get_day.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>1000</revenue> - <conversion_rate>100%</conversion_rate> - <nb_conversions_new_visit>3</nb_conversions_new_visit> - <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> - <revenue_new_visit>1000</revenue_new_visit> - <conversion_rate_new_visit>100%</conversion_rate_new_visit> - <nb_conversions_returning_visit>0</nb_conversions_returning_visit> - <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> - <revenue_returning_visit>0</revenue_returning_visit> - <conversion_rate_returning_visit>0%</conversion_rate_returning_visit> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index b9dfec843f..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03" /> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml deleted file mode 100644 index bcb4195949..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03" /> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml deleted file mode 100644 index b9dfec843f..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03" /> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml deleted file mode 100644 index bcb4195949..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03" /> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index 5647cd7b11..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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>VisitorType</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>0</revenue> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <row> - <label>LoggedOut</label> - <goals> - <row idgoal='2'> - <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> - <nb_visits>0</nb_visits> - </row> - </subtable> - </row> - <row> - <label>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml deleted file mode 100644 index 2c4c858a0f..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml +++ /dev/null @@ -1,245 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <row> - <label>SET WITH EMPTY VALUE</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>Value will be VERY long and truncated</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>3</index> - </row> - </slots> - <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment> - <subtable> - <row> - <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>VisitorType</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>0</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==VisitorType</segment> - <subtable> - <row> - <label>LoggedIn</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> - <label>LoggedOut</label> - <goals> - <row idgoal='2'> - <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> - <nb_visits>0</nb_visits> - </row> - </subtable> - </row> - <row> - <label>Status user</label> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==Status+user</segment> - <subtable> - <row> - <label>looking at "profile page"</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>Loggedin</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>Language</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==Language</segment> - <subtable> - <row> - <label>FR</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>SET WITH EMPTY VALUE PAGE SCOPE</label> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>2</index> - </row> - </slots> - <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment> - <subtable> - <row> - <label>Value not defined</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml deleted file mode 100644 index 3048e12e70..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <row> - <label>this keyword should be ranked</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment> - <subtable> - <row> - <label>Google</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - </row> - </subtable> - </row> - <row> - <label>piwik</label> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>0</revenue> - <nb_visits>0</nb_visits> - <segment>referrerType==search;referrerKeyword==piwik</segment> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml deleted file mode 100644 index 94766211d0..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <row> - <label>this keyword should be ranked</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment> - <subtable> - <row> - <label>Google</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>364</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - </subtable> - </row> - <row> - <label>piwik</label> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - <row idgoal='2'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>0</revenue> - </row> - </goals> - <nb_conversions>2</nb_conversions> - <revenue>0</revenue> - <nb_visits>0</nb_visits> - <segment>referrerType==search;referrerKeyword==piwik</segment> - </row> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml deleted file mode 100644 index de4eac0560..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>364</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> - <avg_time_on_site>364</avg_time_on_site> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml deleted file mode 100644 index 7cb1a9b288..0000000000 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2009-12-28,2010-01-03"> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_visits_converted>1</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>364</sum_visit_length> - <max_actions>3</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> - <avg_time_on_site>364</avg_time_on_site> - </result> - <result date="2010-01-04,2010-01-10" /> - <result date="2010-01-11,2010-01-17" /> - <result date="2010-01-18,2010-01-24" /> - <result date="2010-01-25,2010-01-31" /> - <result date="2010-02-01,2010-02-07" /> - <result date="2010-02-08,2010-02-14" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php index 62b285247d..c934565a28 100644 --- a/tests/PHPUnit/Unit/Tracker/RequestTest.php +++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php @@ -11,8 +11,6 @@ namespace Piwik\Tests\Unit\Tracker; use Piwik\Cookie; use Piwik\Exception\InvalidRequestParameterException; use Matomo\Network\IPUtils; -use Piwik\Piwik; -use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Tests\Framework\TestCase\UnitTestCase; use Piwik\Tracker\Request; use Piwik\Tracker\TrackerConfig; @@ -192,28 +190,6 @@ class RequestTest extends UnitTestCase $this->assertEquals($expected, $request->getPlugins()); } - public function test_truncateCustomVariable_shouldNotTruncateAnything_IfValueIsShortEnough() - { - $len = CustomVariables::getMaxLengthCustomVariables(); - $input = str_pad('test', $len - 2, 't'); - - $result = Request::truncateCustomVariable($input); - - $this->assertSame($result, $input); - } - - public function test_truncateCustomVariable_shouldActuallyTruncateTheValue() - { - $len = CustomVariables::getMaxLengthCustomVariables(); - $input = str_pad('test', $len + 2, 't'); - - $this->assertGreaterThan(100, $len); - - $truncated = Request::truncateCustomVariable($input); - - $this->assertEquals(str_pad('test', $len, 't'), $truncated); - } - public function test_getUserAgent_ShouldReturnEmptyString_IfNoneIsSet() { $this->assertEquals('', $this->request->getUserAgent()); diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 9220a3a619..a11be32d94 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6481cfc1245a4cbfa401b55e4fd00d6d666b1a8b0047a34628d059c0aff747a6 -size 4291183 +oid sha256:3bc110653267269b981360ef7aa7fe010fce385c4b9dc415ceb9670ffd37acff +size 4291223 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 1651fdd430..a9a0ced4ed 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:720b3b7323d51fce3ac064d07cf7acf1c73173e2741a8ea891d1cdd22c050afd -size 1054486 +oid sha256:27e7041385dfc642c951ad647ad056ccfcb52726e602fb05f30c7a74564e73c3 +size 1054626 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index b46478c1d5..1b173ab51c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ad2dc3830a01c118a48662e3a1bf4800e472c9f1d206579a4e7b22cdebed7e -size 1066306 +oid sha256:4e1c5a935f1b7cc39c5261720718594ec88218fa87f72f45596c0e6dc3f8d82b +size 1066495 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index 13f9f6eb39..1e3dbd856b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da89cdc40174cab4cba2233fc6159f0d8776e9de0e573250534f2678884883a -size 165737 +oid sha256:297a1d0fa8f939582f441dd401d3654dc57a8ee4d09993bc8819e57ca56fe27a +size 170116 diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log index c1225b7005..230b5ae790 100644 --- a/tests/resources/access-logs/fake_logs_replay.log +++ b/tests/resources/access-logs/fake_logs_replay.log @@ -1,12 +1,12 @@ #incorrect cid param, should not break the log importer 180.153.201.215 - - [02/Aug/2015:21:15:38 +0000] "GET /piwik.php?action_name=hduy uyeuy nuo 36 ??\xAC&idsite=1&rec=1&r=199956&h=0&m=18&s=24&url=http://www.xxx.lt/x?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&price=216,456&urlref=http://www.xxxx.lt/ss-aparatai?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&_id=54f474c0c50144df&_idts=1438550142&_idvc=1&_idn=0&_refts=1438550142&_viewts=1438550142&_ref=http://www.googleadservices.com/pagead/aclk?sa=L&ai=Cii7VcIi-VeDRGIaRjAaPqK-QBZr23PYFwq3-29QBtcrnsxUIABABIL_gsAMoA2C5A6ABrqKPywPIAQGpAtRzbKu7bLI-qgQiT9Dly94npwbCg5D7SkUsuqSK-SLDbgVFTQ55B4AxabBQloAFkE6IBgGAB7rd8DSQBwOoB6LCG6gHpr4b2AcB&ohost=www.google.com&cid=5GjGWDPimmkdeh1FrgcuUImc3pojqtIChK-EDtUjr4JZmw&sig=AOD64_3GESvwtzmjkBhlZRJcFCvb4QN70g&clui=0&rct=j&q=&ved=0CBoQ0QxqFQoTCIz3keuoi8cCFcKyFAodIQ0Ktw&adurl=http://www.oigai.lt/agepdf=1&qt=0&realp=0&wma=1&fla=1&java=1&ag=0&cookie=1&res=1366x768&pf_srv=7972 HTTP/1.1" 200 54 "http://www.xx.lt/eagea-aparatai?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&price=216,456" "Mozilla/5.0 (Linux; U; Android 4.4.2; zh-cn; GT-I9500 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.0 QQ-Manager Mobile Safari/537.36" -- - - [15/Aug/2012:09:18:38 +0200] "GET /piwik.php?idsite=1&rec=1&apiv=1&rand=1636495582&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU2%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " +- - - [15/Aug/2012:09:18:38 +0200] "GET /piwik.php?idsite=1&rec=1&apiv=1&rand=1636495582&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&_pks=SKU2&_pkn=PRODUCT+name&_pkc=Electronics+%26+Cameras&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " - - - [15/Aug/2012:06:30:13 +0200] "GET /piwik.php?action_name=Piwik%20Forums&idsite=1&rec=1&r=136285&h=8&m=0&s=47&url=http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599&urlref=http%3A%2F%2Fsn110w.snt110.mail.live.com%2Fmail%2FInboxLight.aspx%3Fn%3D184083971&_id=0290799d35c0f2ba&_idts=1306645141&_idvc=1&_idn=0&_refts=0&_viewts=1306645141&pdf=1&qt=0&realp=0&wma=1&fla=1&java=1&ag=0&res=1280x800&cookie=1&_cvar=%7B%223%22%3A%5B%22Forum%20status%22%2C%22Anonymous%22%5D%7D HTTP/1.1" 200 43 "http://forum.piwik.org/register.php?0,approve=9a94a02145599" "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.71 Safari/534.24" -- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU+VERY+nice+indeed%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" +- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&_pks=SKU+VERY+nice+indeed&_pkn=PRODUCT+name&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" 175.41.192.40 - - [09/Aug/2012:10:10:38 +0200] "GET /blog/category/meta/ HTTP/1.1" 200 3574 "-" "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" -- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=3&rec=1&apiv=1&rand=1976958961&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Looking+at+Electronics+%26+Cameras+page+with+a+page+level+custom+variable&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" +- - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=3&rec=1&apiv=1&rand=1976958961&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&_pkc=Electronics+%26+Cameras&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Looking+at+Electronics+%26+Cameras+page+with+a+page+level+custom+variable&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" 175.41.192.40 - - [09/Aug/2012:10:11:30 +0200] "GET /faq/ HTTP/1.1" 200 3574 "-" "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" -175.41.192.40 - - [15/Aug/2012:09:00:38 +0200] "GET /piwik.php?idsite=1&rec=0&apiv=1&rand=123&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU2%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " +175.41.192.40 - - [15/Aug/2012:09:00:38 +0200] "GET /piwik.php?idsite=1&rec=0&apiv=1&rand=123&_id=e4002ba0f2c2dd70&fla=1&java=1&qt=0&realp=0&pdf=0&wma=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&_pks=SKU2&_pkn=PRODUCT+name&_pkc=Electronics+%26+Cameras&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " 175.41.192.40 - - [15/Aug/2012:09:01:38 +0200] "GET /piwik.php?idsite=1 HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " #idsite=1 replay logs from demo (IP were changed) |
