diff options
| author | sgiehl <stefan@piwik.org> | 2014-12-21 02:50:24 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-12-21 02:50:24 +0300 |
| commit | 837eb1e625a9f34c7f6ede5e02cd6ebc8ff49b84 (patch) | |
| tree | b4aa9967ac48f80e8b374a8767817e730bc04321 /tests/PHPUnit/System | |
| parent | 30bec38c4f36254f26097f810aaf139e9a42a61d (diff) | |
fixed some tests
Diffstat (limited to 'tests/PHPUnit/System')
23 files changed, 1526 insertions, 1526 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 5f5b0e174d..a8529ea68d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,17 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,17 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -240,6 +229,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,17 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -363,6 +352,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,17 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -500,6 +489,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,17 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -623,6 +612,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,17 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -777,6 +766,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,17 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -900,6 +889,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -999,17 +999,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1037,6 +1026,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1122,17 +1122,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1160,6 +1149,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1276,17 +1276,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1314,6 +1303,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> @@ -1399,17 +1399,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1437,6 +1426,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> @@ -1536,17 +1536,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1574,6 +1563,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1673,17 +1673,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -1711,6 +1700,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1788,17 +1788,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1826,6 +1815,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1911,17 +1911,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -1949,6 +1938,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2065,17 +2065,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2103,6 +2092,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>comcast.net</provider> <providerName>Comcast</providerName> <providerUrl>http://www.comcast.net/</providerUrl> @@ -2219,17 +2219,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -2257,6 +2246,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2334,17 +2334,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2372,6 +2361,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>comcast.net</provider> <providerName>Comcast</providerName> <providerUrl>http://www.comcast.net/</providerUrl> @@ -2457,17 +2457,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -2495,6 +2484,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2594,17 +2594,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2632,6 +2621,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2731,17 +2731,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2769,6 +2758,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2868,17 +2868,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -2906,6 +2895,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -2997,17 +2997,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3035,6 +3024,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3120,17 +3120,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3158,6 +3147,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3243,17 +3243,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3281,6 +3270,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3366,17 +3366,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -3404,6 +3393,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3489,17 +3489,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3527,6 +3516,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3643,17 +3643,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3681,6 +3670,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3797,17 +3797,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -3835,6 +3824,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -3951,17 +3951,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -3989,6 +3978,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4097,17 +4097,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -4135,6 +4124,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4220,17 +4220,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -4258,6 +4247,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4343,17 +4343,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -4381,6 +4370,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4466,17 +4466,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -4504,6 +4493,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -4589,17 +4589,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -4627,6 +4616,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <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 f6671ef6af..5394e1c1dc 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -47,17 +47,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -147,17 +147,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -194,6 +183,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -315,17 +315,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -362,6 +351,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -415,17 +415,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -462,6 +451,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -750,17 +750,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -797,6 +786,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -850,13 +850,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -893,6 +886,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -946,13 +946,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -989,6 +982,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1110,13 +1110,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1153,6 +1146,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1206,13 +1206,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1249,6 +1242,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1537,13 +1537,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1580,6 +1573,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> 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 f6671ef6af..5394e1c1dc 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -47,17 +47,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -147,17 +147,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -194,6 +183,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -315,17 +315,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -362,6 +351,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -415,17 +415,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -462,6 +451,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -750,17 +750,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -797,6 +786,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -850,13 +850,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -893,6 +886,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -946,13 +946,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -989,6 +982,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1110,13 +1110,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1153,6 +1146,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1206,13 +1206,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1249,6 +1242,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> @@ -1537,13 +1537,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1580,6 +1573,13 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> 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 3e2644cca0..08e10d3b95 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -63,21 +63,6 @@ <referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemCode>W81</operatingSystemCode> @@ -114,6 +99,21 @@ </row> </customVariables> <resolution>1366x768</resolution> + <plugins>pdf, flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -199,8 +199,6 @@ <referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -237,6 +235,8 @@ </row> </customVariables> <resolution>1536x864</resolution> + <plugins /> + <pluginsIcons /> @@ -306,29 +306,6 @@ <referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java, quicktime, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon> - <pluginName>quicktime</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -369,6 +346,29 @@ </row> </customVariables> <resolution>1920x1200</resolution> + <plugins>pdf, flash, java, quicktime, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginName>quicktime</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -454,25 +454,6 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <plugins>pdf, flash, java, quicktime</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon> - <pluginName>quicktime</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -509,6 +490,25 @@ </row> </customVariables> <resolution>2880x1800</resolution> + <plugins>pdf, flash, java, quicktime</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginName>quicktime</pluginName> + </row> + </pluginsIcons> @@ -567,25 +567,6 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -622,6 +603,25 @@ </row> </customVariables> <resolution>1920x1080</resolution> + <plugins>pdf, flash, java, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -691,33 +691,6 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon> - <pluginName>quicktime</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon> - <pluginName>windowsmedia</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -754,6 +727,33 @@ </row> </customVariables> <resolution>1360x768</resolution> + <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginName>quicktime</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -822,21 +822,6 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <plugins>pdf, java, quicktime</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon> - <pluginName>quicktime</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -873,6 +858,21 @@ </row> </customVariables> <resolution>2560x1440</resolution> + <plugins>pdf, java, quicktime</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginName>quicktime</pluginName> + </row> + </pluginsIcons> @@ -942,13 +942,6 @@ <referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>flash</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - </pluginsIcons> <deviceType>Unknown</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> @@ -985,6 +978,13 @@ </row> </customVariables> <resolution>360x640</resolution> + <plugins>flash</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + </pluginsIcons> @@ -1054,33 +1054,6 @@ <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 /> - <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon> - <pluginName>quicktime</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon> - <pluginName>windowsmedia</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -1117,6 +1090,33 @@ </row> </customVariables> <resolution>2560x1440</resolution> + <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginName>quicktime</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -1221,17 +1221,6 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows 8</operatingSystem> <operatingSystemCode>WI8</operatingSystemCode> @@ -1268,6 +1257,17 @@ </row> </customVariables> <resolution>1920x1080</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -1337,25 +1337,6 @@ <referrerUrl>http://piwik.org/docs/installation/</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -1392,6 +1373,25 @@ </row> </customVariables> <resolution>1366x768</resolution> + <plugins>pdf, flash, java, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -1461,25 +1461,6 @@ <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java, silverlight</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> - <pluginName>silverlight</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -1516,6 +1497,25 @@ </row> </customVariables> <resolution>1920x1080</resolution> + <plugins>pdf, flash, java, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> @@ -1747,8 +1747,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -1781,6 +1779,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -1850,8 +1850,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -1884,6 +1882,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -1969,8 +1969,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> @@ -2003,6 +2001,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2072,8 +2072,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -2106,6 +2104,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2192,8 +2192,6 @@ <referrerUrl>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> @@ -2226,6 +2224,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2295,8 +2295,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -2329,6 +2327,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2405,17 +2405,6 @@ <referrerUrl>http://piwik.org/contribute%</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2452,6 +2441,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -2520,33 +2520,6 @@ <referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> - <pluginName>pdf</pluginName> - </row> - <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> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon> - <pluginName>windowsmedia</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/gears.gif</pluginIcon> - <pluginName>gears</pluginName> - </row> - </pluginsIcons> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -2583,6 +2556,33 @@ </row> </customVariables> <resolution>1280x800</resolution> + <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon> + <pluginName>gears</pluginName> + </row> + </pluginsIcons> @@ -2643,8 +2643,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -2677,6 +2675,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2736,8 +2736,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -2770,6 +2768,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2838,8 +2838,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -2876,6 +2874,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -2961,8 +2961,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -2999,6 +2997,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3091,8 +3091,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -3129,6 +3127,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3197,8 +3197,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Unknown</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> @@ -3235,6 +3233,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3303,8 +3303,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -3341,6 +3339,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3399,8 +3399,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -3437,6 +3435,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3505,8 +3505,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> @@ -3543,6 +3541,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3611,8 +3611,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -3649,6 +3647,8 @@ </row> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3717,8 +3717,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -3751,6 +3749,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3819,8 +3819,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -3853,6 +3851,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -3921,8 +3921,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -3955,6 +3953,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4023,8 +4023,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -4057,6 +4055,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4125,8 +4125,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -4159,6 +4157,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4227,8 +4227,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -4261,6 +4259,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4329,8 +4329,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -4363,6 +4361,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4431,8 +4431,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -4465,6 +4463,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4533,8 +4533,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -4567,6 +4565,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4635,8 +4635,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -4669,6 +4667,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4737,8 +4737,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -4771,6 +4769,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4839,8 +4839,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -4873,6 +4871,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -4941,8 +4941,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> @@ -4975,6 +4973,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -5043,8 +5043,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -5077,6 +5075,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -5145,8 +5145,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> @@ -5179,6 +5177,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -5247,8 +5247,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> @@ -5281,6 +5279,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> @@ -5349,8 +5349,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> @@ -5383,6 +5381,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index 94bb890a25..9fd23368c3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>7%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>7%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>7%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> <nb_visits_percentage>4%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> <nb_visits_percentage>4%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> <nb_visits_percentage>4%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>1</nb_visits> <nb_visits_percentage>4%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> </row> </result>
\ No newline at end of file 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 4af83361f6..f7b0d51cb1 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,17 +66,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -102,6 +91,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -218,17 +218,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -254,6 +243,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -339,17 +339,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -375,6 +364,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -491,17 +491,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -527,6 +516,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -612,17 +612,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -648,6 +637,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -764,17 +764,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> @@ -800,6 +789,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -877,17 +877,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -913,6 +902,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <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 18a864dbcd..a12a9e2a85 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,17 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,17 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -240,6 +229,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,17 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -363,6 +352,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,17 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -500,6 +489,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,17 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -623,6 +612,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,17 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -777,6 +766,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,17 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -900,6 +889,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <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 bf87d09256..1db70384e6 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,17 +97,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -135,6 +124,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -220,17 +220,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -258,6 +247,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -374,17 +374,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -412,6 +401,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -511,17 +511,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -549,6 +538,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -634,17 +634,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -672,6 +661,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -757,17 +757,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -795,6 +784,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -870,17 +870,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -908,6 +897,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <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 18a864dbcd..a12a9e2a85 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,17 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,17 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -240,6 +229,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,17 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -363,6 +352,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,17 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -500,6 +489,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,17 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -623,6 +612,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,17 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -777,6 +766,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,17 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -900,6 +889,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <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 855cc09755..4f7718e08b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,17 +56,6 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -94,6 +83,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -202,17 +202,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -240,6 +229,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -325,17 +325,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -363,6 +352,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -462,17 +462,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -500,6 +489,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -585,17 +585,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -623,6 +612,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -739,17 +739,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -777,6 +766,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -862,17 +862,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -900,6 +889,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -999,17 +999,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1037,6 +1026,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1122,17 +1122,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1160,6 +1149,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>Unknown</provider> <providerName>Unknown</providerName> <providerUrl /> @@ -1276,17 +1276,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -1314,6 +1303,17 @@ <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> <provider>awesomeisp.com</provider> <providerName>Awesomeisp</providerName> <providerUrl>http://www.awesomeisp.com/</providerUrl> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml index 9ddd1bed44..72728977e1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index fd996cde0c..422cba06af 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 @@ -57,17 +57,6 @@ <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> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -100,6 +89,17 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -243,17 +243,6 @@ <referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -286,6 +275,17 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml index 9ddd1bed44..72728977e1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml index aa46939be4..000a410083 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml @@ -4,13 +4,13 @@ <label>Cookie</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> </row> <row> <label>Autres</label> 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 4f1db44f3d..39a670a112 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 @@ -46,17 +46,6 @@ <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> - <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> <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> @@ -89,6 +78,17 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -151,17 +151,6 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <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> <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> @@ -194,6 +183,17 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 8f69cec30a..d8dbff081b 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 @@ -51,8 +51,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> @@ -85,6 +83,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <serverTimestamp>1365328800</serverTimestamp> <serverTimePretty>10:00:00</serverTimePretty> <serverDatePretty>Sun 7 Apr</serverDatePretty> @@ -142,8 +142,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> @@ -176,6 +174,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <serverTimestamp>1365246000</serverTimestamp> <serverTimePretty>11:00:00</serverTimePretty> <serverDatePretty>Sat 6 Apr</serverDatePretty> @@ -233,8 +233,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <plugins /> - <pluginsIcons /> <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> @@ -267,6 +265,8 @@ <customVariables> </customVariables> <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> <serverTimestamp>1365163200</serverTimestamp> <serverTimePretty>12:00:00</serverTimePretty> <serverDatePretty>Fri 5 Apr</serverDatePretty> 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 9569ea3571..03d31e0118 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -46,17 +46,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -89,6 +78,17 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 b578e611b8..055d71f03c 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 69364960c5..d35393d436 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 @@ -72,17 +72,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -127,6 +116,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -281,17 +281,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -336,6 +325,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 b1454cde77..e599862bed 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -148,17 +148,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -203,6 +192,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -476,17 +476,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -531,6 +520,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -694,17 +694,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -745,6 +734,17 @@ </row> </customVariables> <resolution>1024x768</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 e0316013c3..373fee3685 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 @@ -46,17 +46,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -97,6 +86,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -159,17 +159,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -210,6 +199,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -328,17 +328,6 @@ <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> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -383,6 +372,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 e0316013c3..373fee3685 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 @@ -46,17 +46,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -97,6 +86,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -159,17 +159,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -210,6 +199,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -328,17 +328,6 @@ <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> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -383,6 +372,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> 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 eb74418d9b..7d8348108a 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 @@ -92,17 +92,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -143,6 +132,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> @@ -206,17 +206,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <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> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> @@ -257,6 +246,17 @@ </row> </customVariables> <resolution>1111x222</resolution> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> |