diff options
| author | sgiehl <stefan@piwik.org> | 2014-12-10 01:52:05 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-12-10 01:52:05 +0300 |
| commit | 1645f11889eee54fe611974e561992accb5d690c (patch) | |
| tree | 079b1d559a25786522e795a35a41f0fa78fd00a9 /tests | |
| parent | e7325c72565a92cc7ff6c6eabdbff885d9158f97 (diff) | |
fixed some tests
Diffstat (limited to 'tests')
20 files changed, 162 insertions, 162 deletions
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 14943c61f2..5f5b0e174d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,7 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -94,6 +93,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,7 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -240,6 +239,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,7 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -363,6 +362,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,7 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -500,6 +499,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,7 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -623,6 +622,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,7 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -777,6 +776,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,7 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -900,6 +899,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -999,7 +999,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1037,6 +1036,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1122,7 +1122,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1160,6 +1159,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1276,7 +1276,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1314,6 +1313,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> @@ -1399,7 +1399,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1437,6 +1436,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> @@ -1536,7 +1536,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1574,6 +1573,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1673,7 +1673,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1711,6 +1710,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1788,7 +1788,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1826,6 +1825,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1911,7 +1911,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1949,6 +1948,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2065,7 +2065,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2103,6 +2102,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>comcast.net</provider> <providerName>Comcast</providerName> <providerUrl>http://www.comcast.net/</providerUrl> @@ -2219,7 +2219,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2257,6 +2256,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2334,7 +2334,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2372,6 +2371,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>comcast.net</provider> <providerName>Comcast</providerName> <providerUrl>http://www.comcast.net/</providerUrl> @@ -2457,7 +2457,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2495,6 +2494,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2594,7 +2594,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2632,6 +2631,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2731,7 +2731,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2769,6 +2768,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2868,7 +2868,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2906,6 +2905,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2997,7 +2997,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3035,6 +3034,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3120,7 +3120,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3158,6 +3157,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3243,7 +3243,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3281,6 +3280,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3366,7 +3366,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3404,6 +3403,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3489,7 +3489,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3527,6 +3526,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3643,7 +3643,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3681,6 +3680,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3797,7 +3797,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3835,6 +3834,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3951,7 +3951,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3989,6 +3988,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4097,7 +4097,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4135,6 +4134,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4220,7 +4220,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4258,6 +4257,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4343,7 +4343,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4381,6 +4380,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4466,7 +4466,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4504,6 +4503,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4589,7 +4589,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4627,6 +4626,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index afa050d312..52df0964ab 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -68,6 +68,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -79,7 +80,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -168,6 +168,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -179,7 +180,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -336,6 +336,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -347,7 +348,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -436,6 +436,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -447,7 +448,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -771,6 +771,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -782,7 +783,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -871,6 +871,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -882,7 +883,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -967,6 +967,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -978,7 +979,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1131,6 +1131,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1142,7 +1143,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1227,6 +1227,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1238,7 +1239,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1558,6 +1558,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1569,7 +1570,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index afa050d312..52df0964ab 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -79,7 +80,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -168,6 +168,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -179,7 +180,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -336,6 +336,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -347,7 +348,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -436,6 +436,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -447,7 +448,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -771,6 +771,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -782,7 +783,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -871,6 +871,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -882,7 +883,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -967,6 +967,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -978,7 +979,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1131,6 +1131,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1142,7 +1143,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1227,6 +1227,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1238,7 +1239,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> @@ -1558,6 +1558,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -1569,7 +1570,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>director</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 5009922ea1..1b6f100c5e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -84,6 +84,7 @@ <referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1366x768</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -95,7 +96,6 @@ <location>Raleigh, North Carolina, United States</location> <latitude>35.771999</latitude> <longitude>-78.639000</longitude> - <resolution>1366x768</resolution> <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> @@ -220,6 +220,7 @@ <referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1536x864</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -231,7 +232,6 @@ <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> <longitude>-117.679001</longitude> - <resolution>1536x864</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>17:33:27</visitLocalTime> @@ -331,6 +331,7 @@ <referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1920x1200</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Germany</country> @@ -342,7 +343,6 @@ <location>Germany</location> <latitude>51</latitude> <longitude>9</longitude> - <resolution>1920x1200</resolution> <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> @@ -475,6 +475,7 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>2880x1800</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -486,7 +487,6 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <resolution>2880x1800</resolution> <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> @@ -588,6 +588,7 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1920x1080</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Belgium</country> @@ -599,7 +600,6 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <resolution>1920x1080</resolution> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -712,6 +712,7 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>1360x768</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -723,7 +724,6 @@ <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> <longitude>-122.408997</longitude> - <resolution>1360x768</resolution> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -843,6 +843,7 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>2560x1440</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -854,7 +855,6 @@ <location>Nihon'odori, Kanagawa, Japan</location> <latitude>35.450001</latitude> <longitude>139.649994</longitude> - <resolution>2560x1440</resolution> <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> @@ -963,6 +963,7 @@ <referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>360x640</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Germany</country> @@ -974,7 +975,6 @@ <location>Weilerswist, Nordrhein-Westfalen, Germany</location> <latitude>50.766998</latitude> <longitude>6.833000</longitude> - <resolution>360x640</resolution> <plugins>flash</plugins> <pluginsIcons> <row> @@ -1075,6 +1075,7 @@ <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 /> + <resolution>2560x1440</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Germany</country> @@ -1086,7 +1087,6 @@ <location>Mainz, Rheinland-Pfalz, Germany</location> <latitude>50</latitude> <longitude>8.271000</longitude> - <resolution>2560x1440</resolution> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -1242,6 +1242,7 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>1920x1080</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Russian Federation</country> @@ -1253,7 +1254,6 @@ <location>Moscow, Moscow City, Russian Federation</location> <latitude>55.751999</latitude> <longitude>37.616001</longitude> - <resolution>1920x1080</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1358,6 +1358,7 @@ <referrerUrl>http://piwik.org/docs/installation/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1366x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Turkey</country> @@ -1369,7 +1370,6 @@ <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> <longitude>40.415001</longitude> - <resolution>1366x768</resolution> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1482,6 +1482,7 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1920x1080</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Belgium</country> @@ -1493,7 +1494,6 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <resolution>1920x1080</resolution> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1764,6 +1764,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -1775,7 +1776,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> @@ -1878,6 +1878,7 @@ <referrerUrl>http://piwik.org/contribute%</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -1889,7 +1890,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1993,6 +1993,7 @@ <referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1280x800</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -2004,7 +2005,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>1280x800</resolution> <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> @@ -2124,6 +2124,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -2135,7 +2136,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:15:41</visitLocalTime> @@ -2247,6 +2247,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -2258,7 +2259,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>19:12:40</visitLocalTime> @@ -2377,6 +2377,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -2388,7 +2389,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>18:10:38</visitLocalTime> @@ -2483,6 +2483,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -2494,7 +2495,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:08</visitLocalTime> @@ -2589,6 +2589,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -2600,7 +2601,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:07</visitLocalTime> @@ -2685,6 +2685,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Oceania</continent> <continentCode>oce</continentCode> <country>Australia</country> @@ -2696,7 +2697,6 @@ <location>Australia</location> <latitude>-27</latitude> <longitude>133</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>17:46:03</visitLocalTime> @@ -2791,6 +2791,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -2802,7 +2803,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>16:11:30</visitLocalTime> @@ -2897,6 +2897,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -2908,7 +2909,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>16:10:38</visitLocalTime> @@ -2999,6 +2999,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -3010,7 +3011,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>15:31:05</visitLocalTime> @@ -3101,6 +3101,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -3112,7 +3113,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:46</visitLocalTime> @@ -3203,6 +3203,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>South America</continent> <continentCode>ams</continentCode> <country>Brazil</country> @@ -3214,7 +3215,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:22:08</visitLocalTime> @@ -3305,6 +3305,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>South America</continent> <continentCode>ams</continentCode> <country>Brazil</country> @@ -3316,7 +3317,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:28</visitLocalTime> @@ -3407,6 +3407,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>South America</continent> <continentCode>ams</continentCode> <country>Brazil</country> @@ -3418,7 +3419,6 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:03</visitLocalTime> @@ -3509,6 +3509,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -3520,7 +3521,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:01:17</visitLocalTime> @@ -3611,6 +3611,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -3622,7 +3623,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>19:59:50</visitLocalTime> @@ -3713,6 +3713,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -3724,7 +3725,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>18:03:40</visitLocalTime> @@ -3815,6 +3815,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -3826,7 +3827,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>21:00:42</visitLocalTime> @@ -3917,6 +3917,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -3928,7 +3929,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>20:56:45</visitLocalTime> @@ -4019,6 +4019,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -4030,7 +4031,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:48</visitLocalTime> @@ -4121,6 +4121,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -4132,7 +4133,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:20</visitLocalTime> @@ -4223,6 +4223,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>North America</continent> <continentCode>amn</continentCode> <country>United States</country> @@ -4234,7 +4235,6 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:07</visitLocalTime> @@ -4325,6 +4325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -4336,7 +4337,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>08:12:03</visitLocalTime> @@ -4427,6 +4427,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -4438,7 +4439,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:56</visitLocalTime> @@ -4529,6 +4529,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -4540,7 +4541,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:30</visitLocalTime> @@ -4631,6 +4631,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Asia</continent> <continentCode>asi</continentCode> <country>Japan</country> @@ -4642,7 +4643,6 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 84b93135bd..4af83361f6 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -66,7 +66,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -102,6 +101,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -218,7 +218,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -254,6 +253,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -339,7 +339,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -375,6 +374,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -491,7 +491,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -527,6 +526,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -612,7 +612,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -648,6 +647,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -764,7 +764,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -800,6 +799,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -877,7 +877,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -913,6 +912,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 10c86992ca..18a864dbcd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -94,6 +93,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,7 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -240,6 +239,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,7 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -363,6 +362,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,7 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -500,6 +499,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,7 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -623,6 +622,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,7 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -777,6 +776,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,7 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -900,6 +899,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 29273fa92b..bf87d09256 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -97,7 +97,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -135,6 +134,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -220,7 +220,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -258,6 +257,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -374,7 +374,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -412,6 +411,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -511,7 +511,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -549,6 +548,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -634,7 +634,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -672,6 +671,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -757,7 +757,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -795,6 +794,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -870,7 +870,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -908,6 +907,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 10c86992ca..18a864dbcd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -94,6 +93,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,7 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -240,6 +239,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,7 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -363,6 +362,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,7 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -500,6 +499,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,7 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -623,6 +622,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,7 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -777,6 +776,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,7 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -900,6 +899,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 85ba4fcaa9..855cc09755 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -94,6 +93,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,7 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -240,6 +239,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,7 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -363,6 +362,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,7 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -500,6 +499,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,7 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -623,6 +622,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,7 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -777,6 +776,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,7 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -900,6 +899,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -999,7 +999,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1037,6 +1036,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1122,7 +1122,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1160,6 +1159,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1276,7 +1276,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1314,6 +1313,7 @@ <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> + <resolution>1024x768</resolution> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 32e79a2c86..664c8bf45f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -74,6 +74,7 @@ <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> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -85,7 +86,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -260,6 +260,7 @@ <referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -271,7 +272,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index cff7c54d20..4baa370d70 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ <referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -74,7 +75,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -168,6 +168,7 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -179,7 +180,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 3847bac724..3953a817fb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -79,7 +80,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>10:00:00</visitLocalTime> @@ -159,6 +159,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -170,7 +171,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>11:00:00</visitLocalTime> @@ -250,6 +250,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>unknown</resolution> <continent>Unknown</continent> <continentCode>unk</continentCode> <country>Unknown</country> @@ -261,7 +262,6 @@ <location>Unknown</location> <latitude /> <longitude /> - <resolution>unknown</resolution> <plugins /> <pluginsIcons /> <visitLocalTime>12:00:00</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index e4e40d6f84..d37012289b 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -74,7 +75,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 90ebe565a7..525999bee1 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -192,7 +192,7 @@ <row> <category>Visitor Settings</category> <name>Screen Resolution</name> - <module>UserSettings</module> + <module>Resolution</module> <action>getResolution</action> <dimension>Resolution</dimension> <metrics> @@ -213,9 +213,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getResolution</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>Resolution_getResolution</uniqueId> </row> <row> <category>Visitor Settings</category> @@ -240,7 +240,7 @@ <row> <category>Visitor Settings</category> <name>Visitor Configuration</name> - <module>UserSettings</module> + <module>Resolution</module> <action>getConfiguration</action> <dimension>Configuration</dimension> <documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation> @@ -262,9 +262,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getConfiguration</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>Resolution_getConfiguration</uniqueId> </row> <row> <category>Visitor Settings</category> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 74c05412ef..172e23b93d 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 5f2a28ce3e..6cdb55181c 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -101,6 +101,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Poland</country> @@ -112,7 +113,6 @@ <location>Poland</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -310,6 +310,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Poland</country> @@ -321,7 +322,6 @@ <location>Poland</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index d7897e50e1..57a190c4a2 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -177,6 +177,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Poland</country> @@ -188,7 +189,6 @@ <location>Poland</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -505,6 +505,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>Poland</country> @@ -516,7 +517,6 @@ <location>Poland</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -719,6 +719,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1024x768</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -730,7 +731,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1024x768</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index cecf0df249..d1d3cb310d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -71,6 +71,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -82,7 +83,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -184,6 +184,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -195,7 +196,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -357,6 +357,7 @@ <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> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -368,7 +369,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index cecf0df249..d1d3cb310d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -71,6 +71,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -82,7 +83,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -184,6 +184,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -195,7 +196,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -357,6 +357,7 @@ <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> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -368,7 +369,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 64217e5250..76c9807789 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -117,6 +117,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -128,7 +129,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -231,6 +231,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> + <resolution>1111x222</resolution> <continent>Europe</continent> <continentCode>eur</continentCode> <country>France</country> @@ -242,7 +243,6 @@ <location>France</location> <latitude /> <longitude /> - <resolution>1111x222</resolution> <plugins>flash, java</plugins> <pluginsIcons> <row> |