diff options
Diffstat (limited to 'tests')
109 files changed, 1324 insertions, 1289 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index da3d334c0f..a4ec4deb32 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -10,95 +10,95 @@ try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] INIT -INFO [2016-12-26 22:26:34] Running Piwik 3.0.0 as Super User -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] NOTES -INFO [2016-12-26 22:26:34] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2016-12-26 22:26:34] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2016-12-26 22:26:34] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2016-12-26 22:26:34] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2016-12-26 22:26:34] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] START -INFO [2016-12-26 22:26:34] Starting Piwik reports archiving... -INFO [2016-12-26 22:26:34] Old report was invalidated for website id 1 -INFO [2016-12-26 22:26:34] Will pre-process for website id = 1, period = day, date = last52 -INFO [2016-12-26 22:26:34] - pre-processing all visits -INFO [2016-12-26 22:26:35] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:26:35] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:26:36] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:26:39] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.167s -INFO [2016-12-26 22:26:39] Will pre-process for website id = 1, period = week, date = last260 -INFO [2016-12-26 22:26:39] - pre-processing all visits -INFO [2016-12-26 22:26:39] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:26:39] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:27:34] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:04] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 84.873s -INFO [2016-12-26 22:28:04] Will pre-process for website id = 1, period = month, date = last52 -INFO [2016-12-26 22:28:04] - pre-processing all visits -INFO [2016-12-26 22:28:04] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:28:04] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:20] Archived website id = 1, period = month, 3 segments, 13 visits in last 52 months, 0 visits this month, Time elapsed: 16.383s -INFO [2016-12-26 22:28:20] Will pre-process for website id = 1, period = year, date = last7 -INFO [2016-12-26 22:28:20] - pre-processing all visits -INFO [2016-12-26 22:28:20] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:28:20] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:26] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:28] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 8.056s -INFO [2016-12-26 22:28:28] Archived website id = 1, 16 API requests, Time elapsed: 114.487s [1/3 done] -INFO [2016-12-26 22:28:28] Old report was invalidated for website id 2 -INFO [2016-12-26 22:28:28] Will pre-process for website id = 2, period = day, date = last52 -INFO [2016-12-26 22:28:28] - pre-processing all visits -INFO [2016-12-26 22:28:30] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.499s -INFO [2016-12-26 22:28:30] Will pre-process for website id = 2, period = week, date = last260 -INFO [2016-12-26 22:28:30] - pre-processing all visits -INFO [2016-12-26 22:28:50] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.592s -INFO [2016-12-26 22:28:50] Will pre-process for website id = 2, period = month, date = last52 -INFO [2016-12-26 22:28:50] - pre-processing all visits -INFO [2016-12-26 22:28:54] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 3.807s -INFO [2016-12-26 22:28:54] Will pre-process for website id = 2, period = year, date = last7 -INFO [2016-12-26 22:28:54] - pre-processing all visits -INFO [2016-12-26 22:28:56] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.512s -INFO [2016-12-26 22:28:56] Archived website id = 2, 4 API requests, Time elapsed: 27.413s [2/3 done] -INFO [2016-12-26 22:28:56] Old report was invalidated for website id 3 -INFO [2016-12-26 22:28:56] Will pre-process for website id = 3, period = day, date = last52 -INFO [2016-12-26 22:28:56] - pre-processing all visits -INFO [2016-12-26 22:28:57] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.609s -INFO [2016-12-26 22:28:57] Will pre-process for website id = 3, period = week, date = last260 -INFO [2016-12-26 22:28:57] - pre-processing all visits -INFO [2016-12-26 22:29:19] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.300s -INFO [2016-12-26 22:29:19] Will pre-process for website id = 3, period = month, date = last52 -INFO [2016-12-26 22:29:19] - pre-processing all visits -INFO [2016-12-26 22:29:23] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.174s -INFO [2016-12-26 22:29:23] Will pre-process for website id = 3, period = year, date = last7 -INFO [2016-12-26 22:29:23] - pre-processing all visits -INFO [2016-12-26 22:29:25] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.320s -INFO [2016-12-26 22:29:25] Archived website id = 3, 4 API requests, Time elapsed: 29.407s [3/3 done] -INFO [2016-12-26 22:29:25] Done archiving! -INFO [2016-12-26 22:29:25] --------------------------- -INFO [2016-12-26 22:29:25] SUMMARY -INFO [2016-12-26 22:29:25] Total visits for today across archived websites: 0 -INFO [2016-12-26 22:29:25] Archived today's reports for 3 websites -INFO [2016-12-26 22:29:25] Archived week/month/year for 3 websites -INFO [2016-12-26 22:29:25] Skipped 0 websites -INFO [2016-12-26 22:29:25] - 0 skipped because no new visit since the last script execution -INFO [2016-12-26 22:29:25] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2016-12-26 22:29:25] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2016-12-26 22:29:25] Total API requests: 24 -INFO [2016-12-26 22:29:25] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 171446 ms, no error -INFO [2016-12-26 22:29:25] Time elapsed: 171.446s -INFO [2016-12-26 22:29:25] --------------------------- -INFO [2016-12-26 22:29:25] SCHEDULED TASKS -INFO [2016-12-26 22:29:25] Starting Scheduled tasks... -INFO [2016-12-26 22:29:25] done -INFO [2016-12-26 22:29:25] ---------------------------
\ No newline at end of file +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] INIT +INFO [2017-01-07 07:08:27] Running Piwik 3.0.1-b2 as Super User +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] NOTES +INFO [2017-01-07 07:08:27] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO [2017-01-07 07:08:27] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO [2017-01-07 07:08:27] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO [2017-01-07 07:08:27] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2017-01-07 07:08:27] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] START +INFO [2017-01-07 07:08:27] Starting Piwik reports archiving... +INFO [2017-01-07 07:08:27] Old report was invalidated for website id 1 +INFO [2017-01-07 07:08:27] Will pre-process for website id = 1, period = day, date = last52 +INFO [2017-01-07 07:08:27] - pre-processing all visits +INFO [2017-01-07 07:08:29] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:08:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:08:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:08:33] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.443s +INFO [2017-01-07 07:08:33] Will pre-process for website id = 1, period = week, date = last260 +INFO [2017-01-07 07:08:33] - pre-processing all visits +INFO [2017-01-07 07:08:33] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:08:33] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:09:31] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 89.589s +INFO [2017-01-07 07:10:02] Will pre-process for website id = 1, period = month, date = last52 +INFO [2017-01-07 07:10:02] - pre-processing all visits +INFO [2017-01-07 07:10:02] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:10:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:19] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 16.506s +INFO [2017-01-07 07:10:19] Will pre-process for website id = 1, period = year, date = last7 +INFO [2017-01-07 07:10:19] - pre-processing all visits +INFO [2017-01-07 07:10:19] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:10:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:25] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:28] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 9.642s +INFO [2017-01-07 07:10:28] Archived website id = 1, 16 API requests, Time elapsed: 121.189s [1/3 done] +INFO [2017-01-07 07:10:29] Old report was invalidated for website id 2 +INFO [2017-01-07 07:10:29] Will pre-process for website id = 2, period = day, date = last52 +INFO [2017-01-07 07:10:29] - pre-processing all visits +INFO [2017-01-07 07:10:30] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.630s +INFO [2017-01-07 07:10:30] Will pre-process for website id = 2, period = week, date = last260 +INFO [2017-01-07 07:10:30] - pre-processing all visits +INFO [2017-01-07 07:10:52] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.658s +INFO [2017-01-07 07:10:52] Will pre-process for website id = 2, period = month, date = last52 +INFO [2017-01-07 07:10:52] - pre-processing all visits +INFO [2017-01-07 07:10:56] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 3.966s +INFO [2017-01-07 07:10:56] Will pre-process for website id = 2, period = year, date = last7 +INFO [2017-01-07 07:10:56] - pre-processing all visits +INFO [2017-01-07 07:10:57] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.630s +INFO [2017-01-07 07:10:57] Archived website id = 2, 4 API requests, Time elapsed: 28.888s [2/3 done] +INFO [2017-01-07 07:10:57] Old report was invalidated for website id 3 +INFO [2017-01-07 07:10:57] Will pre-process for website id = 3, period = day, date = last52 +INFO [2017-01-07 07:10:57] - pre-processing all visits +INFO [2017-01-07 07:10:59] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.639s +INFO [2017-01-07 07:10:59] Will pre-process for website id = 3, period = week, date = last260 +INFO [2017-01-07 07:10:59] - pre-processing all visits +INFO [2017-01-07 07:11:22] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 22.770s +INFO [2017-01-07 07:11:22] Will pre-process for website id = 3, period = month, date = last52 +INFO [2017-01-07 07:11:22] - pre-processing all visits +INFO [2017-01-07 07:11:26] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.387s +INFO [2017-01-07 07:11:26] Will pre-process for website id = 3, period = year, date = last7 +INFO [2017-01-07 07:11:26] - pre-processing all visits +INFO [2017-01-07 07:11:29] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.432s +INFO [2017-01-07 07:11:29] Archived website id = 3, 4 API requests, Time elapsed: 31.233s [3/3 done] +INFO [2017-01-07 07:11:29] Done archiving! +INFO [2017-01-07 07:11:29] --------------------------- +INFO [2017-01-07 07:11:29] SUMMARY +INFO [2017-01-07 07:11:29] Total visits for today across archived websites: 0 +INFO [2017-01-07 07:11:29] Archived today's reports for 3 websites +INFO [2017-01-07 07:11:29] Archived week/month/year for 3 websites +INFO [2017-01-07 07:11:29] Skipped 0 websites +INFO [2017-01-07 07:11:29] - 0 skipped because no new visit since the last script execution +INFO [2017-01-07 07:11:29] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2017-01-07 07:11:29] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2017-01-07 07:11:29] Total API requests: 24 +INFO [2017-01-07 07:11:29] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 181477 ms, no error +INFO [2017-01-07 07:11:29] Time elapsed: 181.477s +INFO [2017-01-07 07:11:29] --------------------------- +INFO [2017-01-07 07:11:29] SCHEDULED TASKS +INFO [2017-01-07 07:11:29] Starting Scheduled tasks... +INFO [2017-01-07 07:11:29] done +INFO [2017-01-07 07:11:29] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index b42228ab18..503f25c55f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -182,14 +182,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -290,14 +290,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -398,14 +398,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -506,14 +506,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -614,14 +614,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -722,14 +722,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -830,14 +830,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -938,14 +938,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 4a3badd91f..0c3a52fd22 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -265,14 +265,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -381,14 +381,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -414,11 +414,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -502,14 +502,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -614,14 +614,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -745,14 +745,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -884,14 +884,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -996,14 +996,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1108,14 +1108,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -1209,14 +1209,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1321,14 +1321,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> 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 9079f5d43c..63364610cd 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1187,14 +1187,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1318,14 +1318,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1357,11 +1357,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1511,14 +1511,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1642,14 +1642,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1681,11 +1681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1816,14 +1816,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1855,11 +1855,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1990,14 +1990,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2021,11 +2021,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2113,14 +2113,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2152,11 +2152,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2244,14 +2244,14 @@ <deviceModel>Xperia Tablet S</deviceModel> <operatingSystem>Android 4.1</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -2283,11 +2283,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2437,14 +2437,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2476,11 +2476,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2630,14 +2630,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2661,11 +2661,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2753,14 +2753,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2792,11 +2792,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2884,14 +2884,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 11.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -2923,11 +2923,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3058,14 +3058,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3097,11 +3097,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3232,14 +3232,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>1</events> @@ -3271,11 +3271,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3406,14 +3406,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3437,11 +3437,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3572,14 +3572,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>1</events> @@ -3611,11 +3611,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3703,14 +3703,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3742,11 +3742,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3834,14 +3834,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -3873,11 +3873,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3965,14 +3965,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -4004,11 +4004,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4096,14 +4096,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -4135,11 +4135,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4289,14 +4289,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -4328,11 +4328,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4482,14 +4482,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>1</events> @@ -4521,11 +4521,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4675,14 +4675,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -4706,11 +4706,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4860,14 +4860,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>1</events> @@ -4899,11 +4899,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4991,14 +4991,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -5030,11 +5030,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5122,14 +5122,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -5161,11 +5161,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5253,14 +5253,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 32.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>32.0</browserVersion> <events>0</events> @@ -5292,11 +5292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5384,14 +5384,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -5423,11 +5423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index 5b6feb65e3..ec75eaf279 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index cbcb34d9ba..6b6983c922 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,11 +93,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -165,14 +165,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -200,11 +200,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -350,14 +350,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -385,11 +385,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -457,14 +457,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -492,11 +492,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -855,14 +855,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -890,11 +890,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -962,14 +962,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -997,7 +997,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1065,14 +1065,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1100,7 +1100,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1246,14 +1246,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1281,7 +1281,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1349,14 +1349,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1384,7 +1384,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1692,14 +1692,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -1727,7 +1727,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</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 6f28c2fa44..df0b8e12b6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,7 +93,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -161,14 +161,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -196,7 +196,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -342,14 +342,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -377,7 +377,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -445,14 +445,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -480,7 +480,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -788,14 +788,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -823,7 +823,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -891,14 +891,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -926,11 +926,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -998,14 +998,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1033,11 +1033,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1183,14 +1183,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1218,11 +1218,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1290,14 +1290,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1325,11 +1325,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1688,14 +1688,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -1723,11 +1723,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml index e2ab7a0e53..ede776e224 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 9ec764ffe6..9abb2c8121 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Internet Explorer</label> @@ -22,7 +22,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>RockMelt</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> </row> <row> <label>Epiphany</label> @@ -46,7 +46,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Android Browser</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> </row> <row> <label>Firefox</label> @@ -82,7 +82,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Chrome Mobile</label> @@ -94,6 +94,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index fb459cbb95..c0c93c6084 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==RM;browserVersion==0.9</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> </row> <row> <label>Epiphany 2.30</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==EP;browserVersion==2.30</segment> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Chrome 37.0</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==37.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Android Browser</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==AN;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> </row> <row> <label>Chrome 19.0</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==19.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 20.0</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==20.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Chrome 11.0</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==11.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 39.0</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 41.0</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==41.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome Mobile 39.0</label> @@ -167,7 +167,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CM;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> </row> <row> <label>Internet Explorer 5.0</label> @@ -180,7 +180,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==5.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -193,7 +193,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 8.0</label> @@ -206,7 +206,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==8.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -219,6 +219,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==1.0</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index cce03cafcc..69929893e9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> <segment>browserCode==CH</segment> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> <segment>browserCode==IE</segment> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> <segment>browserCode==RM</segment> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> <segment>browserCode==EP</segment> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> <segment>browserCode==UNK</segment> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> <segment>browserCode==AN</segment> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> <segment>browserCode==CM</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 9eee07e117..a605a1c734 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>GNU/Linux</label> @@ -34,7 +34,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android</label> @@ -46,7 +46,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>Bot</label> @@ -70,7 +70,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>iOS</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + <logo>plugins/DevicesDetection/images/os/IOS.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index f20b32cd47..a648a6436a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Windows 7</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>Mac 10.6</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Mac 10.10</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Unknown</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>Windows XP</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>Android 2.3</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Android 4.4</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Bot</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>iOS 7.1</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment> - <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + <logo>plugins/DevicesDetection/images/os/IOS.png</logo> </row> <row> <label>Mac</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Mac 10.8</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -167,6 +167,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 4dccd588ec..c4a8368cd1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -76,14 +76,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -111,15 +111,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -222,14 +222,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -338,14 +338,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -377,23 +377,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -496,14 +496,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -531,19 +531,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -616,14 +616,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -651,19 +651,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -749,14 +749,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -784,27 +784,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -888,14 +888,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -923,15 +923,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -1017,14 +1017,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1052,7 +1052,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1138,14 +1138,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1173,27 +1173,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1319,14 +1319,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1354,11 +1354,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1444,14 +1444,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1479,19 +1479,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1577,14 +1577,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1612,19 +1612,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1899,14 +1899,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2011,14 +2011,14 @@ <deviceModel /> <operatingSystem>Mac</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 5.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -2140,14 +2140,14 @@ <deviceModel /> <operatingSystem>Windows</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -2260,14 +2260,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2424,14 +2424,14 @@ <deviceModel>GALAXY S5</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 39.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -2540,14 +2540,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2681,14 +2681,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2799,14 +2799,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 41.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>41.0</browserVersion> <events>0</events> @@ -2921,14 +2921,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -2956,11 +2956,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3044,14 +3044,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -3079,27 +3079,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -3185,14 +3185,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 39.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -3297,14 +3297,14 @@ <deviceModel>iPhone</deviceModel> <operatingSystem>iOS 7.1</operatingSystem> <operatingSystemName>iOS</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.png</operatingSystemIcon> <operatingSystemCode>IOS</operatingSystemCode> <operatingSystemVersion>7.1</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>1.0</browserVersion> <events>0</events> @@ -3398,14 +3398,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3498,14 +3498,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3608,14 +3608,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3722,14 +3722,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3855,14 +3855,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3996,14 +3996,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4110,14 +4110,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4224,14 +4224,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -4327,14 +4327,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4441,14 +4441,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -4555,14 +4555,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4669,14 +4669,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -4779,14 +4779,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4889,14 +4889,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -4999,14 +4999,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5109,14 +5109,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5219,14 +5219,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5329,14 +5329,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5439,14 +5439,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5549,14 +5549,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -5659,14 +5659,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -5769,14 +5769,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -5879,14 +5879,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5989,14 +5989,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -6099,14 +6099,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -6209,14 +6209,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -6319,14 +6319,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -6429,14 +6429,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 1d24cb751b..99e290e529 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -65,14 +65,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -100,15 +100,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -200,14 +200,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -305,14 +305,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -344,23 +344,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -452,14 +452,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -487,19 +487,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -572,14 +572,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -607,19 +607,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -694,14 +694,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -729,27 +729,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -822,14 +822,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -857,15 +857,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -940,14 +940,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -975,7 +975,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1050,14 +1050,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1085,27 +1085,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1220,14 +1220,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1255,11 +1255,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1334,14 +1334,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1369,19 +1369,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1456,14 +1456,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1491,19 +1491,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1584,14 +1584,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -1619,11 +1619,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1696,14 +1696,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -1731,27 +1731,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -1866,14 +1866,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 5.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -1901,11 +1901,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 75c89e1aa1..2a99405309 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -140,14 +140,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -179,11 +179,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -271,14 +271,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -310,11 +310,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -445,14 +445,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -484,11 +484,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 13e2249fbb..c4bbb582ee 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -78,14 +78,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -117,11 +117,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -271,14 +271,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -310,11 +310,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -402,14 +402,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -441,11 +441,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 7bfd771393..9f8bfc5a7e 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,11 +95,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -107,11 +107,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -216,11 +216,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -228,11 +228,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -337,11 +337,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -349,11 +349,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -458,11 +458,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -470,11 +470,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -610,11 +610,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -622,11 +622,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -762,11 +762,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -774,11 +774,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -906,11 +906,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -918,11 +918,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 906ac14bbe..06e1bef9a1 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 @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -236,14 +236,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -263,11 +263,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -364,14 +364,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -391,11 +391,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -526,14 +526,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -553,11 +553,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -654,14 +654,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -681,11 +681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -816,14 +816,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -843,11 +843,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -936,14 +936,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -963,11 +963,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 0861763ac1..ab5f5e2975 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 @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 e3e0da7816..6c6531774e 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 @@ -108,14 +108,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -137,11 +137,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -238,14 +238,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -267,11 +267,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -402,14 +402,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -431,11 +431,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -548,14 +548,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -577,11 +577,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -678,14 +678,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -707,11 +707,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -808,14 +808,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -837,11 +837,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -928,14 +928,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -957,11 +957,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 0861763ac1..ab5f5e2975 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 @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 a836236262..a9c90d5638 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1187,14 +1187,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1318,14 +1318,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1357,11 +1357,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1511,14 +1511,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index c2998323f3..cee8ad2d77 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml index 72728977e1..5fb88fd638 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index d2b191ec2f..f9671f4619 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index 3b81bc098d..2603420cd3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index a5759e34ec..9d976b6ea3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index 4b9b40aeea..07e1a01b33 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 9707adaacf..3086cf37f6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml index 72728977e1..5fb88fd638 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index da553644d5..5d97f32abd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 10868debe6..4aadf7058b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 0bb4fd3f0b..8a48a353ab 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 59b8d0aee1..7948d87923 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 205baa4d5b..1f8831dbca 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</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 1c1b8ffd04..bc89424726 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 @@ -70,14 +70,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -282,14 +282,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -313,11 +313,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml index 000a410083..a9110fd732 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml @@ -4,13 +4,13 @@ <label>Cookie</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</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 480d02e41e..875c59cbea 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -172,14 +172,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -203,11 +203,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</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 2fc3bd1b69..40be69f616 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 @@ -62,14 +62,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -160,14 +160,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -258,14 +258,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index ec4c9be19c..2f815adae7 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -49,7 +49,7 @@ <metrics> <nb_visits_0> <name>Firefox (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <min>0</min> <max>1</max> </nb_visits_0> @@ -58,7 +58,7 @@ </nb_visits_1> <nb_visits_2> <name>Opera (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/OP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/OP.png</logo> <min>0</min> <max>1</max> <change>-100%</change> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index af302cd2d0..b4bf45b285 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index c7f2ba93a9..90304482e5 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> 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 483c51771c..d7ecc8aaf0 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index fc66b8a687..8c16c382ce 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -18,7 +18,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index a3c09a7a76..394432870a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml index 78a7a0c724..d578ec8d9a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml @@ -14,7 +14,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsByDaysSinceLast&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml index 2eaea47bc6..cd964f981f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -15,8 +15,8 @@ <max_actions>Maximum actions in one visit</max_actions> </metrics> <metricsDocumentation> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 43663c9b48..c75df5d90e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -2004,7 +2004,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2017,7 +2017,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2030,7 +2030,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2043,7 +2043,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2056,7 +2056,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2069,7 +2069,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2082,7 +2082,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2095,7 +2095,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2108,7 +2108,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2121,7 +2121,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4759,7 +4759,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4784,7 +4784,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4809,7 +4809,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5011,7 +5011,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5036,7 +5036,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5061,7 +5061,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera 9.63 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5129,7 +5129,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5154,7 +5154,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5222,7 +5222,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5247,7 +5247,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index d2606623e3..0e6b621ee2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -550,7 +550,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.gif'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -575,7 +575,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -697,7 +697,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -842,7 +842,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -867,7 +867,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -929,7 +929,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -954,7 +954,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -979,7 +979,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1041,7 +1041,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1066,7 +1066,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1091,7 +1091,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera 9.63 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1259,7 +1259,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1284,7 +1284,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1440,7 +1440,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1453,7 +1453,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1466,7 +1466,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1479,7 +1479,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1492,7 +1492,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1505,7 +1505,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1518,7 +1518,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1531,7 +1531,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1544,7 +1544,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1557,7 +1557,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1607,7 +1607,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1632,7 +1632,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> France </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1777,7 +1777,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1922,7 +1922,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml index b14c503cb3..20bb6ac8e4 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml @@ -183,7 +183,7 @@ <row> <name>Unique visitors</name> <id>nb_uniq_visitors</id> - <documentation>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</documentation> + <documentation>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</documentation> </row> <row> <name>Users</name> @@ -193,6 +193,6 @@ <row> <name>Visits</name> <id>nb_visits</id> - <documentation>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</documentation> + <documentation>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</documentation> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 190aeeea80..b89ff58332 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -94,7 +94,7 @@ </row> <row> <name>Referrer Type (Referrers)</name> - <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> + <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> </row> <row> <name>Region (Visitors)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml index 439a50b51d..7dfd04caa5 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml @@ -14,8 +14,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 4fad658db9..286c0b87bf 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index b2f868a1e0..f76ad01380 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -16,7 +16,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> @@ -49,7 +49,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> @@ -80,8 +80,8 @@ <max_actions>Maximum actions in one visit</max_actions> </metrics> <metricsDocumentation> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> @@ -111,7 +111,7 @@ <nb_visits_converted>Visits with Conversions</nb_visits_converted> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -143,8 +143,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -183,8 +183,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -222,8 +222,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -261,8 +261,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -300,8 +300,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -340,8 +340,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -381,8 +381,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -421,8 +421,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -462,8 +462,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -502,8 +502,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -543,8 +543,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -574,7 +574,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <processedMetrics> <nb_visits_percentage>% Visits</nb_visits_percentage> @@ -597,8 +597,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -635,8 +635,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -673,8 +673,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -711,8 +711,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -751,8 +751,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -789,8 +789,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -827,7 +827,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsPerVisitDuration&period=day&date=2009-01-04</imageGraphUrl> @@ -845,7 +845,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsPerPage&period=day&date=2009-01-04</imageGraphUrl> @@ -863,7 +863,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <processedMetrics> <nb_visits_percentage>% Visits</nb_visits_percentage> @@ -884,7 +884,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsByDaysSinceLast&period=day&date=2009-01-04</imageGraphUrl> @@ -927,8 +927,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -968,8 +968,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1008,8 +1008,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1611,7 +1611,7 @@ <module>Referrers</module> <action>getReferrerType</action> <dimension>Referrer Type</dimension> - <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> + <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1619,8 +1619,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1660,8 +1660,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1693,8 +1693,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1734,8 +1734,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1775,8 +1775,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1816,8 +1816,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1851,8 +1851,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2298,8 +2298,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2329,8 +2329,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2361,8 +2361,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2393,8 +2393,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2451,8 +2451,8 @@ <nb_outlinks>The number of times this link was clicked.</nb_outlinks> <nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks> <nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index e6a02bc533..7b6386371b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> 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 d9d1b68bf4..62850e83c2 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 979634a932..0033c0f4a0 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 @@ -83,14 +83,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -126,11 +126,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -306,14 +306,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -349,11 +349,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 26e64dd585..6806c5300d 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 67409015ee..4a63c7e22e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> 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 391d44947e..a1632970fc 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -166,14 +166,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -209,11 +209,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -516,14 +516,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -559,11 +559,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -748,14 +748,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -787,11 +787,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index d53b33b873..b6a1196565 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -2041,7 +2041,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2054,7 +2054,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2067,7 +2067,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2080,7 +2080,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2093,7 +2093,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2106,7 +2106,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2119,7 +2119,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2132,7 +2132,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2145,7 +2145,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2158,7 +2158,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6486,7 +6486,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6554,7 +6554,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6622,7 +6622,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6690,7 +6690,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index bce9dd677d..0c89298696 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -711,7 +711,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -833,7 +833,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -955,7 +955,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1017,7 +1017,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1079,7 +1079,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1201,7 +1201,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1311,7 +1311,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1324,7 +1324,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1337,7 +1337,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1350,7 +1350,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1363,7 +1363,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1376,7 +1376,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1389,7 +1389,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1402,7 +1402,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1415,7 +1415,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1428,7 +1428,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1478,7 +1478,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> Poland </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1503,7 +1503,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> France </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1625,7 +1625,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1770,7 +1770,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index c866fba5b5..f01ce588fb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> 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 21e1b1d26c..d69417fefd 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</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 21e1b1d26c..d69417fefd 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</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 6a412c0910..fd338a4b66 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 @@ -110,14 +110,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -149,11 +149,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -231,14 +231,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -270,11 +270,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml index c866fba5b5..f01ce588fb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 6a412c0910..fd338a4b66 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -110,14 +110,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -149,11 +149,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -231,14 +231,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -270,11 +270,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 23bcf1329b..a8c967db5e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 99b2ce1993..ae73047a6d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index 18ee2e2d93..80480a92da 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -23,7 +23,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml index 715dc2a6a6..a3444c4edf 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>GNU/Linux</label> @@ -23,7 +23,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 23bcf1329b..a8c967db5e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 99b2ce1993..ae73047a6d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 01be2a53b2..394b8fbe22 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index 82a3f3a9d0..03ecd49885 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5d3e67e9beee26b4feb388c1a251349704a75040c9d3333fc33455d83fa3756 -size 365232 +oid sha256:c868db3c1ab399cde8d451bbfa93877c6344b79919a85ecb17359355f756f737 +size 366062 diff --git a/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png new file mode 100644 index 0000000000..065744e5ba --- /dev/null +++ b/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e8135200b8d1c3efb7f298e770f053970918284b9fc9cdc2196bd4f199a77f9 +size 33186 diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png new file mode 100644 index 0000000000..cdcd8f823a --- /dev/null +++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a153ddf467e2d9809e2e0847ba84ecaf2237ebe4cd30d3d20af83abed5cf7a +size 536038 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 7f8db17a75..6a9f9afe36 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf3579f0bf10409d7676749c0c224b52d774dd21d171359cbcd965ad42b3926c -size 534374 +oid sha256:9d3263337b7290ee7245de98f6e9536d3bc27a2bfa19f00f1b62a3f2b962027d +size 535736 diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png index f8b28088b6..dcfa72ad40 100644 --- a/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d698b9577a9020d0f100199a4047b8a8d579ddde6c7f3b29a9e9662e67923b0 -size 249226 +oid sha256:6be595803eb63fa3a0bb53355d3d62b91b4ec02dcf011d44c8ebca6cf35ccd38 +size 248766 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index d964b4da35..564acb4490 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:341405323fc6fad225a921e8c95cc105620e64091e39145d0c8d43065f2deb6b -size 534631 +oid sha256:ee0d04bc0231261ea1b390bf40d17daf9429f3a017728487207ffc8470eaebda +size 535185 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 5dfe3a8dd2..ec0eb3e373 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc4f5fa1270655681abd6bf54a1234c8b89cbcceb8bedc155dabbcccfaadb00 -size 3518656 +oid sha256:e400562e9704150961a78839273f5762e156501bc98ff97f2543bcc8cdf5a115 +size 3518855 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index f3c20e75ca..6f056bd58e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5ee54b34b3bbe7f5710d258a047d5edd5a97579fd4283fcd7aab54d167ae29b -size 482817 +oid sha256:9205eaf8408b1c05663745b4d891f57d64fc848ae2a8e94b79fd0f1f559e38ad +size 483981 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 2dee64bd38..bd3053d2b4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8978656fc4b1fe831280c928ae2977181e92ac556be424924b6984ca307330bf -size 1445920 +oid sha256:d23210324f814e4787631183b01dd9686c9b6af70c21371b9ad88f6aecbd7c96 +size 1446402 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 5410dbf7c7..bb577a268a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f553b9822241920129e8d8abc38214622c71a562089269492a426f2018bf10ca -size 428163 +oid sha256:4fdde96d9eee84ebfe9a93d386eda2a5f653cd9c715ed1ab71d929a9d8e64c56 +size 428222 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index 73416fdd8a..979d5fad28 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:546b7a167d59cdb602f602970830e9087a6b050c531f3fe2108c691051813ec3 -size 454125 +oid sha256:440c3cda5ca21a946f7097da2305659058c06e5c6fc8fe94cc24524ed706b11c +size 454813 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index 9db129c064..2d7e97ef09 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1debe699b6d91a94f0ac6fdf0efadeb97cd1894e92913a4b90b22ea4dad12d1d -size 490045 +oid sha256:5636ae6b17f8bd1e399802071537ee8bfc0558700094f84b2eb4b7ecc1c2e14b +size 491277 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 8f6f95669b..ace02fe4d0 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:173e08c12b8bbcaa7149edf562257e5b937390040b2b2f02836849b456b1e8cf -size 168281 +oid sha256:c133c0a47fe8139277d12e0fd82a5145d84a22d6bfeeff18b4cde7a0e8316b04 +size 168821 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png index 026f667432..e7f02027c3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3c76e0a99232f10c5fcdec6a37e160c920d112da4a8148754d11d08527e2bc5 -size 71650 +oid sha256:66c69b9c0dda3f16b3085b947714776ef607351ba50814cd33d68c755ca1a74d +size 71814 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png new file mode 100644 index 0000000000..47ba6dc8b9 --- /dev/null +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68cf789a0eed947e56a03bfd067d70d072d66644bc49ddc58843496bdd365d30 +size 780740 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index ca41434bf6..a046862834 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0253ae4ba6f52eff347aae583c087f94bccea196c7a6d524b6dca351d9be57b8 -size 221865 +oid sha256:bfc9933ebf389ff0b85aeacb98511a4aaa8009e12e2c92eec4a01b15685e44c1 +size 222126 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index e9107bf20c..d8f28e8748 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fa0770c2b182e72d2044f8d45011b8a75cea1a71c569a810a940dd1a4c6f922 -size 95201 +oid sha256:928758c9e4b5f75083aacca0c70f70e2b1f286dee73b6c35c38dd9a911bd2808 +size 95212 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index ff42467040..08d17ef1a3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb3ef27a3e3ae39417687002c9af7600824c75fdd51be475f6716319d03860fe -size 113419 +oid sha256:1abd2d5eb3aea1922c62bf0a3dc3e016fe3e7864635a4c3a8d275c93eb9487bd +size 113272 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 925c37186c..67baf4e5fd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d4ce63cc11da168ad1a77cddec4bc10175a4a92ef96dc4d3cd5cf05029050bf -size 158363 +oid sha256:dc82f24936677a6b2fecec702b48589de7fd1965ed2f99a04c399029073ef90c +size 160119 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png index 67ce759ddb..7756cf29eb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47dc2dc22184f54095c4d89ee4e3133676636b1368ed10f30e5bbe4ffe4c9ad7 -size 667319 +oid sha256:52bf7d2f5536420640b1e3d45d040baca3835cab691d2a91be088aaf1c012749 +size 666433 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png index 5e629280c5..b63d197e05 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49edad1dc5ad5e109ad343f4c1fa8be7d0b7bebb490f3a2fb9ce0e2236decce7 -size 103120 +oid sha256:e95c8e54dfe8372dfa46ee724adf29abc645c0fb5bce3f2e0aeec69f63da1ae2 +size 103651 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index 303123b61e..61f9ebb95b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833935057e539a8a9fec1b61e4fabd092a3cfa977582edd2fcb42bba3496f366 -size 448928 +oid sha256:4d98d162ebe7c45299e44816a7328b1df558da58756f98b43d5e85d36d334e6a +size 449633 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 90f6431983..677ecabc59 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5660573355433bf53667dc27130532a61d956afc4b94ced14cdfea45b652a4e6 -size 648443 +oid sha256:eabf0873f5f2770dd11927951387468209f68b58abc3af7d990afd8d5be328eb +size 647372 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index 2b0bddc02e..1a9dda3f85 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d82e24593699fc7c1ff4bf0ef0a6977663c62f269736fb6d96bc6dd4f676072 -size 46020 +oid sha256:b233e118fa6459b94faf6e31690f677181b2e5d830bbae56a8cb7329524cfb56 +size 46518 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png index fb947262e4..3e0d937536 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a3fbe7628cb93eeddafd3d4efb8a1d538c2c1ef40d74343c53311c37c182d2 -size 51194 +oid sha256:d62b387394e730e1b93285b55bcac93d2c5003d3fd6142ab4d56723e269572a0 +size 51239 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index 0a2d202649..f05763b4c3 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98a27a2c1de6866637b5f07a7c03a5adef8154e2a9b89ab2a01d99d42a40678a -size 38513 +oid sha256:1bcc1e41c968ea3f03e1977255a1470b3573f6d8c691f9f2fdd56b0313834eb5 +size 38625 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 29423f8b32..8e8f5cf26f 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd914e600c8f7644be2e05d3a14dc56f017b7a38de296f1301d8f0c0f2849fb9 -size 50052 +oid sha256:ac571db707145f557518a2a1c70461cc072d086a0ac3d5d7f2795124d1667901 +size 50019 diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js index 0c4f28f080..f647bdab68 100644 --- a/tests/UI/specs/Dashboard_spec.js +++ b/tests/UI/specs/Dashboard_spec.js @@ -223,4 +223,24 @@ describe("Dashboard", function () { }, done); }); + it("should load correctly with token_auth", function (done) { + testEnvironment.testUseMockAuth = 0; + testEnvironment.save(); + + expect.screenshot("loaded_token_auth").to.be.capture(function (page) { + var tokenAuth = "9ad1de7f8b329ab919d854c556f860c1"; + page.load(url.replace("idDashboard=5", "idDashboard=1") + '&token_auth=' + tokenAuth, 5000); + }, done); + }); + + it("should fail to load with invalid token_auth", function (done) { + testEnvironment.testUseMockAuth = 0; + testEnvironment.save(); + + expect.screenshot("invalid_token_auth").to.be.capture(function (page) { + var tokenAuth = "anyInvalidToken"; + page.load(url.replace("idDashboard=5", "idDashboard=1") + '&token_auth=' + tokenAuth, 5000); + }, done); + }); + }); diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 2519d08f3c..be9b70efb7 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -94,20 +94,19 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }, done); }); - // random failure here! the 'processed' screenshot displayed in UI test viewer is actually the next processed screenshot - //it('should load visitors > visitor log page correctly', function (done) { - // expect.screenshot("visitors_visitorlog").to.be.skippedOnAbort(); - // expect.screenshot("visitors_visitorlog").to.be.captureSelector('.pageWrap', function (page) { - // page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog"); - // }, done); - //}); - // - //it('should load visitors with site search > visitor log page correctly', function (done) { - // expect.screenshot("visitors_with_site_search_visitorlog").to.be.skippedOnAbort(); - // expect.screenshot("visitors_with_site_search_visitorlog").to.be.captureSelector('.pageWrap', function (page) { - // page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog&period=day&date=2012-01-11"); - // }, done); - //}); + it('should load visitors > visitor log page correctly', function (done) { + this.retries(3); + expect.screenshot("visitors_visitorlog").to.be.captureSelector('.pageWrap', function (page) { + page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog"); + }, done); + }); + + it('should load visitors with site search > visitor log page correctly', function (done) { + this.retries(3); + expect.screenshot("visitors_with_site_search_visitorlog").to.be.captureSelector('.pageWrap', function (page) { + page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog&period=day&date=2012-01-11"); + }, done); + }); it('should load the visitors > devices page correctly', function (done) { expect.screenshot("visitors_devices").to.be.captureSelector('.pageWrap', function (page) { @@ -367,12 +366,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? // widgetize it('should load the widgetized visitor log correctly', function (done) { + this.retries(3); expect.screenshot('widgetize_visitor_log').to.be.capture(function (page) { - expect.screenshot("widgetize_visitor_log").to.be.skippedOnAbort(); page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog"); page.evaluate(function () { $('.expandDataTableFooterDrawer').click(); - }); + }, 3000); }, done); }); @@ -380,11 +379,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? this.retries(3); expect.screenshot('widgetize_allwebsites').to.be.capture(function (page) { page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=MultiSites&actionToWidgetize=standalone"); + page.wait(1000); }, done); }); it('should widgetize the ecommerce log correctly', function (done) { - expect.screenshot("widgetize_ecommercelog").to.be.skippedOnAbort(); + this.retries(3); expect.screenshot('widgetize_ecommercelog').to.be.capture(function (page) { page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Ecommerce&actionToWidgetize=getEcommerceLog&filter_limit=-1"); }, done); @@ -411,7 +411,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }); it('should load the ecommerce log page', function (done) { - expect.screenshot("ecommerce_log").to.be.skippedOnAbort(); + this.retries(3); expect.screenshot('ecommerce_log').to.be.captureSelector('.pageWrap', function (page) { page.load("?" + urlBase + "#?" + generalParams + "&category=Goals_Ecommerce&subcategory=Goals_EcommerceLog"); }, done); @@ -688,59 +688,53 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? // extra segment tests it('should load the row evolution page correctly when a segment is selected', function (done) { - var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?module=CustomVariables&action=menuGetCustomVariables&idSite=1&period=year&date=2012-01-13"; - expect.page(url).contains('.ui-dialog > .ui-dialog-content > div.rowevolution:visible', 'segmented_rowevolution', function (page) { + this.retries(3); + expect.page().contains('.ui-dialog > .ui-dialog-content > div.rowevolution:visible', /*'segmented_rowevolution',*/ function (page) { + var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; + page.load(url, 1000); page.click('.segmentationTitle'); - page.click('.segname:contains(From Europe)'); + page.click('.segname:contains(From Europe)', 1000); page.mouseMove('table.dataTable tbody tr:first-child'); page.mouseMove('a.actionRowEvolution:visible'); // necessary to get popover to display page.click('a.actionRowEvolution:visible'); - page.wait(1000); + page.wait(2000); }, done); }); it('should load the segmented visitor log correctly when a segment is selected', function (done) { this.retries(3); - - expect.screenshot("segmented_visitorlog").to.be.skippedOnAbort(); - - var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; - expect.page(url).contains('.ui-dialog > .ui-dialog-content > div.dataTableVizVisitorLog:visible', 'segmented_visitorlog', function (page) { - page.wait(1000); - page.click('.segmentationTitle'); - page.wait(500); - page.click('.segname:contains(From Europe)'); - page.wait(500); + expect.screenshot('segmented_visitorlog').to.be.captureSelector('.ui-dialog > .ui-dialog-content > div.dataTableVizVisitorLog', function (page) { + var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; + page.load(url, 1000); + page.evaluate(function(){ + $('.segmentationTitle').click(); + $('.segname:contains(From Europe)').click(); + }, 5000); page.mouseMove('table.dataTable tbody tr:first-child'); - page.wait(500); - page.mouseMove('a.actionSegmentVisitorLog:visible'); // necessary to get popover to display - page.wait(500); - page.click('a.actionSegmentVisitorLog:visible'); - page.wait(1000); - + page.evaluate(function(){ + var visitorLogLinkSelector = 'table.dataTable tbody tr:first-child a.actionSegmentVisitorLog'; + $(visitorLogLinkSelector).click(); + }, 2000); }, done); }); it('should not apply current segmented when opening visitor log', function (done) { this.retries(3); - var url = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog&segment=visitCount==2&enableAnimation=0"; - delete testEnvironment.queryParamOverride.visitorId; testEnvironment.save(); expect.screenshot("visitor_profile_not_segmented").to.be.similar(0.002).to.capture(function (page) { - page.load(url); + var url = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog&segment=visitCount==2&enableAnimation=0"; + page.load(url, 1000); page.evaluate(function () { $('.visitor-log-visitor-profile-link').first().click(); - }); + }, 500); - page.wait(1000); + page.wait(2000); }, done); }); - - }); diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js index 7494b8910a..ffa6eebb6a 100644 --- a/tests/lib/screenshot-testing/support/chai-extras.js +++ b/tests/lib/screenshot-testing/support/chai-extras.js @@ -188,6 +188,18 @@ function capture(screenName, compareAgainst, selector, pageSetupFn, comparisonTh console.log(getPageLogsString(pageRenderer.pageLogs, " ")); } + // remove from failure list if it failed in a try before + var failures = []; + for (var i = 0; i < app.diffViewerGenerator.failures.length; i++) { + if (app.diffViewerGenerator.failures[i].name == testInfo.name && + app.diffViewerGenerator.failures[i].baseDirectory == testInfo.baseDirectory) { + app.runner.failures--; + continue; + } + failures.push(app.diffViewerGenerator.failures[i]); + } + app.diffViewerGenerator.failures = failures; + done(); }; diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index fe83cffcbc..ab756e211a 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -361,7 +361,7 @@ PageRenderer.prototype.capture = function (outputPath, callback, selector) { self.abort(); callback(new Error("Screenshot load timeout. Details:\n" + timeoutDetails)); - }, 180 * 1000); + }, 240 * 1000); if (this.webpage === null) { this._recreateWebPage(); |
