diff options
47 files changed, 4653 insertions, 4397 deletions
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index f27e6b663c..4fc8f8a74b 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -35,11 +35,18 @@ class Actions extends \Piwik\Plugin 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', 'AssetManager.getJavaScriptFiles' => 'getJsFiles', 'Insights.addReportToOverview' => 'addReportToInsightsOverview', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails', 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', - 'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations' + 'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations', ); } + public function extendVisitorDetails(&$visitor, $details) + { + $visitor['searches'] = $details['visit_total_searches']; + $visitor['actions'] = $details['visit_total_actions']; + } + public function addMetricTranslations(&$translations) { $metrics = array( diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php index c7fabb1c44..53552e6844 100644 --- a/plugins/CoreConsole/Commands/GenerateWidget.php +++ b/plugins/CoreConsole/Commands/GenerateWidget.php @@ -34,7 +34,7 @@ class GenerateWidget extends GeneratePluginBase $category = $this->getCategory($input, $output); $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; - $replace = array('ExampleRssWidget' => $pluginName, + $replace = array('ExamplePlugin' => $pluginName, 'Example Category' => $category); $whitelistFiles = array('/Widgets.php'); diff --git a/plugins/Actions/Columns/ServerTime.php b/plugins/CoreHome/Columns/ServerTime.php index f350306a9a..72cdcb1357 100644 --- a/plugins/Actions/Columns/ServerTime.php +++ b/plugins/CoreHome/Columns/ServerTime.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\Actions\Columns; +namespace Piwik\Plugins\CoreHome\Columns; use Piwik\Db; use Piwik\Plugin\Dimension\ActionDimension; diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index b7b2ec80c6..6a7f6ab941 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -21,10 +21,29 @@ class CoreHome extends \Piwik\Plugin return array( 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', 'AssetManager.getJavaScriptFiles' => 'getJsFiles', - 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys' + 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails', ); } + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['visitorType'] = $instance->getVisitorReturning(); + $visitor['visitorTypeIcon'] = $instance->getVisitorReturningIcon(); + $visitor['visitConverted'] = $instance->isVisitorGoalConverted(); + $visitor['visitConvertedIcon'] = $instance->getVisitorGoalConvertedIcon(); + $visitor['visitCount'] = $instance->getVisitCount(); + $visitor['firstActionTimestamp'] = $instance->getTimestampFirstAction(); + $visitor['visitEcommerceStatus'] = $instance->getVisitEcommerceStatus(); + $visitor['visitEcommerceStatusIcon'] = $instance->getVisitEcommerceStatusIcon(); + $visitor['daysSinceFirstVisit'] = $instance->getDaysSinceFirstVisit(); + $visitor['daysSinceLastEcommerceOrder'] = $instance->getDaysSinceLastEcommerceOrder(); + $visitor['visitDuration'] = $instance->getVisitLength(); + $visitor['visitDurationPretty'] = $instance->getVisitLengthPretty(); + } + public function getStylesheetFiles(&$stylesheets) { $stylesheets[] = "libs/jquery/themes/base/jquery-ui.css"; diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php new file mode 100644 index 0000000000..9d3f2ccdd5 --- /dev/null +++ b/plugins/CoreHome/Visitor.php @@ -0,0 +1,103 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\CoreHome; + +use Piwik\Plugins\CoreHome\Columns\VisitGoalBuyer; + +class Visitor +{ + private $details = array(); + + public function __construct($details) + { + $this->details = $details; + } + + function getTimestampFirstAction() + { + return strtotime($this->details['visit_first_action_time']); + } + + function getVisitEcommerceStatusIcon() + { + $status = $this->getVisitEcommerceStatus(); + + if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { + return "plugins/Morpheus/images/ecommerceOrder.gif"; + } elseif ($status == 'abandonedCart') { + return "plugins/Morpheus/images/ecommerceAbandonedCart.gif"; + } + return null; + } + + function getVisitEcommerceStatus() + { + return VisitGoalBuyer::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']); + } + + function isVisitorGoalConverted() + { + return $this->details['visit_goal_converted']; + } + + function getVisitorGoalConvertedIcon() + { + return $this->isVisitorGoalConverted() + ? "plugins/Morpheus/images/goal.png" + : null; + } + + function getDaysSinceFirstVisit() + { + return $this->details['visitor_days_since_first']; + } + + function getDaysSinceLastEcommerceOrder() + { + return $this->details['visitor_days_since_order']; + } + + function getVisitorReturning() + { + $type = $this->details['visitor_returning']; + return $type == 2 + ? 'returningCustomer' + : ($type == 1 + ? 'returning' + : 'new'); + } + + function getVisitorReturningIcon() + { + $type = $this->getVisitorReturning(); + if ($type == 'returning' + || $type == 'returningCustomer' + ) { + return "plugins/Live/images/returningVisitor.gif"; + } + return null; + } + + function getVisitCount() + { + return $this->details['visitor_count_visits']; + } + + function getVisitLength() + { + return $this->details['visit_total_time']; + } + + function getVisitLengthPretty() + { + return \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($this->details['visit_total_time']); + } + + +}
\ No newline at end of file diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index a4e53eb245..680825d209 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -40,8 +40,8 @@ <ul class="Menu-tabList"> {% for level1,level2 in menu %} - <li id="{{ _self.getId(level2._url) }}"> - <a href="#{{ _self.getFirstUrl(level2._url) }}" + <li id="{% if level2._url is defined %}{{ _self.getId(level2._url) }}{% endif %}"> + <a {% if level2._url is defined %}href="#{{ _self.getFirstUrl(level2._url) }}"{% endif %} onclick="return piwikMenu.onItemClick(this);">{{ level1|translate }}</a> <ul> diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index e667002286..35508c6ea3 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -28,7 +28,8 @@ class CustomVariables extends \Piwik\Plugin public function getListHooksRegistered() { return array( - 'API.getSegmentDimensionMetadata' => 'getSegmentsMetadata' + 'API.getSegmentDimensionMetadata' => 'getSegmentsMetadata', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' ); } @@ -42,6 +43,24 @@ class CustomVariables extends \Piwik\Plugin Model::uninstall(); } + public function extendVisitorDetails(&$visitor, $details) + { + $customVariables = array(); + + $maxCustomVariables = self::getMaxCustomVariables(); + + for ($i = 1; $i <= $maxCustomVariables; $i++) { + if (!empty($details['custom_var_k' . $i])) { + $customVariables[$i] = array( + 'customVariableName' . $i => $details['custom_var_k' . $i], + 'customVariableValue' . $i => $details['custom_var_v' . $i], + ); + } + } + + $visitor['customVariables'] = $customVariables; + } + /** * There are also some hardcoded places in JavaScript * @return int diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index 7bcb79355e..6834ec6aff 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -1,175 +1,175 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> - <actionDetails> - <row> - <type>goal</type> - <goalName>triggered js</goalName> - <goalId>1</goalId> - <revenue>0</revenue> - <goalPageId /> - - <url>http://localhost</url> - <icon>plugins/Morpheus/images/goal.png</icon> - </row> - <row> - <type>action</type> - <url>http://localhost</url> - <pageTitle>Profile page</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <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> - <icon /> - </row> - </actionDetails> - <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> - <goalConversions>1</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>4</visitDuration> - <visitDurationPretty>4s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <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/search?q=this+keyword+should+be+ranked</referrerUrl> - <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <deviceType>Desktop</deviceType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - - - - - - </row> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <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> + </row> + <row> + <type>action</type> + <url>http://localhost</url> + <pageTitle>Profile page</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <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> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>4</visitDuration> + <visitDurationPretty>4s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <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/search?q=this+keyword+should+be+ranked</referrerUrl> + <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> + <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + + + + + + </row> </result>
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index b6d9fe00f8..463462262e 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -69,6 +60,27 @@ <icon /> </row> </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>4</visitDuration> + <visitDurationPretty>4s</visitDurationPretty> <customVariables> <row> <customVariableName1>Name_VISIT_1</customVariableName1> @@ -103,33 +115,8 @@ <customVariableValue8>Val_VISIT8</customVariableValue8> </row> </customVariables> - <goalConversions>1</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>4</visitDuration> - <visitDurationPretty>4s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -141,6 +128,17 @@ <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -152,7 +150,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -166,6 +163,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index f06747f408..6e018d7712 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -12,6 +12,9 @@ namespace Piwik\Plugins\DevicesDetection; use Piwik\ArchiveProcessor; use Piwik\Db; use Piwik\Piwik; +use Piwik\Plugin\Manager as PluginManager; +use Piwik\Plugins\UserSettings\UserSettings; +use Piwik\Plugins\UserSettings\Visitor; require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php'; @@ -23,12 +26,32 @@ class DevicesDetection extends \Piwik\Plugin public function getInformation() { return array( - 'description' => "[Beta Plugin] " . Piwik::translate("DevicesDetection_PluginDescription"), + 'description' => "[Beta Plugin] " . Piwik::translate("DevicesDetection_PluginDescription"), 'authors' => array(array('name' => 'Piwik PRO', 'homepage' => 'http://piwik.pro')), - 'version' => '1.14', + 'version' => '1.14', 'license' => 'GPL v3+', 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html' ); } + /** + * @see Piwik\Plugin::getListHooksRegistered + */ + public function getListHooksRegistered() + { + return array( + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' + ); + } + + public function extendVisitorDetails(&$visitor, $details) + { + $visitor['deviceType'] = getDeviceTypeLabel($details['config_device_type']); + + if (!PluginManager::getInstance()->isPluginActivated('UserSettings')) { + $instance = new UserSettings(); + $instance->extendVisitorDetails($visitor, $details); + } + } + } diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php index b3a413ad5f..af701bdf37 100644 --- a/plugins/Events/Events.php +++ b/plugins/Events/Events.php @@ -20,12 +20,18 @@ class Events extends \Piwik\Plugin public function getListHooksRegistered() { return array( - 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', 'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations', - 'ViewDataTable.configure' => 'configureViewDataTable', + 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', + 'ViewDataTable.configure' => 'configureViewDataTable', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' ); } + public function extendVisitorDetails(&$visitor, $details) + { + $visitor['events'] = $details['visit_total_events']; + } + public function addMetricTranslations(&$translations) { $translations = array_merge($translations, $this->getMetricTranslations()); diff --git a/plugins/Insights/templates/insightsOverviewWidget.twig b/plugins/Insights/templates/insightsOverviewWidget.twig index cf8bfe166d..7a3ec6e1d1 100644 --- a/plugins/Insights/templates/insightsOverviewWidget.twig +++ b/plugins/Insights/templates/insightsOverviewWidget.twig @@ -1,5 +1,14 @@ -{% set allMetadata = reports.getFirstRow.getAllTableMetadata %} -{% set consideredGrowth = 'Insights_TitleConsideredInsightsGrowth'|translate(allMetadata.minGrowthPercentPositive, allMetadata.lastDate|prettyDate(allMetadata.period)) %} +{% if reports.getRowsCount %} + {% set allMetadata = reports.getFirstRow.getAllTableMetadata %} + {% set consideredGrowth = 'Insights_TitleConsideredInsightsGrowth'|translate(allMetadata.minGrowthPercentPositive, allMetadata.lastDate|prettyDate(allMetadata.period)) %} + +{% else %} + {% set allMetadata = {} %} + {% set consideredGrowth = '' %} +{% endif %} + {% set consideredChanges = '' %} -{% include "@Insights/overviewWidget.twig" %}
\ No newline at end of file +{% include "@Insights/overviewWidget.twig" %} + + diff --git a/plugins/Insights/templates/moversAndShakersOverviewWidget.twig b/plugins/Insights/templates/moversAndShakersOverviewWidget.twig index f2326df1ea..bc79edcfb1 100644 --- a/plugins/Insights/templates/moversAndShakersOverviewWidget.twig +++ b/plugins/Insights/templates/moversAndShakersOverviewWidget.twig @@ -1,6 +1,13 @@ -{% set allMetadata = reports.getFirstRow.getAllTableMetadata %} +{% if reports.getRowsCount %} + {% set allMetadata = reports.getFirstRow.getAllTableMetadata %} -{% set consideredGrowth = 'Insights_TitleConsideredMoversAndShakersGrowth'|translate(allMetadata.metricName, allMetadata.lastTotalValue, allMetadata.totalValue, allMetadata.lastDate|prettyDate(allMetadata.period), allMetadata.evolutionTotal) %} -{% set consideredChanges = 'Insights_TitleConsideredMoversAndShakersChanges'|translate(allMetadata.minGrowthPercentPositive, allMetadata.minGrowthPercentNegative, allMetadata.minNewPercent, allMetadata.minIncreaseNew, allMetadata.minDisappearedPercent, allMetadata.minDecreaseDisappeared, allMetadata.totalValue) %} + {% set consideredGrowth = 'Insights_TitleConsideredMoversAndShakersGrowth'|translate(allMetadata.metricName, allMetadata.lastTotalValue, allMetadata.totalValue, allMetadata.lastDate|prettyDate(allMetadata.period), allMetadata.evolutionTotal) %} + {% set consideredChanges = 'Insights_TitleConsideredMoversAndShakersChanges'|translate(allMetadata.minGrowthPercentPositive, allMetadata.minGrowthPercentNegative, allMetadata.minNewPercent, allMetadata.minIncreaseNew, allMetadata.minDisappearedPercent, allMetadata.minDecreaseDisappeared, allMetadata.totalValue) %} +{% else %} + {% set allMetadata = {} %} + + {% set consideredGrowth = '' %} + {% set consideredChanges = '' %} +{% endif %} {% include "@Insights/overviewWidget.twig" %}
\ No newline at end of file diff --git a/plugins/Live/API.php b/plugins/Live/API.php index f2b38177e8..b18dedf598 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -29,6 +29,7 @@ use Piwik\Tracker; * @see plugins/Live/Visitor.php */ require_once PIWIK_INCLUDE_PATH . '/plugins/Live/Visitor.php'; +require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; /** * The Live! API lets you access complete visit level information about your visitors. Combined with the power of <a href='http://piwik.org/docs/analytics-api/segmentation/' target='_blank'>Segmentation</a>, @@ -301,7 +302,7 @@ class API extends \Piwik\Plugin\API } ++$continents[$continentCode]; - if (!array_key_exists($countryCode, $cities)) { + if ($countryCode && !array_key_exists($countryCode, $cities)) { $cities[$countryCode] = array(); } $city = $visit->getColumn('city'); diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index a82b9fac42..b03d37e650 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -15,37 +15,19 @@ use Piwik\Date; use Piwik\Db; use Piwik\IP; use Piwik\Piwik; -use Piwik\Plugins\CoreHome\Columns\VisitGoalBuyer; use Piwik\Plugins\CustomVariables\CustomVariables; -use Piwik\Plugins\Referrers\API as APIReferrers; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Plugins\Actions\Actions\ActionSiteSearch; use Piwik\Tracker; use Piwik\Tracker\Action; use Piwik\Tracker\GoalManager; -use Piwik\Tracker\Visit; -use Piwik\UrlHelper; -/** - * @see plugins/Referrers/functions.php - * @see plugins/UserCountry/functions.php - * @see plugins/UserSettings/functions.php - * @see plugins/Provider/functions.php - */ - -require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php'; -require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; -require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; -require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php'; - -/** - */ class Visitor implements VisitorInterface { - const DELIMITER_PLUGIN_NAME = ", "; - const EVENT_VALUE_PRECISION = 3; + private $details = array(); + function __construct($visitorRawData) { $this->details = $visitorRawData; @@ -53,84 +35,45 @@ class Visitor implements VisitorInterface function getAllVisitorDetails() { - return array( + $visitor = array( 'idSite' => $this->getIdSite(), 'idVisit' => $this->getIdVisit(), 'visitIp' => $this->getIp(), 'visitorId' => $this->getVisitorId(), - 'visitorType' => $this->getVisitorReturning(), - 'visitorTypeIcon' => $this->getVisitorReturningIcon(), - 'visitConverted' => $this->isVisitorGoalConverted(), - 'visitConvertedIcon' => $this->getVisitorGoalConvertedIcon(), - 'visitEcommerceStatus' => $this->getVisitEcommerceStatus(), - 'visitEcommerceStatusIcon' => $this->getVisitEcommerceStatusIcon(), - - 'searches' => $this->getNumberOfSearches(), - 'events' => $this->getNumberOfEvents(), - 'actions' => $this->getNumberOfActions(), + // => false are placeholders to be filled in API later 'actionDetails' => false, - 'customVariables' => $this->getCustomVariables(), 'goalConversions' => false, 'siteCurrency' => false, 'siteCurrencySymbol' => false, // all time entries 'serverDate' => $this->getServerDate(), - 'visitLocalTime' => $this->getVisitLocalTime(), - 'visitLocalHour' => $this->getVisitLocalHour(), 'visitServerHour' => $this->getVisitServerHour(), - 'firstActionTimestamp' => $this->getTimestampFirstAction(), 'lastActionTimestamp' => $this->getTimestampLastAction(), 'lastActionDateTime' => $this->getDateTimeLastAction(), - - // standard attributes - 'visitDuration' => $this->getVisitLength(), - 'visitDurationPretty' => $this->getVisitLengthPretty(), - 'visitCount' => $this->getVisitCount(), - 'daysSinceLastVisit' => $this->getDaysSinceLastVisit(), - 'daysSinceFirstVisit' => $this->getDaysSinceFirstVisit(), - 'daysSinceLastEcommerceOrder' => $this->getDaysSinceLastEcommerceOrder(), - 'continent' => $this->getContinent(), - 'continentCode' => $this->getContinentCode(), - 'country' => $this->getCountryName(), - 'countryCode' => $this->getCountryCode(), - 'countryFlag' => $this->getCountryFlag(), - 'region' => $this->getRegionName(), - 'regionCode' => $this->getRegionCode(), - 'city' => $this->getCityName(), - 'location' => $this->getPrettyLocation(), - 'latitude' => $this->getLatitude(), - 'longitude' => $this->getLongitude(), - 'provider' => $this->getProvider(), - 'providerName' => $this->getProviderName(), - 'providerUrl' => $this->getProviderUrl(), - - 'referrerType' => $this->getReferrerType(), - 'referrerTypeName' => $this->getReferrerTypeName(), - 'referrerName' => $this->getReferrerName(), - 'referrerKeyword' => $this->getKeyword(), - 'referrerKeywordPosition' => $this->getKeywordPosition(), - 'referrerUrl' => $this->getReferrerUrl(), - 'referrerSearchEngineUrl' => $this->getSearchEngineUrl(), - 'referrerSearchEngineIcon' => $this->getSearchEngineIcon(), - 'operatingSystem' => $this->getOperatingSystem(), - 'operatingSystemCode' => $this->getOperatingSystemCode(), - 'operatingSystemShortName' => $this->getOperatingSystemShortName(), - 'operatingSystemIcon' => $this->getOperatingSystemIcon(), - 'browserFamily' => $this->getBrowserFamily(), - 'browserFamilyDescription' => $this->getBrowserFamilyDescription(), - 'browserName' => $this->getBrowser(), - 'browserIcon' => $this->getBrowserIcon(), - 'browserCode' => $this->getBrowserCode(), - 'browserVersion' => $this->getBrowserVersion(), - 'screenType' => $this->getScreenType(), - 'deviceType' => $this->getDeviceType(), - 'resolution' => $this->getResolution(), - 'screenTypeIcon' => $this->getScreenTypeIcon(), - 'plugins' => $this->getPlugins(), - 'pluginsIcons' => $this->getPluginIcons(), ); + + /** + * This event can be used to add any details to a visitor. The visitor's details are for instance used in + * API requests like 'Live.getVisitorProfile' and 'Live.getLastVisitDetails'. This can be useful for instance + * in case your plugin defines any visit dimensions and you want to add the value of your dimension to a user. + * It can be also useful if you want to enrich a visitor with custom fields based on other fields or if you + * want to change or remove any fields from the user. + * + * **Example** + * + * Piwik::addAction('Live.getAllVisitorDetails', function (&visitor, $details) { + * $visitor['userPoints'] = $details['actions'] + $details['events'] + $details['searches']; + * unset($visitor['anyFieldYouWantToRemove']); + * }); + * + * @param array &visitor You can add or remove fields to the visitor array and it will reflected in the API output + * @param array $details The details array contains all visit dimensions (columns of log_visit table) + */ + Piwik::postEvent('Live.getAllVisitorDetails', array(&$visitor, $this->details)); + + return $visitor; } function getVisitorId() @@ -141,41 +84,11 @@ class Visitor implements VisitorInterface return false; } - function getVisitLocalTime() - { - return $this->details['visitor_localtime']; - } - function getVisitServerHour() { return date('G', strtotime($this->details['visit_last_action_time'])); } - function getVisitLocalHour() - { - return date('G', strtotime('2012-12-21 ' . $this->details['visitor_localtime'])); - } - - function getVisitCount() - { - return $this->details['visitor_count_visits']; - } - - function getDaysSinceLastVisit() - { - return $this->details['visitor_days_since_last']; - } - - function getDaysSinceLastEcommerceOrder() - { - return $this->details['visitor_days_since_order']; - } - - function getDaysSinceFirstVisit() - { - return $this->details['visitor_days_since_first']; - } - function getServerDate() { return date('Y-m-d', strtotime($this->details['visit_last_action_time'])); @@ -199,412 +112,16 @@ class Visitor implements VisitorInterface return $this->details['idsite']; } - function getNumberOfActions() - { - return $this->details['visit_total_actions']; - } - - function getNumberOfEvents() - { - return $this->details['visit_total_events']; - } - - function getNumberOfSearches() - { - return $this->details['visit_total_searches']; - } - - function getVisitLength() - { - return $this->details['visit_total_time']; - } - - function getVisitLengthPretty() - { - return \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($this->details['visit_total_time']); - } - - function getVisitorReturning() - { - $type = $this->details['visitor_returning']; - return $type == 2 - ? 'returningCustomer' - : ($type == 1 - ? 'returning' - : 'new'); - } - - function getVisitorReturningIcon() - { - $type = $this->getVisitorReturning(); - if ($type == 'returning' - || $type == 'returningCustomer' - ) { - return "plugins/Live/images/returningVisitor.gif"; - } - return null; - } - - function getTimestampFirstAction() - { - return strtotime($this->details['visit_first_action_time']); - } - function getTimestampLastAction() { return strtotime($this->details['visit_last_action_time']); } - function getCountryCode() - { - return $this->details['location_country']; - } - - function getCountryName() - { - return \Piwik\Plugins\UserCountry\countryTranslate($this->getCountryCode()); - } - - function getCountryFlag() - { - return \Piwik\Plugins\UserCountry\getFlagFromCode($this->getCountryCode()); - } - - function getContinent() - { - return \Piwik\Plugins\UserCountry\continentTranslate($this->getContinentCode()); - } - - function getContinentCode() - { - return Common::getContinent($this->details['location_country']); - } - - function getCityName() - { - if (!empty($this->details['location_city'])) { - return $this->details['location_city']; - } - return null; - } - - public function getRegionName() - { - $region = $this->getRegionCode(); - if ($region != '' && $region != Visit::UNKNOWN_CODE) { - return GeoIp::getRegionNameFromCodes( - $this->details['location_country'], $region); - } - return null; - } - - public function getRegionCode() - { - return $this->details['location_region']; - } - - function getPrettyLocation() - { - $parts = array(); - - $city = $this->getCityName(); - if (!empty($city)) { - $parts[] = $city; - } - $region = $this->getRegionName(); - if (!empty($region)) { - $parts[] = $region; - } - - // add country & return concatenated result - $parts[] = $this->getCountryName(); - return implode(', ', $parts); - } - - function getLatitude() - { - if (!empty($this->details['location_latitude'])) { - return $this->details['location_latitude']; - } - return null; - } - - function getLongitude() - { - if (!empty($this->details['location_longitude'])) { - return $this->details['location_longitude']; - } - return null; - } - - function getCustomVariables() - { - $customVariables = array(); - - $maxCustomVariables = CustomVariables::getMaxCustomVariables(); - - 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], - ); - } - } - return $customVariables; - } - - function getReferrerType() - { - return \Piwik\Plugins\Referrers\getReferrerTypeFromShortName($this->details['referer_type']); - } - - function getReferrerTypeName() - { - return \Piwik\Plugins\Referrers\getReferrerTypeLabel($this->details['referer_type']); - } - - function getKeyword() - { - $keyword = $this->details['referer_keyword']; - if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Referrers') - && $this->getReferrerType() == 'search' - ) { - $keyword = \Piwik\Plugins\Referrers\API::getCleanKeyword($keyword); - } - return urldecode($keyword); - } - - function getReferrerUrl() - { - if ($this->getReferrerType() == 'search') { - if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Referrers') - && $this->details['referer_keyword'] == APIReferrers::LABEL_KEYWORD_NOT_DEFINED - ) { - return 'http://piwik.org/faq/general/#faq_144'; - } // Case URL is google.XX/url.... then we rewrite to the search result page url - elseif ($this->getReferrerName() == 'Google' - && strpos($this->details['referer_url'], '/url') - ) { - $refUrl = @parse_url($this->details['referer_url']); - if (isset($refUrl['host'])) { - $url = \Piwik\Plugins\Referrers\getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword()); - $url = str_replace('google.com', $refUrl['host'], $url); - return $url; - } - } - } - if (\Piwik\UrlHelper::isLookLikeUrl($this->details['referer_url'])) { - return $this->details['referer_url']; - } - return null; - } - - function getKeywordPosition() - { - if ($this->getReferrerType() == 'search' - && strpos($this->getReferrerName(), 'Google') !== false - ) { - $url = @parse_url($this->details['referer_url']); - if (empty($url['query'])) { - return null; - } - $position = UrlHelper::getParameterFromQueryString($url['query'], 'cd'); - if (!empty($position)) { - return $position; - } - } - return null; - } - - function getReferrerName() - { - return urldecode($this->details['referer_name']); - } - - function getSearchEngineUrl() - { - if ($this->getReferrerType() == 'search' - && !empty($this->details['referer_name']) - ) { - return \Piwik\Plugins\Referrers\getSearchEngineUrlFromName($this->details['referer_name']); - } - return null; - } - - function getSearchEngineIcon() - { - $searchEngineUrl = $this->getSearchEngineUrl(); - if (!is_null($searchEngineUrl)) { - return \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl($searchEngineUrl); - } - return null; - } - - function getPlugins() - { - $plugins = array( - 'config_pdf', - 'config_flash', - 'config_java', - 'config_director', - 'config_quicktime', - 'config_realplayer', - 'config_windowsmedia', - 'config_gears', - 'config_silverlight', - ); - $pluginShortNames = array(); - foreach ($plugins as $plugin) { - if ($this->details[$plugin] == 1) { - $pluginShortName = substr($plugin, 7); - $pluginShortNames[] = $pluginShortName; - } - } - return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames); - } - - function getPluginIcons() - { - $pluginNames = $this->getPlugins(); - if (!empty($pluginNames)) { - $pluginNames = explode(self::DELIMITER_PLUGIN_NAME, $pluginNames); - $pluginIcons = array(); - - foreach ($pluginNames as $plugin) { - $pluginIcons[] = array("pluginIcon" => \Piwik\Plugins\UserSettings\getPluginsLogo($plugin), "pluginName" => $plugin); - } - return $pluginIcons; - } - return null; - } - - function getOperatingSystemCode() - { - return $this->details['config_os']; - } - - function getOperatingSystem() - { - return \Piwik\Plugins\UserSettings\getOSLabel($this->details['config_os']); - } - - function getOperatingSystemShortName() - { - return \Piwik\Plugins\UserSettings\getOSShortLabel($this->details['config_os']); - } - - function getOperatingSystemIcon() - { - return \Piwik\Plugins\UserSettings\getOSLogo($this->details['config_os']); - } - - function getBrowserFamilyDescription() - { - return \Piwik\Plugins\UserSettings\getBrowserTypeLabel($this->getBrowserFamily()); - } - - function getBrowserFamily() - { - return \Piwik\Plugins\UserSettings\getBrowserFamily($this->details['config_browser_name']); - } - - function getBrowserCode() - { - return $this->details['config_browser_name']; - } - - function getBrowserVersion() - { - return $this->details['config_browser_version']; - } - - function getBrowser() - { - return \Piwik\Plugins\UserSettings\getBrowserLabel($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); - } - - function getBrowserIcon() - { - return \Piwik\Plugins\UserSettings\getBrowsersLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); - } - - function getScreenType() - { - return \Piwik\Plugins\UserSettings\getScreenTypeFromResolution($this->details['config_resolution']); - } - - function getDeviceType() - { - if (\Piwik\Plugin\Manager::getInstance()->isPluginActivated('DevicesDetection')) { - return \Piwik\Plugins\DevicesDetection\getDeviceTypeLabel($this->details['config_device_type']); - } - return false; - } - - function getResolution() - { - return $this->details['config_resolution']; - } - - function getScreenTypeIcon() - { - return \Piwik\Plugins\UserSettings\getScreensLogo($this->getScreenType()); - } - - function getProvider() - { - if (isset($this->details['location_provider'])) { - return $this->details['location_provider']; - } else { - return Piwik::translate('General_Unknown'); - } - } - - function getProviderName() - { - return \Piwik\Plugins\Provider\getPrettyProviderName($this->getProvider()); - } - - function getProviderUrl() - { - return \Piwik\Plugins\Provider\getHostnameUrl(@$this->details['location_provider']); - } - function getDateTimeLastAction() { return date('Y-m-d H:i:s', strtotime($this->details['visit_last_action_time'])); } - function getVisitEcommerceStatusIcon() - { - $status = $this->getVisitEcommerceStatus(); - - if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "plugins/Morpheus/images/ecommerceOrder.gif"; - } elseif ($status == 'abandonedCart') { - return "plugins/Morpheus/images/ecommerceAbandonedCart.gif"; - } - return null; - } - - function getVisitEcommerceStatus() - { - return VisitGoalBuyer::getVisitEcommerceStatusFromId($this->details['visit_goal_buyer']); - } - - function getVisitorGoalConvertedIcon() - { - return $this->isVisitorGoalConverted() - ? "plugins/Morpheus/images/goal.png" - : null; - } - - function isVisitorGoalConverted() - { - return $this->details['visit_goal_converted']; - } - /** * Removes fields that are not meant to be displayed (md5 config hash) * Or that the user should only access if he is Super User or admin (cookie, IP) @@ -768,8 +285,6 @@ class Visitor implements VisitorInterface $actionDetail =& $actionDetails[$actionIdx]; $customVariablesPage = array(); - $maxCustomVariables = CustomVariables::getMaxCustomVariables(); - for ($i = 1; $i <= $maxCustomVariables; $i++) { if (!empty($actionDetail['custom_var_k' . $i])) { $cvarKey = $actionDetail['custom_var_k' . $i]; diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index e238e75d16..f4389cdd29 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -27,20 +27,20 @@ {% for visitor in dataTable.getRows() %} {% set breakBeforeVisitorRank = (visitor.getColumn('visitEcommerceStatusIcon') and visitor.getColumn('visitorTypeIcon')) ? true : false %} {% set visitorColumnContent %} - <img src="{{ visitor.getColumn('countryFlag') }}" title="{{ visitor.getColumn('location') }}, Provider {{ visitor.getColumn('providerName') }}"/> + {% if visitor.getColumn('countryFlag') %}<img src="{{ visitor.getColumn('countryFlag') }}" title="{{ visitor.getColumn('location') }}, Provider {{ visitor.getColumn('providerName') }}"/>{% endif %} {% if visitor.getColumn('plugins') %} - <img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitor.getColumn('browserName'),visitor.getColumn('plugins')) }}"/> + {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitor.getColumn('browserName'),visitor.getColumn('plugins')) }}"/>{% endif %} {% else %} - <img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitor.getColumn('browserName')) }}"/> + {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitor.getColumn('browserName')) }}"/>{% endif %} {% endif %} - + {% if visitor.getColumn('operatingSystemIcon') %} <img src="{{ visitor.getColumn('operatingSystemIcon') }}" - title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }} ({{ visitor.getColumn('screenType') }})"/> + title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }} ({{ visitor.getColumn('screenType') }})"/>{% endif %} {% if visitor.getColumn('visitorTypeIcon') %} - - + {% if visitor.getColumn('visitorTypeIcon') %} - <img src="{{ visitor.getColumn('visitorTypeIcon') }}" - title="{{ 'General_ReturningVisitor'|translate }} - {{ 'General_NVisits'|translate(visitor.getColumn('visitCount')) }}"/> + title="{{ 'General_ReturningVisitor'|translate }} - {{ 'General_NVisits'|translate(visitor.getColumn('visitCount')) }}"/>{% endif %} {% endif %} {% if not displayVisitorsInOwnColumn or breakBeforeVisitorRank %}<br/><br />{% endif %} {% if visitor.getColumn('visitConverted') %} diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index e6df66009f..a165112f50 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -8,9 +8,9 @@ <div title="{{ visitor.actionDetails|length }} {{ 'General_Actions'|translate }}" class="datetime"> <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span> {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %} - <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/> - <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/> - <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/> + {% if visitor.countryFlag is defined %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %} + {% if visitor.browserIcon is defined %} <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/>{% endif %} + {% if visitor.operatingSystemIcon is defined %} <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/>{% endif %} {% if visitor.visitConverted %} <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.goalConversions) }}" class='visitorRank'> @@ -37,7 +37,7 @@ </div> <!--<div class="settings"></div>--> <div class="referrer"> - {% if visitor.referrerType != 'direct' %} + {% if visitor.referrerType is defined and visitor.referrerType != 'direct' %} {{ 'General_FromReferrer'|translate }} {% if visitor.referrerUrl is not empty %} <a href="{{ visitor.referrerUrl }}" target="_blank"> @@ -58,7 +58,7 @@ <span class='hash'>#</span> {{ visitor.referrerKeywordPosition }} </span> {% endif %} - {% else %} + {% elseif visitor.referrerType is defined %} {{ 'Referrers_DirectEntry'|translate }} {% endif %} </div> diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 20b493c691..aa378a6ccd 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -12,7 +12,7 @@ <div class="visitor-profile-latest-visit-column"> <ul> <li> - <span>{{ 'General_IP'|translate }}</span><strong {% if visitData.providerName is not empty %}title="{{ 'Provider_ColumnProvider'|translate }}: {{ visitData.providerName }}"{% endif %}>{{ visitData.visitIp }}</strong> + <span>{{ 'General_IP'|translate }}</span><strong {% if visitData.providerName is defined and visitData.providerName is not empty %}title="{{ 'Provider_ColumnProvider'|translate }}: {{ visitData.providerName }}"{% endif %}>{{ visitData.visitIp }}</strong> </li> <li class="visitor-profile-id"> <span>{{ 'General_Id'|translate|upper }}</span> @@ -24,14 +24,17 @@ </a> </li> <li> + {% if visitData.browserName is defined %} <div class="visitor-profile-browser" title="{% if visitData.plugins is defined %}{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitData.browserName, visitData.plugins) }}{% else %}{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitData.browserName) }}{% endif %}"> - <img src="{{ visitData.browserIcon }}"/><span>{{ visitData.browserName|split(' ')[0] }}</span> + {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span> </div> + {% endif %} + <div class="visitor-profile-os"> - <img src="{{ visitData.operatingSystemIcon }}"/><span>{{ visitData.operatingSystemShortName }}</span> + {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystemShortName is defined %}<span>{{ visitData.operatingSystemShortName }}</span>{% endif %} </div> </li> - <li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li> + {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %} {% if visitReferralSummary is defined %} {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%} <li> @@ -42,6 +45,7 @@ </ul> </div> <div class="visitor-profile-latest-visit-column"> + {% if visitData.customVariables is defined %} <ul> {% for id,customVariable in visitData.customVariables %} {% if loop.index0 < 4 %} @@ -49,7 +53,8 @@ {% endif %} {% endfor %} </ul> - {% if visitData.customVariables|length > 4 %} + {% endif %} + {% if visitData.customVariables is defined and visitData.customVariables|length > 4 %} <ul class="visitor-profile-extra-cvars" style="display:none;"> {% for id,customVariable in visitData.customVariables %} {% if loop.index0 >= 4 %} diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index 9c06887c1e..719029dc8b 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -17,6 +17,16 @@ use Piwik\Piwik; class Provider extends \Piwik\Plugin { + /** + * @see Piwik\Plugin::getListHooksRegistered + */ + public function getListHooksRegistered() + { + return array( + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' + ); + } + public function install() { // add column hostname / hostname ext in the visit table @@ -32,6 +42,15 @@ class Provider extends \Piwik\Plugin } } + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['provider'] = $instance->getProvider(); + $visitor['providerName'] = $instance->getProviderName(); + $visitor['providerUrl'] = $instance->getProviderUrl(); + } + public function uninstall() { // add column hostname / hostname ext in the visit table diff --git a/plugins/Provider/Visitor.php b/plugins/Provider/Visitor.php new file mode 100644 index 0000000000..0efbb92eb3 --- /dev/null +++ b/plugins/Provider/Visitor.php @@ -0,0 +1,42 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Provider; + +use Piwik\Piwik; + +require_once PIWIK_INCLUDE_PATH . '/plugins/Provider/functions.php'; + +class Visitor +{ + private $details = array(); + + public function __construct($details) + { + $this->details = $details; + } + + public function getProvider() + { + if (isset($this->details['location_provider'])) { + return $this->details['location_provider']; + } else { + return Piwik::translate('General_Unknown'); + } + } + + public function getProviderName() + { + return getPrettyProviderName($this->getProvider()); + } + + public function getProviderUrl() + { + return getHostnameUrl(@$this->details['location_provider']); + } +}
\ No newline at end of file diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php index f937a4315a..95c7e00446 100644 --- a/plugins/Referrers/Referrers.php +++ b/plugins/Referrers/Referrers.php @@ -28,10 +28,25 @@ class Referrers extends \Piwik\Plugin public function getListHooksRegistered() { return array( - 'Insights.addReportToOverview' => 'addReportToInsightsOverview' + 'Insights.addReportToOverview' => 'addReportToInsightsOverview', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' ); } + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['referrerType'] = $instance->getReferrerType(); + $visitor['referrerTypeName'] = $instance->getReferrerTypeName(); + $visitor['referrerName'] = $instance->getReferrerName(); + $visitor['referrerKeyword'] = $instance->getKeyword(); + $visitor['referrerKeywordPosition'] = $instance->getKeywordPosition(); + $visitor['referrerUrl'] = $instance->getReferrerUrl(); + $visitor['referrerSearchEngineUrl'] = $instance->getSearchEngineUrl(); + $visitor['referrerSearchEngineIcon'] = $instance->getSearchEngineIcon(); + } + public function addReportToInsightsOverview(&$reports) { $reports['Referrers_getWebsites'] = array(); diff --git a/plugins/Referrers/Visitor.php b/plugins/Referrers/Visitor.php new file mode 100644 index 0000000000..308c7b08f8 --- /dev/null +++ b/plugins/Referrers/Visitor.php @@ -0,0 +1,130 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Referrers; + +use Piwik\Url; +use Piwik\UrlHelper; + +require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php'; + +class Visitor +{ + private $details = array(); + + public function __construct($details) + { + $this->details = $details; + } + + public function getReferrerType() + { + try { + $referrerType = getReferrerTypeFromShortName($this->details['referer_type']); + } catch (\Exception $e) { + $referrerType = ''; + } + + return $referrerType; + } + + public function getReferrerTypeName() + { + return getReferrerTypeLabel($this->details['referer_type']); + } + + public function getKeyword() + { + $keyword = $this->details['referer_keyword']; + + if ($this->getReferrerType() == 'search') { + $keyword = API::getCleanKeyword($keyword); + } + + return urldecode($keyword); + } + + public function getReferrerUrl() + { + if ($this->getReferrerType() == 'search') { + if ($this->details['referer_keyword'] == API::LABEL_KEYWORD_NOT_DEFINED) { + + return 'http://piwik.org/faq/general/#faq_144'; + + } // Case URL is google.XX/url.... then we rewrite to the search result page url + elseif ($this->getReferrerName() == 'Google' + && strpos($this->details['referer_url'], '/url') + ) { + $refUrl = @parse_url($this->details['referer_url']); + if (isset($refUrl['host'])) { + $url = getSearchEngineUrlFromUrlAndKeyword('http://google.com', $this->getKeyword()); + $url = str_replace('google.com', $refUrl['host'], $url); + + return $url; + } + } + } + + if (UrlHelper::isLookLikeUrl($this->details['referer_url'])) { + return $this->details['referer_url']; + } + + return null; + } + + public function getKeywordPosition() + { + if ($this->getReferrerType() == 'search' + && strpos($this->getReferrerName(), 'Google') !== false + ) { + $url = @parse_url($this->details['referer_url']); + if (empty($url['query'])) { + + return null; + } + + $position = UrlHelper::getParameterFromQueryString($url['query'], 'cd'); + if (!empty($position)) { + + return $position; + } + } + + return null; + } + + public function getReferrerName() + { + return urldecode($this->details['referer_name']); + } + + public function getSearchEngineUrl() + { + if ($this->getReferrerType() == 'search' + && !empty($this->details['referer_name']) + ) { + + return getSearchEngineUrlFromName($this->details['referer_name']); + } + + return null; + } + + public function getSearchEngineIcon() + { + $searchEngineUrl = $this->getSearchEngineUrl(); + + if (!is_null($searchEngineUrl)) { + + return getSearchEngineLogoFromUrl($searchEngineUrl); + } + + return null; + } + +}
\ No newline at end of file diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index b1f8bd019e..960e966093 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -35,10 +35,28 @@ class UserCountry extends \Piwik\Plugin 'AssetManager.getJavaScriptFiles' => 'getJsFiles', 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys', 'Tracker.setTrackerCacheGeneral' => 'setTrackerCacheGeneral', - 'Insights.addReportToOverview' => 'addReportToInsightsOverview' + 'Insights.addReportToOverview' => 'addReportToInsightsOverview', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' ); } + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['continent'] = $instance->getContinent(); + $visitor['continentCode'] = $instance->getContinentCode(); + $visitor['country'] = $instance->getCountryName(); + $visitor['countryCode'] = $instance->getCountryCode(); + $visitor['countryFlag'] = $instance->getCountryFlag(); + $visitor['region'] = $instance->getRegionName(); + $visitor['regionCode'] = $instance->getRegionCode(); + $visitor['city'] = $instance->getCityName(); + $visitor['location'] = $instance->getPrettyLocation(); + $visitor['latitude'] = $instance->getLatitude(); + $visitor['longitude'] = $instance->getLongitude(); + } + public function addReportToInsightsOverview(&$reports) { $reports['UserCountry_getCountry'] = array(); diff --git a/plugins/UserCountry/Visitor.php b/plugins/UserCountry/Visitor.php new file mode 100644 index 0000000000..2a64fcca0d --- /dev/null +++ b/plugins/UserCountry/Visitor.php @@ -0,0 +1,115 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\UserCountry; + +use Piwik\ArchiveProcessor; +use Piwik\Common; +use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Plugins\UserCountry\LocationProvider; +use Piwik\Tracker\Visit; +use Piwik\Url; + +require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; + +class Visitor +{ + private $details = array(); + + public function __construct($details) + { + $this->details = $details; + } + + public function getCountryCode() + { + return $this->details['location_country']; + } + + public function getCountryName() + { + return countryTranslate($this->getCountryCode()); + } + + public function getCountryFlag() + { + return getFlagFromCode($this->getCountryCode()); + } + + public function getContinent() + { + return continentTranslate($this->getContinentCode()); + } + + public function getContinentCode() + { + return Common::getContinent($this->details['location_country']); + } + + public function getCityName() + { + if (!empty($this->details['location_city'])) { + return $this->details['location_city']; + } + + return null; + } + + public function getRegionName() + { + $region = $this->getRegionCode(); + if ($region != '' && $region != Visit::UNKNOWN_CODE) { + return GeoIp::getRegionNameFromCodes( + $this->details['location_country'], $region); + } + + return null; + } + + public function getRegionCode() + { + return $this->details['location_region']; + } + + public function getPrettyLocation() + { + $parts = array(); + + $city = $this->getCityName(); + if (!empty($city)) { + $parts[] = $city; + } + $region = $this->getRegionName(); + if (!empty($region)) { + $parts[] = $region; + } + + // add country & return concatenated result + $parts[] = $this->getCountryName(); + + return implode(', ', $parts); + } + + public function getLatitude() + { + if (!empty($this->details['location_latitude'])) { + return $this->details['location_latitude']; + } + + return null; + } + + public function getLongitude() + { + if (!empty($this->details['location_longitude'])) { + return $this->details['location_longitude']; + } + + return null; + } +}
\ No newline at end of file diff --git a/plugins/UserCountryMap/Menu.php b/plugins/UserCountryMap/Menu.php index 298eda1e17..fa32a8f9b7 100644 --- a/plugins/UserCountryMap/Menu.php +++ b/plugins/UserCountryMap/Menu.php @@ -9,12 +9,16 @@ namespace Piwik\Plugins\UserCountryMap; use Piwik\Menu\MenuReporting; +use Piwik\Plugin\Manager as PluginManager; class Menu extends \Piwik\Plugin\Menu { public function configureReportingMenu(MenuReporting $menu) { - $menu->addVisitorsItem('UserCountryMap_RealTimeMap', - array('module' => 'UserCountryMap', 'action' => 'realtimeWorldMap'), $order = 70); + if (PluginManager::getInstance()->isPluginActivated('UserCountry')) { + $menu->addVisitorsItem('UserCountryMap_RealTimeMap', + array('module' => 'UserCountryMap', 'action' => 'realtimeWorldMap'), + $order = 70); + } } } diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 2ff43f1bbb..15f1d51d7e 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -12,6 +12,7 @@ use Piwik\FrontController; use Piwik\Piwik; use Piwik\Version; use Piwik\WidgetsList; +use Piwik\Plugin\Manager as PluginManager; /** */ @@ -34,8 +35,10 @@ class UserCountryMap extends \Piwik\Plugin public function postLoad() { - WidgetsList::add('General_Visitors', Piwik::translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); - WidgetsList::add('Live!', Piwik::translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); + if (PluginManager::getInstance()->isPluginActivated('UserCountry')) { + WidgetsList::add('General_Visitors', Piwik::translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); + WidgetsList::add('Live!', Piwik::translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); + } Piwik::addAction('Template.leftColumnUserCountry', array('Piwik\Plugins\UserCountryMap\UserCountryMap', 'insertMapInLocationReport')); } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 86bd119d13..ed2f945d22 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -36,10 +36,32 @@ class UserSettings extends \Piwik\Plugin public function getListHooksRegistered() { return array( - 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations' + 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', + 'Live.getAllVisitorDetails' => 'extendVisitorDetails' ); } + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['operatingSystem'] = $instance->getOperatingSystem(); + $visitor['operatingSystemCode'] = $instance->getOperatingSystemCode(); + $visitor['operatingSystemShortName'] = $instance->getOperatingSystemShortName(); + $visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon(); + $visitor['browserFamily'] = $instance->getBrowserFamily(); + $visitor['browserFamilyDescription'] = $instance->getBrowserFamilyDescription(); + $visitor['browserName'] = $instance->getBrowser(); + $visitor['browserIcon'] = $instance->getBrowserIcon(); + $visitor['browserCode'] = $instance->getBrowserCode(); + $visitor['browserVersion'] = $instance->getBrowserVersion(); + $visitor['screenType'] = $instance->getScreenType(); + $visitor['resolution'] = $instance->getResolution(); + $visitor['screenTypeIcon'] = $instance->getScreenTypeIcon(); + $visitor['plugins'] = $instance->getPlugins(); + $visitor['pluginsIcons'] = $instance->getPluginIcons(); + } + public function addMetricTranslations(&$translations) { $metrics = array( diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php new file mode 100644 index 0000000000..c474911d2e --- /dev/null +++ b/plugins/UserSettings/Visitor.php @@ -0,0 +1,145 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\UserSettings; + +require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; + +class Visitor +{ + const DELIMITER_PLUGIN_NAME = ", "; + + private $details = array(); + + public function __construct($details) + { + $this->details = $details; + } + + function getPlugins() + { + $plugins = array( + 'config_pdf', + 'config_flash', + 'config_java', + 'config_director', + 'config_quicktime', + 'config_realplayer', + 'config_windowsmedia', + 'config_gears', + 'config_silverlight', + ); + $pluginShortNames = array(); + + foreach ($plugins as $plugin) { + if (array_key_exists($plugin, $this->details) && $this->details[$plugin] == 1) { + $pluginShortName = substr($plugin, 7); + $pluginShortNames[] = $pluginShortName; + } + } + + return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames); + } + + function getPluginIcons() + { + $pluginNames = $this->getPlugins(); + if (!empty($pluginNames)) { + $pluginNames = explode(self::DELIMITER_PLUGIN_NAME, $pluginNames); + $pluginIcons = array(); + + foreach ($pluginNames as $plugin) { + $pluginIcons[] = array("pluginIcon" => getPluginsLogo($plugin), "pluginName" => $plugin); + } + + return $pluginIcons; + } + + return null; + } + + function getOperatingSystemCode() + { + return $this->details['config_os']; + } + + function getOperatingSystem() + { + return getOSLabel($this->details['config_os']); + } + + function getOperatingSystemShortName() + { + return getOSShortLabel($this->details['config_os']); + } + + function getOperatingSystemIcon() + { + return getOSLogo($this->details['config_os']); + } + + function getBrowserFamilyDescription() + { + return getBrowserTypeLabel($this->getBrowserFamily()); + } + + function getBrowserFamily() + { + return getBrowserFamily($this->details['config_browser_name']); + } + + function getBrowserCode() + { + return $this->details['config_browser_name']; + } + + function getBrowserVersion() + { + return $this->details['config_browser_version']; + } + + function getBrowser() + { + return getBrowserLabel($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + } + + function getBrowserIcon() + { + return getBrowsersLogo($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']); + } + + function getScreenType() + { + if (!array_key_exists('config_resolution', $this->details)) { + return null; + } + + return getScreenTypeFromResolution($this->details['config_resolution']); + } + + function getResolution() + { + if (!array_key_exists('config_resolution', $this->details)) { + return null; + } + + return $this->details['config_resolution']; + } + + function getScreenTypeIcon() + { + $type = $this->getScreenType(); + + if (empty($type)) { + return null; + } + + return getScreensLogo($type); + } + +}
\ No newline at end of file diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index 39ac47d536..08b7ad36e5 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -11,4 +11,20 @@ namespace Piwik\Plugins\VisitTime; // empty plugin definition, otherwise plugin won't be installed during test run class VisitTime extends \Piwik\Plugin { + /** + * @see Piwik\Plugin::getListHooksRegistered + */ + public function getListHooksRegistered() + { + return array( + 'Live.getAllVisitorDetails' => 'extendVisitorDetails', + ); + } + + public function extendVisitorDetails(&$visitor, $details) + { + $visitor['visitLocalTime'] = $details['visitor_localtime']; + $visitor['visitLocalHour'] = date('G', strtotime('2012-12-21 ' . $details['visitor_localtime'])); + } + } diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index 70f5c48e4f..b1efd31d0f 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -15,12 +15,19 @@ use Piwik\Piwik; use Piwik\Plugins\CoreVisualizations\Visualizations\Cloud; use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; -/** - * - */ class VisitorInterest extends \Piwik\Plugin { + /** + * @see Piwik\Plugin::getListHooksRegistered + */ + public function getListHooksRegistered() + { + return array( + 'Live.getAllVisitorDetails' => 'extendVisitorDetails', + ); + } + function postLoad() { Piwik::addAction('Template.headerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'headerVisitsFrequency')); @@ -40,4 +47,10 @@ class VisitorInterest extends \Piwik\Plugin $out .= FrontController::getInstance()->fetchDispatch('VisitorInterest', 'index'); $out .= '</div>'; } + + public function extendVisitorDetails(&$visitor, $details) + { + $visitor['daysSinceLastVisit'] = $details['visitor_days_since_last']; + } + } diff --git a/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php b/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php index 184806dcef..5ea77cca84 100644 --- a/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php +++ b/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php @@ -151,7 +151,7 @@ class Plugin_ActionDimensionTest extends \PHPUnit_Framework_TestCase $dimensions = ActionDimension::getAllDimensions(); - $this->assertGreaterThan(9, count($dimensions)); + $this->assertGreaterThan(8, count($dimensions)); foreach ($dimensions as $dimension) { $this->assertInstanceOf('\Piwik\Plugin\Dimension\ActionDimension', $dimension); diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 855e189c88..881d1f76f2 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -26,39 +17,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -70,6 +57,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -81,7 +79,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -95,6 +92,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -106,15 +106,6 @@ <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -127,39 +118,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -171,6 +158,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -182,7 +180,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -196,6 +193,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -207,15 +207,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>6</events> - <actions>6</actions> <actionDetails> <row> <type>event</type> @@ -296,39 +287,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -340,6 +327,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -351,7 +349,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -365,6 +362,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -376,15 +376,6 @@ <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -397,39 +388,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -441,6 +428,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -452,7 +450,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -466,6 +463,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -477,15 +477,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>13</events> - <actions>15</actions> <actionDetails> <row> <type>action</type> @@ -733,39 +724,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <searches>0</searches> + <actions>15</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3601</visitDuration> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -777,6 +764,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -788,7 +786,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -802,6 +799,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -813,15 +813,6 @@ <idVisit>10</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -834,39 +825,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -878,6 +865,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -889,7 +887,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -899,6 +896,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -910,15 +910,6 @@ <idVisit>9</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -931,39 +922,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -975,6 +962,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -986,7 +984,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -996,6 +993,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1007,15 +1007,6 @@ <idVisit>7</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>6</events> - <actions>6</actions> <actionDetails> <row> <type>event</type> @@ -1096,39 +1087,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1140,6 +1127,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1151,7 +1149,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1161,6 +1158,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1172,15 +1172,6 @@ <idVisit>8</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -1193,39 +1184,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1237,6 +1224,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1248,7 +1246,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1258,6 +1255,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1269,15 +1269,6 @@ <idVisit>6</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>13</events> - <actions>15</actions> <actionDetails> <row> <type>action</type> @@ -1525,39 +1516,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <searches>0</searches> + <actions>15</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3601</visitDuration> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1569,6 +1556,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1580,7 +1578,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1590,6 +1587,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 855e189c88..881d1f76f2 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -26,39 +17,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -70,6 +57,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -81,7 +79,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -95,6 +92,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -106,15 +106,6 @@ <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -127,39 +118,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -171,6 +158,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -182,7 +180,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -196,6 +193,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -207,15 +207,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>6</events> - <actions>6</actions> <actionDetails> <row> <type>event</type> @@ -296,39 +287,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -340,6 +327,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -351,7 +349,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -365,6 +362,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -376,15 +376,6 @@ <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -397,39 +388,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -441,6 +428,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -452,7 +450,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -466,6 +463,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -477,15 +477,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>13</events> - <actions>15</actions> <actionDetails> <row> <type>action</type> @@ -733,39 +724,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <searches>0</searches> + <actions>15</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3601</visitDuration> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -777,6 +764,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -788,7 +786,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -802,6 +799,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -813,15 +813,6 @@ <idVisit>10</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -834,39 +825,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -878,6 +865,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -889,7 +887,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -899,6 +896,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -910,15 +910,6 @@ <idVisit>9</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -931,39 +922,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -975,6 +962,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -986,7 +984,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -996,6 +993,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1007,15 +1007,6 @@ <idVisit>7</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>6</events> - <actions>6</actions> <actionDetails> <row> <type>event</type> @@ -1096,39 +1087,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3481</visitDuration> + <visitDurationPretty>58 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>6</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1140,6 +1127,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1151,7 +1149,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1161,6 +1158,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1172,15 +1172,6 @@ <idVisit>8</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>1</actions> <actionDetails> <row> <type>event</type> @@ -1193,39 +1184,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>1</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1237,6 +1224,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1248,7 +1246,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1258,6 +1255,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1269,15 +1269,6 @@ <idVisit>6</idVisit> <visitIp>111.1.1.1</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>13</events> - <actions>15</actions> <actionDetails> <row> <type>action</type> @@ -1525,39 +1516,35 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Visit Scope Custom var</customVariableName1> - <customVariableValue1>should not appear in events report Bis</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <searches>0</searches> + <actions>15</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>3601</visitDuration> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Visit Scope Custom var</customVariableName1> + <customVariableValue1>should not appear in events report Bis</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>13</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1569,6 +1556,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1580,7 +1578,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -1590,6 +1587,9 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 14213e25ad..d9a07b4a59 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -5,15 +5,6 @@ <idVisit>40</idVisit> <visitIp>174.97.139.63</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -42,39 +33,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:34:49</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>77</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>North Carolina</region> - <regionCode>NC</regionCode> - <city>Raleigh</city> - <location>Raleigh, North Carolina, United States</location> - <latitude>35.771999</latitude> - <longitude>-78.639000</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -86,6 +73,17 @@ <referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>North Carolina</region> + <regionCode>NC</regionCode> + <city>Raleigh</city> + <location>Raleigh, North Carolina, United States</location> + <latitude>35.771999</latitude> + <longitude>-78.639000</longitude> <operatingSystem>Windows 8</operatingSystem> <operatingSystemCode>WI8</operatingSystemCode> <operatingSystemShortName>Win 8</operatingSystemShortName> @@ -97,7 +95,6 @@ <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1366x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java</plugins> @@ -115,6 +112,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:34:49</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -126,15 +126,6 @@ <idVisit>33</idVisit> <visitIp>206.190.75.8</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>2</actions> <actionDetails> <row> <type>action</type> @@ -179,39 +170,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>17:33:27</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - - <visitDuration>81</visitDuration> - <visitDurationPretty>1 min 21s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> - <daysSinceLastVisit>181</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>181</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>California</region> - <regionCode>CA</regionCode> - <city>Lake Forest</city> - <location>Lake Forest, California, United States</location> - <latitude>33.645000</latitude> - <longitude>-117.679001</longitude> + <visitDuration>81</visitDuration> + <visitDurationPretty>1 min 21s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -223,6 +210,17 @@ <referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>California</region> + <regionCode>CA</regionCode> + <city>Lake Forest</city> + <location>Lake Forest, California, United States</location> + <latitude>33.645000</latitude> + <longitude>-117.679001</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -234,11 +232,13 @@ <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1536x864</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>181</daysSinceLastVisit> + <visitLocalTime>17:33:27</visitLocalTime> + <visitLocalHour>17</visitLocalHour> @@ -250,15 +250,6 @@ <idVisit>39</idVisit> <visitIp>193.159.20.129</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -287,43 +278,39 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - <row> - <customVariableName2>Demo language</customVariableName2> - <customVariableValue2>English</customVariableValue2> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:34:37</visitLocalTime> - <visitLocalHour>1</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>4</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Germany</country> - <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Germany</location> - <latitude>51</latitude> - <longitude>9</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + <row> + <customVariableName2>Demo language</customVariableName2> + <customVariableValue2>English</customVariableValue2> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -335,6 +322,17 @@ <referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Germany</country> + <countryCode>de</countryCode> + <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Germany</location> + <latitude>51</latitude> + <longitude>9</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -346,7 +344,6 @@ <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1920x1200</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, silverlight</plugins> @@ -372,6 +369,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>4</daysSinceLastVisit> + <visitLocalTime>01:34:37</visitLocalTime> + <visitLocalHour>1</visitLocalHour> @@ -383,15 +383,6 @@ <idVisit>37</idVisit> <visitIp>50.244.17.130</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>2</actions> <actionDetails> <row> <type>action</type> @@ -436,39 +427,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>19:34:01</visitLocalTime> - <visitLocalHour>19</visitLocalHour> - - <visitDuration>34</visitDuration> - <visitDurationPretty>34s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>7</visitCount> - <daysSinceLastVisit>6</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>17</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>United States</location> - <latitude>38</latitude> - <longitude>-97</longitude> + <visitDuration>34</visitDuration> + <visitDurationPretty>34s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -480,6 +467,17 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -491,7 +489,6 @@ <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>2880x1800</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime</plugins> @@ -513,6 +510,9 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>6</daysSinceLastVisit> + <visitLocalTime>19:34:01</visitLocalTime> + <visitLocalHour>19</visitLocalHour> @@ -524,15 +524,6 @@ <idVisit>38</idVisit> <visitIp>84.194.72.21</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>outlink</type> @@ -550,39 +541,35 @@ <icon>plugins/Morpheus/images/link.gif</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:34:24</visitLocalTime> - <visitLocalHour>1</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Belgium</country> - <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> - <region>Limburg</region> - <regionCode>05</regionCode> - <city>Maaseik</city> - <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> - <longitude>5.800000</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -594,6 +581,17 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Belgium</country> + <countryCode>be</countryCode> + <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <region>Limburg</region> + <regionCode>05</regionCode> + <city>Maaseik</city> + <location>Maaseik, Limburg, Belgium</location> + <latitude>51.099998</latitude> + <longitude>5.800000</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -605,7 +603,6 @@ <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> @@ -627,6 +624,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>01:34:24</visitLocalTime> + <visitLocalHour>1</visitLocalHour> @@ -638,15 +638,6 @@ <idVisit>36</idVisit> <visitIp>108.211.181.12</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -675,39 +666,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>17:33:58</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>California</region> - <regionCode>CA</regionCode> - <city>San Francisco</city> - <location>San Francisco, California, United States</location> - <latitude>37.792000</latitude> - <longitude>-122.408997</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -719,6 +706,17 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>California</region> + <regionCode>CA</regionCode> + <city>San Francisco</city> + <location>San Francisco, California, United States</location> + <latitude>37.792000</latitude> + <longitude>-122.408997</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -730,7 +728,6 @@ <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1360x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> @@ -760,6 +757,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>17:33:58</visitLocalTime> + <visitLocalHour>17</visitLocalHour> @@ -771,15 +771,6 @@ <idVisit>35</idVisit> <visitIp>219.101.46.222</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -807,39 +798,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>09:33:50</visitLocalTime> - <visitLocalHour>9</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>4</visitCount> - <daysSinceLastVisit>1</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>3</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region>Kanagawa</region> - <regionCode>19</regionCode> - <city>Nihon'odori</city> - <location>Nihon'odori, Kanagawa, Japan</location> - <latitude>35.450001</latitude> - <longitude>139.649994</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -851,6 +838,17 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region>Kanagawa</region> + <regionCode>19</regionCode> + <city>Nihon'odori</city> + <location>Nihon'odori, Kanagawa, Japan</location> + <latitude>35.450001</latitude> + <longitude>139.649994</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -862,7 +860,6 @@ <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>2560x1440</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, java, quicktime</plugins> @@ -880,6 +877,9 @@ <pluginName>quicktime</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>1</daysSinceLastVisit> + <visitLocalTime>09:33:50</visitLocalTime> + <visitLocalHour>9</visitLocalHour> @@ -891,15 +891,6 @@ <idVisit>34</idVisit> <visitIp>80.136.160.65</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -928,39 +919,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:33:31</visitLocalTime> - <visitLocalHour>1</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Germany</country> - <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> - <region>Nordrhein-Westfalen</region> - <regionCode>07</regionCode> - <city>Weilerswist</city> - <location>Weilerswist, Nordrhein-Westfalen, Germany</location> - <latitude>50.766998</latitude> - <longitude>6.833000</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Unknown</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -972,6 +959,17 @@ <referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Germany</country> + <countryCode>de</countryCode> + <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <region>Nordrhein-Westfalen</region> + <regionCode>07</regionCode> + <city>Weilerswist</city> + <location>Weilerswist, Nordrhein-Westfalen, Germany</location> + <latitude>50.766998</latitude> + <longitude>6.833000</longitude> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemShortName>Android</operatingSystemShortName> @@ -983,7 +981,6 @@ <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <screenType>mobile</screenType> - <deviceType>Unknown</deviceType> <resolution>360x640</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon> <plugins>flash</plugins> @@ -993,6 +990,9 @@ <pluginName>flash</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>01:33:31</visitLocalTime> + <visitLocalHour>1</visitLocalHour> @@ -1004,15 +1004,6 @@ <idVisit>32</idVisit> <visitIp>188.107.238.9</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1041,39 +1032,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:33:13</visitLocalTime> - <visitLocalHour>1</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>3</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>1</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Germany</country> - <countryCode>de</countryCode> - <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> - <region>Rheinland-Pfalz</region> - <regionCode>08</regionCode> - <city>Mainz</city> - <location>Mainz, Rheinland-Pfalz, Germany</location> - <latitude>50</latitude> - <longitude>8.271000</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1085,6 +1072,17 @@ <referrerUrl>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Germany</country> + <countryCode>de</countryCode> + <countryFlag>plugins/UserCountry/images/flags/de.png</countryFlag> + <region>Rheinland-Pfalz</region> + <regionCode>08</regionCode> + <city>Mainz</city> + <location>Mainz, Rheinland-Pfalz, Germany</location> + <latitude>50</latitude> + <longitude>8.271000</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -1096,7 +1094,6 @@ <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>2560x1440</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> @@ -1126,6 +1123,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>3</daysSinceLastVisit> + <visitLocalTime>01:33:13</visitLocalTime> + <visitLocalHour>1</visitLocalHour> @@ -1137,15 +1137,6 @@ <idVisit>30</idVisit> <visitIp>93.80.130.163</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>3</actions> <actionDetails> <row> <type>action</type> @@ -1209,39 +1200,35 @@ <icon>plugins/Morpheus/images/download.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>04:28:18</visitLocalTime> - <visitLocalHour>4</visitLocalHour> - - <visitDuration>10</visitDuration> - <visitDurationPretty>10s</visitDurationPretty> + <searches>0</searches> + <actions>3</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Russian Federation</country> - <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> - <region>Moscow City</region> - <regionCode>48</regionCode> - <city>Moscow</city> - <location>Moscow, Moscow City, Russian Federation</location> - <latitude>55.751999</latitude> - <longitude>37.616001</longitude> + <visitDuration>10</visitDuration> + <visitDurationPretty>10s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1253,6 +1240,17 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Russian Federation</country> + <countryCode>ru</countryCode> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> + <region>Moscow City</region> + <regionCode>48</regionCode> + <city>Moscow</city> + <location>Moscow, Moscow City, Russian Federation</location> + <latitude>55.751999</latitude> + <longitude>37.616001</longitude> <operatingSystem>Windows 8</operatingSystem> <operatingSystemCode>WI8</operatingSystemCode> <operatingSystemShortName>Win 8</operatingSystemShortName> @@ -1264,7 +1262,6 @@ <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1278,6 +1275,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>04:28:18</visitLocalTime> + <visitLocalHour>4</visitLocalHour> @@ -1289,15 +1289,6 @@ <idVisit>31</idVisit> <visitIp>176.41.226.154</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1326,39 +1317,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>02:32:21</visitLocalTime> - <visitLocalHour>2</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>5</visitCount> - <daysSinceLastVisit>8</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>30</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Turkey</country> - <countryCode>tr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/tr.png</countryFlag> - <region>Rize</region> - <regionCode>53</regionCode> - <city>Esentepe</city> - <location>Esentepe, Rize, Turkey</location> - <latitude>40.979000</latitude> - <longitude>40.415001</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1370,6 +1357,17 @@ <referrerUrl>http://piwik.org/docs/installation/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Turkey</country> + <countryCode>tr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/tr.png</countryFlag> + <region>Rize</region> + <regionCode>53</regionCode> + <city>Esentepe</city> + <location>Esentepe, Rize, Turkey</location> + <latitude>40.979000</latitude> + <longitude>40.415001</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -1381,7 +1379,6 @@ <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1366x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> @@ -1403,6 +1400,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>8</daysSinceLastVisit> + <visitLocalTime>02:32:21</visitLocalTime> + <visitLocalHour>2</visitLocalHour> @@ -1414,15 +1414,6 @@ <idVisit>29</idVisit> <visitIp>84.194.72.21</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1451,39 +1442,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Domain landed</customVariableName1> - <customVariableValue1>piwik.org</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:34:18</visitLocalTime> - <visitLocalHour>1</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Belgium</country> - <countryCode>be</countryCode> - <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> - <region>Limburg</region> - <regionCode>05</regionCode> - <city>Maaseik</city> - <location>Maaseik, Limburg, Belgium</location> - <latitude>51.099998</latitude> - <longitude>5.800000</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1495,6 +1482,17 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Belgium</country> + <countryCode>be</countryCode> + <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <region>Limburg</region> + <regionCode>05</regionCode> + <city>Maaseik</city> + <location>Maaseik, Limburg, Belgium</location> + <latitude>51.099998</latitude> + <longitude>5.800000</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -1506,7 +1504,6 @@ <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1920x1080</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> @@ -1528,6 +1525,9 @@ <pluginName>silverlight</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>01:34:18</visitLocalTime> + <visitLocalHour>1</visitLocalHour> @@ -1539,15 +1539,6 @@ <idVisit>41</idVisit> <visitIp>175.41.192.40</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>10</actions> <actionDetails> <row> <type>goal</type> @@ -1738,35 +1729,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:10:38</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>54</visitDuration> - <visitDurationPretty>54s</visitDurationPretty> + <searches>0</searches> + <actions>10</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>54</visitDuration> + <visitDurationPretty>54s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Unknown</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1778,6 +1765,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> @@ -1789,11 +1787,13 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>unknown</screenType> - <deviceType>Unknown</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>08:10:38</visitLocalTime> + <visitLocalHour>8</visitLocalHour> @@ -1805,15 +1805,6 @@ <idVisit>26</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1849,39 +1840,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -1893,6 +1880,17 @@ <referrerUrl>http://piwik.org/contribute%</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -1904,7 +1902,6 @@ <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1918,6 +1915,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -1929,15 +1929,6 @@ <idVisit>27</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1965,39 +1956,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName3>Forum status</customVariableName3> - <customVariableValue3>Anonymous</customVariableValue3> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:00:47</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>444</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>444</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2009,6 +1996,17 @@ <referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -2020,7 +2018,6 @@ <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <screenType>wide</screenType> - <deviceType>Desktop</deviceType> <resolution>1280x800</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> @@ -2050,6 +2047,9 @@ <pluginName>gears</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>444</daysSinceLastVisit> + <visitLocalTime>08:00:47</visitLocalTime> + <visitLocalHour>8</visitLocalHour> @@ -2061,15 +2061,6 @@ <idVisit>25</idVisit> <visitIp>175.41.192.41</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2097,39 +2088,35 @@ <icon /> </row> </actionDetails> - <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> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:15:41</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2141,6 +2128,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -2152,11 +2150,13 @@ <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:15:41</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -2168,15 +2168,6 @@ <idVisit>24</idVisit> <visitIp>175.41.192.43</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>2</actions> <actionDetails> <row> <type>action</type> @@ -2221,39 +2212,35 @@ <icon /> </row> </actionDetails> - <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> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>19:12:40</visitLocalTime> - <visitLocalHour>19</visitLocalHour> - - <visitDuration>182</visitDuration> - <visitDurationPretty>3 min 2s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>182</visitDuration> + <visitDurationPretty>3 min 2s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2265,6 +2252,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -2276,11 +2274,13 @@ <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>19:12:40</visitLocalTime> + <visitLocalHour>19</visitLocalHour> @@ -2292,15 +2292,6 @@ <idVisit>23</idVisit> <visitIp>175.41.192.42</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>3</actions> <actionDetails> <row> <type>download</type> @@ -2352,39 +2343,35 @@ <icon>plugins/Morpheus/images/download.png</icon> </row> </actionDetails> - <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> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>18:10:38</visitLocalTime> - <visitLocalHour>18</visitLocalHour> - - <visitDuration>123</visitDuration> - <visitDurationPretty>2 min 3s</visitDurationPretty> + <searches>0</searches> + <actions>3</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>123</visitDuration> + <visitDurationPretty>2 min 3s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2396,6 +2383,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -2407,11 +2405,13 @@ <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>18:10:38</visitLocalTime> + <visitLocalHour>18</visitLocalHour> @@ -2423,15 +2423,6 @@ <idVisit>22</idVisit> <visitIp>72.44.32.11</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2459,39 +2450,35 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Bot</customVariableName1> - <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>17:48:08</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>Virginia</region> - <regionCode>VA</regionCode> - <city>Ashburn</city> - <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Bot</customVariableName1> + <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> + </row> + </customVariables> + <deviceType>Unknown</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2503,6 +2490,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <latitude>39.043999</latitude> + <longitude>-77.487999</longitude> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemShortName>BOT</operatingSystemShortName> @@ -2514,11 +2512,13 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>unknown</screenType> - <deviceType>Unknown</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>17:48:08</visitLocalTime> + <visitLocalHour>17</visitLocalHour> @@ -2530,15 +2530,6 @@ <idVisit>21</idVisit> <visitIp>72.44.32.11</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2566,39 +2557,35 @@ <icon /> </row> </actionDetails> - <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> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>17:48:07</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>Virginia</region> - <regionCode>VA</regionCode> - <city>Ashburn</city> - <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2610,6 +2597,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <latitude>39.043999</latitude> + <longitude>-77.487999</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -2621,11 +2619,13 @@ <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>17:48:07</visitLocalTime> + <visitLocalHour>17</visitLocalHour> @@ -2637,15 +2637,6 @@ <idVisit>18</idVisit> <visitIp>1.2.3.4</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>download</type> @@ -2663,39 +2654,35 @@ <icon>plugins/Morpheus/images/download.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Not-Bot</customVariableName1> - <customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>17:46:03</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Oceania</continent> - <continentCode>oce</continentCode> - <country>Australia</country> - <countryCode>au</countryCode> - <countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Australia</location> - <latitude>-27</latitude> - <longitude>133</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1> + </row> + </customVariables> + <deviceType>Unknown</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2707,6 +2694,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Oceania</continent> + <continentCode>oce</continentCode> + <country>Australia</country> + <countryCode>au</countryCode> + <countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Australia</location> + <latitude>-27</latitude> + <longitude>133</longitude> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemShortName>Unknown</operatingSystemShortName> @@ -2718,11 +2716,13 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>unknown</screenType> - <deviceType>Unknown</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>17:46:03</visitLocalTime> + <visitLocalHour>17</visitLocalHour> @@ -2734,15 +2734,6 @@ <idVisit>20</idVisit> <visitIp>175.41.192.41</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2770,39 +2761,35 @@ <icon /> </row> </actionDetails> - <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> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>16:11:30</visitLocalTime> - <visitLocalHour>16</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <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> + <deviceType>Smartphone</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2814,6 +2801,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemShortName>Android</operatingSystemShortName> @@ -2825,11 +2823,13 @@ <browserCode>AN</browserCode> <browserVersion /> <screenType>unknown</screenType> - <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>16:11:30</visitLocalTime> + <visitLocalHour>16</visitLocalHour> @@ -2841,15 +2841,6 @@ <idVisit>19</idVisit> <visitIp>175.41.192.41</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2877,39 +2868,35 @@ <icon /> </row> </actionDetails> - <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> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>16:10:38</visitLocalTime> - <visitLocalHour>16</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <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> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -2921,6 +2908,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -2932,11 +2930,13 @@ <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>16:10:38</visitLocalTime> + <visitLocalHour>16</visitLocalHour> @@ -2948,15 +2948,6 @@ <idVisit>17</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -2984,35 +2975,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>15:31:05</visitLocalTime> - <visitLocalHour>15</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3024,6 +3011,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -3035,11 +3033,13 @@ <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>15:31:05</visitLocalTime> + <visitLocalHour>15</visitLocalHour> @@ -3051,15 +3051,6 @@ <idVisit>16</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3087,35 +3078,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>13:49:46</visitLocalTime> - <visitLocalHour>13</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3127,6 +3114,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -3138,11 +3136,13 @@ <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>13:49:46</visitLocalTime> + <visitLocalHour>13</visitLocalHour> @@ -3154,15 +3154,6 @@ <idVisit>15</idVisit> <visitIp>177.71.128.21</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3190,35 +3181,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:22:08</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>South America</continent> - <continentCode>ams</continentCode> - <country>Brazil</country> - <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Brazil</location> - <latitude>-10</latitude> - <longitude>-55</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3230,6 +3217,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>South America</continent> + <continentCode>ams</continentCode> + <country>Brazil</country> + <countryCode>br</countryCode> + <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Brazil</location> + <latitude>-10</latitude> + <longitude>-55</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -3241,11 +3239,13 @@ <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:22:08</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -3257,15 +3257,6 @@ <idVisit>14</idVisit> <visitIp>177.71.128.21</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3293,35 +3284,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:21:28</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>South America</continent> - <continentCode>ams</continentCode> - <country>Brazil</country> - <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Brazil</location> - <latitude>-10</latitude> - <longitude>-55</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3333,6 +3320,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>South America</continent> + <continentCode>ams</continentCode> + <country>Brazil</country> + <countryCode>br</countryCode> + <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Brazil</location> + <latitude>-10</latitude> + <longitude>-55</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -3344,11 +3342,13 @@ <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:21:28</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -3360,15 +3360,6 @@ <idVisit>13</idVisit> <visitIp>177.71.128.21</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3396,35 +3387,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:21:03</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>South America</continent> - <continentCode>ams</continentCode> - <country>Brazil</country> - <countryCode>br</countryCode> - <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Brazil</location> - <latitude>-10</latitude> - <longitude>-55</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3436,6 +3423,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>South America</continent> + <continentCode>ams</continentCode> + <country>Brazil</country> + <countryCode>br</countryCode> + <countryFlag>plugins/UserCountry/images/flags/br.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Brazil</location> + <latitude>-10</latitude> + <longitude>-55</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -3447,11 +3445,13 @@ <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:21:03</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -3463,15 +3463,6 @@ <idVisit>12</idVisit> <visitIp>175.41.192.34</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3499,35 +3490,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:01:17</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3539,6 +3526,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -3550,11 +3548,13 @@ <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:01:17</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -3566,15 +3566,6 @@ <idVisit>11</idVisit> <visitIp>175.41.192.34</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3602,35 +3593,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>19:59:50</visitLocalTime> - <visitLocalHour>19</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3642,6 +3629,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -3653,11 +3651,13 @@ <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>19:59:50</visitLocalTime> + <visitLocalHour>19</visitLocalHour> @@ -3669,15 +3669,6 @@ <idVisit>10</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3705,35 +3696,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>18:03:40</visitLocalTime> - <visitLocalHour>18</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3745,6 +3732,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -3756,11 +3754,13 @@ <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>18:03:40</visitLocalTime> + <visitLocalHour>18</visitLocalHour> @@ -3772,15 +3772,6 @@ <idVisit>9</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3808,35 +3799,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>21:00:42</visitLocalTime> - <visitLocalHour>21</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3848,6 +3835,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -3859,11 +3857,13 @@ <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>21:00:42</visitLocalTime> + <visitLocalHour>21</visitLocalHour> @@ -3875,15 +3875,6 @@ <idVisit>8</idVisit> <visitIp>0.0.0.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -3911,35 +3902,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>20:56:45</visitLocalTime> - <visitLocalHour>20</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -3951,6 +3938,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -3962,11 +3960,13 @@ <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>20:56:45</visitLocalTime> + <visitLocalHour>20</visitLocalHour> @@ -3978,15 +3978,6 @@ <idVisit>7</idVisit> <visitIp>72.44.32.10</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4014,35 +4005,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>13:49:48</visitLocalTime> - <visitLocalHour>13</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>Virginia</region> - <regionCode>VA</regionCode> - <city>Ashburn</city> - <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4054,6 +4041,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <latitude>39.043999</latitude> + <longitude>-77.487999</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -4065,11 +4063,13 @@ <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>13:49:48</visitLocalTime> + <visitLocalHour>13</visitLocalHour> @@ -4081,15 +4081,6 @@ <idVisit>6</idVisit> <visitIp>72.44.32.10</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4117,35 +4108,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>13:48:20</visitLocalTime> - <visitLocalHour>13</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>Virginia</region> - <regionCode>VA</regionCode> - <city>Ashburn</city> - <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4157,6 +4144,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <latitude>39.043999</latitude> + <longitude>-77.487999</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -4168,11 +4166,13 @@ <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>13:48:20</visitLocalTime> + <visitLocalHour>13</visitLocalHour> @@ -4184,15 +4184,6 @@ <idVisit>5</idVisit> <visitIp>72.44.32.10</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4220,35 +4211,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>13:48:07</visitLocalTime> - <visitLocalHour>13</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>North America</continent> - <continentCode>amn</continentCode> - <country>United States</country> - <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> - <region>Virginia</region> - <regionCode>VA</regionCode> - <city>Ashburn</city> - <location>Ashburn, Virginia, United States</location> - <latitude>39.043999</latitude> - <longitude>-77.487999</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4260,6 +4247,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <latitude>39.043999</latitude> + <longitude>-77.487999</longitude> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> <operatingSystemShortName>Win 7</operatingSystemShortName> @@ -4271,11 +4269,13 @@ <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>13:48:07</visitLocalTime> + <visitLocalHour>13</visitLocalHour> @@ -4287,15 +4287,6 @@ <idVisit>4</idVisit> <visitIp>175.41.192.40</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4323,35 +4314,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:12:03</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4363,6 +4350,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -4374,11 +4372,13 @@ <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>08:12:03</visitLocalTime> + <visitLocalHour>8</visitLocalHour> @@ -4390,15 +4390,6 @@ <idVisit>3</idVisit> <visitIp>175.41.192.40</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4426,35 +4417,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:11:56</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4466,6 +4453,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemShortName>Linux</operatingSystemShortName> @@ -4477,11 +4475,13 @@ <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>08:11:56</visitLocalTime> + <visitLocalHour>8</visitLocalHour> @@ -4493,15 +4493,6 @@ <idVisit>2</idVisit> <visitIp>175.41.192.40</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4529,35 +4520,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:11:30</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Smartphone</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4569,6 +4556,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemShortName>Android</operatingSystemShortName> @@ -4580,11 +4578,13 @@ <browserCode>AN</browserCode> <browserVersion /> <screenType>unknown</screenType> - <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>08:11:30</visitLocalTime> + <visitLocalHour>8</visitLocalHour> @@ -4596,15 +4596,6 @@ <idVisit>1</idVisit> <visitIp>175.41.192.40</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -4632,35 +4623,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>08:10:38</visitLocalTime> - <visitLocalHour>8</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Asia</continent> - <continentCode>asi</continentCode> - <country>Japan</country> - <countryCode>jp</countryCode> - <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Japan</location> - <latitude>36</latitude> - <longitude>138</longitude> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -4672,6 +4659,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <latitude>36</latitude> + <longitude>138</longitude> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemShortName>Mac OS</operatingSystemShortName> @@ -4683,11 +4681,13 @@ <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>08:10:38</visitLocalTime> + <visitLocalHour>8</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 2727057123..4408e7c64a 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>1</idVisit> <visitIp>1.2.4.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -45,32 +36,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>United Kingdom</country> @@ -82,9 +54,20 @@ <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> <latitude>123.456001</latitude> <longitude>21.320999</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -104,7 +87,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -118,6 +100,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -129,15 +129,6 @@ <idVisit>2</idVisit> <visitIp>1.2.4.0</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -200,32 +191,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>United Kingdom</country> @@ -237,9 +209,20 @@ <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> <latitude>123.456001</latitude> <longitude>21.320999</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -259,7 +242,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -273,6 +255,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -284,15 +284,6 @@ <idVisit>19</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -324,32 +315,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -361,9 +333,20 @@ <location>Besançon, Franche-Comte, France</location> <latitude>47.249001</latitude> <longitude>6.018000</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -383,7 +366,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -397,6 +379,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -408,15 +408,6 @@ <idVisit>20</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -479,32 +470,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -516,9 +488,20 @@ <location>Besançon, Franche-Comte, France</location> <latitude>47.249001</latitude> <longitude>6.018000</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -538,7 +521,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -552,6 +534,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -563,15 +563,6 @@ <idVisit>23</idVisit> <visitIp>137.82.130.0</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -603,32 +594,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>Canada</country> @@ -640,9 +612,20 @@ <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -662,7 +645,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -676,6 +658,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> @@ -687,15 +687,6 @@ <idVisit>24</idVisit> <visitIp>137.82.130.0</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -758,24 +749,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>Canada</country> @@ -787,9 +767,20 @@ <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> <longitude>-123.133003</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -809,7 +800,6 @@ <browserCode>UNK</browserCode> <browserVersion /> <screenType>normal</screenType> - <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -823,6 +813,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Unknown</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -834,15 +834,6 @@ <idVisit>31</idVisit> <visitIp>151.100.101.92</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -874,32 +865,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 0</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 0</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Italy</country> @@ -911,9 +883,20 @@ <location>Italy</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -933,7 +916,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -947,6 +929,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 0</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 0</customVariableValue5> + </row> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index c0d4797c43..ea82d9aff4 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -35,24 +26,13 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -64,9 +44,20 @@ <location>not a city, California, United States</location> <latitude>1</latitude> <longitude>2</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -86,7 +77,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -100,6 +90,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -111,15 +111,6 @@ <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -182,32 +173,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -219,9 +191,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -241,7 +224,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -255,6 +237,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -266,15 +266,6 @@ <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -306,32 +297,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -343,9 +315,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -365,7 +348,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -379,6 +361,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -390,15 +390,6 @@ <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -444,32 +435,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -481,9 +453,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -503,7 +486,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -517,6 +499,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -528,15 +528,6 @@ <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -568,32 +559,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -605,9 +577,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -627,7 +610,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -641,6 +623,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -652,15 +652,6 @@ <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -723,32 +714,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -760,9 +732,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -782,7 +765,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -796,6 +778,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -807,15 +807,6 @@ <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -847,32 +838,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -884,9 +856,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -906,7 +889,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -920,6 +902,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 6ee83fc954..7401c4085e 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -76,32 +67,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -113,9 +85,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -135,7 +118,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -149,6 +131,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -160,15 +160,6 @@ <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -200,32 +191,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -237,9 +209,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -259,7 +242,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -273,6 +255,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -284,15 +284,6 @@ <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -355,32 +346,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -392,9 +364,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -414,7 +397,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -428,6 +410,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -439,15 +439,6 @@ <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -493,32 +484,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -530,9 +502,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -552,7 +535,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -566,6 +548,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -577,15 +577,6 @@ <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -617,32 +608,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -654,9 +626,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -676,7 +659,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -690,6 +672,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -701,15 +701,6 @@ <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -741,32 +732,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -778,9 +750,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -800,7 +783,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -814,6 +796,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -825,15 +825,6 @@ <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -855,24 +846,13 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -884,9 +864,20 @@ <location>not a city, California, United States</location> <latitude>1</latitude> <longitude>2</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -906,7 +897,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -920,6 +910,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index c0d4797c43..ea82d9aff4 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -35,24 +26,13 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -64,9 +44,20 @@ <location>not a city, California, United States</location> <latitude>1</latitude> <longitude>2</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -86,7 +77,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -100,6 +90,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -111,15 +111,6 @@ <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -182,32 +173,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -219,9 +191,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -241,7 +224,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -255,6 +237,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -266,15 +266,6 @@ <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -306,32 +297,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -343,9 +315,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -365,7 +348,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -379,6 +361,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -390,15 +390,6 @@ <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -444,32 +435,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -481,9 +453,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -503,7 +486,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -517,6 +499,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -528,15 +528,6 @@ <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -568,32 +559,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -605,9 +577,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -627,7 +610,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -641,6 +623,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -652,15 +652,6 @@ <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -723,32 +714,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -760,9 +732,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -782,7 +765,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -796,6 +778,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -807,15 +807,6 @@ <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -847,32 +838,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -884,9 +856,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -906,7 +889,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -920,6 +902,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 366afa0eb3..6bcf877487 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -5,15 +5,6 @@ <idVisit>35</idVisit> <visitIp>194.57.91.215</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -35,24 +26,13 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -64,9 +44,20 @@ <location>not a city, California, United States</location> <latitude>1</latitude> <longitude>2</longitude> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -86,7 +77,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -100,6 +90,16 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + </customVariables> @@ -111,15 +111,6 @@ <idVisit>18</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -182,32 +173,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -219,9 +191,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -241,7 +224,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -255,6 +237,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -266,15 +266,6 @@ <idVisit>17</idVisit> <visitIp>1.2.4.8</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -306,32 +297,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 8</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 8</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -343,9 +315,20 @@ <location>Unknown</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -365,7 +348,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -379,6 +361,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 8</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 8</customVariableValue5> + </row> + </customVariables> @@ -390,15 +390,6 @@ <idVisit>16</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -444,32 +435,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -481,9 +453,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -503,7 +486,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -517,6 +499,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -528,15 +528,6 @@ <idVisit>15</idVisit> <visitIp>1.2.4.7</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -568,32 +559,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 7</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 7</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> @@ -605,9 +577,20 @@ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -627,7 +610,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -641,6 +623,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 7</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 7</customVariableValue5> + </row> + </customVariables> @@ -652,15 +652,6 @@ <idVisit>14</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -723,32 +714,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -760,9 +732,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -782,7 +765,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -796,6 +778,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -807,15 +807,6 @@ <idVisit>13</idVisit> <visitIp>1.2.4.6</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -847,32 +838,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 6</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 6</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -884,9 +856,20 @@ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -906,7 +889,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -920,6 +902,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 6</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 6</customVariableValue5> + </row> + </customVariables> @@ -931,15 +931,6 @@ <idVisit>12</idVisit> <visitIp>1.2.4.5</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>1</events> - <actions>2</actions> <actionDetails> <row> <type>goal</type> @@ -985,32 +976,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 5</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 5</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -1022,9 +994,20 @@ <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1044,7 +1027,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1058,6 +1040,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 5</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 5</customVariableValue5> + </row> + </customVariables> @@ -1069,15 +1069,6 @@ <idVisit>11</idVisit> <visitIp>1.2.4.5</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -1109,32 +1100,13 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 5</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 5</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>11</daysSinceLastVisit> - <daysSinceFirstVisit>101</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -1146,9 +1118,20 @@ <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location> <latitude /> <longitude /> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1168,7 +1151,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1182,6 +1164,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>11</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 5</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 5</customVariableValue5> + </row> + </customVariables> @@ -1193,15 +1193,6 @@ <idVisit>10</idVisit> <visitIp>1.2.4.4</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>1</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -1264,32 +1255,13 @@ <icon>plugins/Morpheus/images/event.png</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>Cvar 1 name</customVariableName1> - <customVariableValue1>Cvar1 value is 4</customVariableValue1> - </row> - <row> - <customVariableName5>Cvar 5 name</customVariableName5> - <customVariableValue5>Cvar5 value is 4</customVariableValue5> - </row> - </customVariables> <goalConversions>2</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> - <visitCount>5</visitCount> - <daysSinceLastVisit>10</daysSinceLastVisit> - <daysSinceFirstVisit>100</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <continent>Europe</continent> <continentCode>eur</continentCode> <country>United Kingdom</country> @@ -1301,9 +1273,20 @@ <location>Stratford-upon-Avon, Kent, United Kingdom</location> <latitude /> <longitude /> - <provider>awesomeisp.com</provider> - <providerName>Awesomeisp</providerName> - <providerUrl>http://www.awesomeisp.com/</providerUrl> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>5</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>100</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> + <visitDuration>1261</visitDuration> + <visitDurationPretty>21 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>3</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1323,7 +1306,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1337,6 +1319,24 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>1</events> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>10</daysSinceLastVisit> + <provider>awesomeisp.com</provider> + <providerName>Awesomeisp</providerName> + <providerUrl>http://www.awesomeisp.com/</providerUrl> + <customVariables> + <row> + <customVariableName1>Cvar 1 name</customVariableName1> + <customVariableValue1>Cvar1 value is 4</customVariableValue1> + </row> + <row> + <customVariableName5>Cvar 5 name</customVariableName5> + <customVariableValue5>Cvar5 value is 4</customVariableValue5> + </row> + </customVariables> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 8e7af242ef..bee806c255 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -36,35 +27,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>2</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -76,6 +63,17 @@ <referrerUrl>http://search.yahoo.com/search?p=purchase</referrerUrl> <referrerSearchEngineUrl>http://search.yahoo.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -87,7 +85,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -101,6 +98,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -112,15 +112,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>1</searches> - <events>0</events> - <actions>8</actions> <actionDetails> <row> <type>action</type> @@ -223,35 +214,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1621</visitDuration> - <visitDurationPretty>27 min 1s</visitDurationPretty> + <searches>1</searches> + <actions>8</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>1621</visitDuration> + <visitDurationPretty>27 min 1s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -263,6 +250,17 @@ <referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -274,7 +272,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -288,6 +285,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index c765583a59..58e16cfdd9 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -4,15 +4,6 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>74.125.31.147</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -30,35 +21,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> <serverDate>2013-04-07</serverDate> - <visitLocalTime>10:00:00</visitLocalTime> - <visitLocalHour>10</visitLocalHour> <visitServerHour>10</visitServerHour> - <firstActionTimestamp>1365328800</firstActionTimestamp> <lastActionTimestamp>1365328800</lastActionTimestamp> <lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + <firstActionTimestamp>1365328800</firstActionTimestamp> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -70,6 +57,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> <operatingSystemShortName>Win Vista</operatingSystemShortName> @@ -81,11 +79,13 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>10:00:00</visitLocalTime> + <visitLocalHour>10</visitLocalHour> <serverTimestamp>1365328800</serverTimestamp> <serverTimePretty>10:00:00</serverTimePretty> <serverDatePretty>Sun 7 Apr</serverDatePretty> @@ -96,15 +96,6 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>74.125.31.147</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -122,35 +113,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> <serverDate>2013-04-06</serverDate> - <visitLocalTime>11:00:00</visitLocalTime> - <visitLocalHour>11</visitLocalHour> <visitServerHour>11</visitServerHour> - <firstActionTimestamp>1365246000</firstActionTimestamp> <lastActionTimestamp>1365246000</lastActionTimestamp> <lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + <firstActionTimestamp>1365246000</firstActionTimestamp> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -162,6 +149,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> <operatingSystemShortName>Win Vista</operatingSystemShortName> @@ -173,11 +171,13 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>11:00:00</visitLocalTime> + <visitLocalHour>11</visitLocalHour> <serverTimestamp>1365246000</serverTimestamp> <serverTimePretty>11:00:00</serverTimePretty> <serverDatePretty>Sat 6 Apr</serverDatePretty> @@ -188,15 +188,6 @@ <idSite>1</idSite> <idVisit>3</idVisit> <visitIp>74.125.31.147</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -214,35 +205,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> <serverDate>2013-04-05</serverDate> - <visitLocalTime>12:00:00</visitLocalTime> - <visitLocalHour>12</visitLocalHour> <visitServerHour>12</visitServerHour> - <firstActionTimestamp>1365163200</firstActionTimestamp> <lastActionTimestamp>1365163200</lastActionTimestamp> <lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + <firstActionTimestamp>1365163200</firstActionTimestamp> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Unknown</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -254,6 +241,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> <operatingSystemShortName>Win Vista</operatingSystemShortName> @@ -265,11 +263,13 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:00:00</visitLocalTime> + <visitLocalHour>12</visitLocalHour> <serverTimestamp>1365163200</serverTimestamp> <serverTimePretty>12:00:00</serverTimePretty> <serverDatePretty>Fri 5 Apr</serverDatePretty> diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 2c976ae13b..af3c4d5fa8 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -25,35 +16,31 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -65,6 +52,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -76,7 +74,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -90,6 +87,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 0c2c1e5648..ae0d417bae 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 17f4577f21..3a18d37c43 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>5</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>ordered</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> - <searches>0</searches> - <events>0</events> - <actions>0</actions> <actionDetails> <row> <type>ecommerceOrder</type> @@ -51,6 +42,27 @@ <icon>plugins/Morpheus/images/ecommerceOrder.gif</icon> </row> </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>0</actions> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>ordered</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>363</visitDuration> + <visitDurationPretty>6 min 3s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -65,33 +77,8 @@ <customVariableValue5>NewLoggedOut</customVariableValue5> </row> </customVariables> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>363</visitDuration> - <visitDurationPretty>6 min 3s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Poland</country> - <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Poland</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -103,6 +90,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -114,7 +112,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -128,6 +125,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -139,15 +139,6 @@ <idVisit>4</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> - <searches>0</searches> - <events>0</events> - <actions>3</actions> <actionDetails> <row> <type>action</type> @@ -261,6 +252,27 @@ <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>3</actions> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder> + <visitDuration>1081</visitDuration> + <visitDurationPretty>18 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -275,33 +287,8 @@ <customVariableValue5>NewLoggedOut</customVariableValue5> </row> </customVariables> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>1081</visitDuration> - <visitDurationPretty>18 min 1s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Poland</country> - <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Poland</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -313,6 +300,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -324,7 +322,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -338,6 +335,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index aa6f98607a..3bef154af9 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -5,15 +5,6 @@ <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</visitEcommerceStatusIcon> - <searches>0</searches> - <events>0</events> - <actions>3</actions> <actionDetails> <row> <type>action</type> @@ -127,6 +118,27 @@ <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>3</actions> + <visitorType>returningCustomer</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>2</visitCount> + + <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>721</visitDuration> + <visitDurationPretty>12 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -141,33 +153,8 @@ <customVariableValue5>NewLoggedOut</customVariableValue5> </row> </customVariables> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>721</visitDuration> - <visitDurationPretty>12 min 1s</visitDurationPretty> - <visitCount>2</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Poland</country> - <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Poland</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -179,6 +166,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -190,7 +188,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -204,6 +201,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -215,15 +215,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> - <searches>0</searches> - <events>0</events> - <actions>6</actions> <actionDetails> <row> <type>action</type> @@ -456,6 +447,27 @@ <icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>6</actions> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>2</visitCount> + + <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>3961</visitDuration> + <visitDurationPretty>1 hours 6 min</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -470,33 +482,8 @@ <customVariableValue5>NewLoggedOut</customVariableValue5> </row> </customVariables> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>3961</visitDuration> - <visitDurationPretty>1 hours 6 min</visitDurationPretty> - <visitCount>2</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>Poland</country> - <countryCode>pl</countryCode> - <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Poland</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -508,6 +495,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/UserCountry/images/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -519,7 +517,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -533,6 +530,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -544,15 +544,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>4</actions> <actionDetails> <row> <type>goal</type> @@ -675,43 +666,39 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName4>ValueIsZero</customVariableName4> - <customVariableValue4>0</customVariableValue4> - </row> - <row> - <customVariableName5>VisitorType</customVariableName5> - <customVariableValue5>NewLoggedOut</customVariableValue5> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>721</visitDuration> - <visitDurationPretty>12 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>4</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>721</visitDuration> + <visitDurationPretty>12 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -723,6 +710,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -734,7 +732,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -748,6 +745,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 8f39bbd3f5..273296fa97 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -5,15 +5,6 @@ <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>outlink</type> @@ -25,43 +16,39 @@ <icon>plugins/Morpheus/images/link.gif</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -73,6 +60,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -84,7 +82,6 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -98,6 +95,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -109,15 +109,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -139,43 +130,39 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>361</visitDuration> - <visitDurationPretty>6 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>361</visitDuration> + <visitDurationPretty>6 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -187,6 +174,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -198,7 +196,6 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -212,6 +209,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -223,15 +223,6 @@ <idVisit>1</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>3</actions> <actionDetails> <row> <type>goal</type> @@ -309,6 +300,27 @@ <icon /> </row> </actionDetails> + <goalConversions>2</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>3</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>364</visitDuration> + <visitDurationPretty>6 min 4s</visitDurationPretty> <customVariables> <row> <customVariableName1>VisitorType</customVariableName1> @@ -323,33 +335,8 @@ <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3> </row> </customVariables> - <goalConversions>2</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - - - - <visitDuration>364</visitDuration> - <visitDurationPretty>6 min 4s</visitDurationPretty> - <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -361,6 +348,17 @@ <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -372,7 +370,6 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>dual</screenType> - <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -386,6 +383,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index ada2c2c94f..a99c9467fd 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -48,15 +48,6 @@ <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>outlink</type> @@ -68,43 +59,39 @@ <icon>plugins/Morpheus/images/link.gif</icon> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -116,6 +103,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -127,7 +125,6 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -141,6 +138,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> @@ -153,15 +153,6 @@ <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>goal</type> @@ -183,43 +174,39 @@ <icon /> </row> </actionDetails> - <customVariables> - <row> - <customVariableName1>VisitorType</customVariableName1> - <customVariableValue1>LoggedOut</customVariableValue1> - </row> - <row> - <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> - <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> - </row> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>361</visitDuration> - <visitDurationPretty>6 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> + <visitDuration>361</visitDuration> + <visitDurationPretty>6 min 1s</visitDurationPretty> + <customVariables> + <row> + <customVariableName1>VisitorType</customVariableName1> + <customVariableValue1>LoggedOut</customVariableValue1> + </row> + <row> + <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2> + <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2> + </row> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -231,6 +218,17 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -242,7 +240,6 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -256,6 +253,9 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <daysSinceLastVisit>0</daysSinceLastVisit> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> |