diff options
| author | sgiehl <stefan@piwik.org> | 2014-12-08 23:02:36 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-12-08 23:02:36 +0300 |
| commit | 49577cd232a807024c8835a57d3b790622bb5ff4 (patch) | |
| tree | acb4cc24ad19e928719ca0bcae3819773d1d4d8e /tests/PHPUnit | |
| parent | 0e058f9cb3c6ca8b8331276e96fa56483015e590 (diff) | |
refs #3962 - moved os/browser images to DevicesDetection plugin
Diffstat (limited to 'tests/PHPUnit')
58 files changed, 489 insertions, 489 deletions
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 6140bf8214..c2ce8972b0 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 @@ -77,11 +77,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <deviceType>Desktop</deviceType> @@ -171,11 +171,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -265,11 +265,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <deviceType>Desktop</deviceType> @@ -359,11 +359,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <deviceType>Desktop</deviceType> @@ -453,11 +453,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <deviceType>Desktop</deviceType> @@ -547,11 +547,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -641,11 +641,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <deviceType>Desktop</deviceType> @@ -735,11 +735,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <deviceType>Smartphone</deviceType> @@ -829,11 +829,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> 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 896b4d503f..d34efe28f8 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 @@ -186,11 +186,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -298,11 +298,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -405,11 +405,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -526,11 +526,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -636,11 +636,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -734,11 +734,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -838,11 +838,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <deviceType>Desktop</deviceType> @@ -926,11 +926,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -1030,11 +1030,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <deviceType>Smartphone</deviceType> @@ -1128,11 +1128,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> 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 8e3799fa9e..14943c61f2 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1014,12 +1014,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1137,12 +1137,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1291,12 +1291,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1414,12 +1414,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1551,12 +1551,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1688,12 +1688,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -1803,12 +1803,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1926,12 +1926,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2080,12 +2080,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2234,12 +2234,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2349,12 +2349,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2472,12 +2472,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2609,12 +2609,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2746,12 +2746,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2883,12 +2883,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3012,12 +3012,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3135,12 +3135,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3258,12 +3258,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3381,12 +3381,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -3504,12 +3504,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3658,12 +3658,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3812,12 +3812,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3966,12 +3966,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -4112,12 +4112,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -4235,12 +4235,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4358,12 +4358,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4481,12 +4481,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4604,12 +4604,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 a45e6b00b5..afa050d312 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -148,12 +148,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -316,12 +316,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -416,12 +416,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -751,12 +751,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -851,12 +851,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -947,12 +947,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1111,12 +1111,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1207,12 +1207,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1538,12 +1538,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> 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 a45e6b00b5..afa050d312 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -148,12 +148,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -316,12 +316,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -416,12 +416,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -751,12 +751,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -851,12 +851,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -947,12 +947,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1111,12 +1111,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1207,12 +1207,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1538,12 +1538,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> 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 8723d1a05f..bc93ec3bb8 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>6</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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,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/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,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/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</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/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</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 80d06470a3..39e7328e8c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -10,7 +10,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/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt 0.9</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -46,7 +46,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/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Chrome 19.0</label> @@ -58,7 +58,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Chrome 20.0</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Firefox 6.0</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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -94,7 +94,7 @@ <nb_visits_converted>1</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/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome 11.0</label> @@ -106,7 +106,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -118,6 +118,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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</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 8723d1a05f..bc93ec3bb8 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>6</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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,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/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,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/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</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/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </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 62d091d83d..af7e4f8f92 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>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/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac</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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android</label> @@ -46,7 +46,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/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Bot</label> @@ -58,7 +58,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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Unknown</label> @@ -70,6 +70,6 @@ <nb_visits_converted>0</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</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 7cad47e0a1..254ec3889b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -10,7 +10,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/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows 7</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android 2.3</label> @@ -46,7 +46,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/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Windows XP</label> @@ -58,7 +58,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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> @@ -82,7 +82,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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> @@ -94,6 +94,6 @@ <nb_visits_converted>0</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</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 93c0819d6c..5009922ea1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -64,12 +64,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemCode>W81</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/W81.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -200,12 +200,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -311,12 +311,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -455,12 +455,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -568,12 +568,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -692,12 +692,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -823,12 +823,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -943,12 +943,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1055,12 +1055,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1222,12 +1222,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 8</operatingSystem> <operatingSystemCode>WI8</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI8.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1338,12 +1338,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1462,12 +1462,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1744,12 +1744,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1858,12 +1858,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -1973,12 +1973,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -2104,12 +2104,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2227,12 +2227,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2357,12 +2357,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2463,12 +2463,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2569,12 +2569,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -2665,12 +2665,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2771,12 +2771,12 @@ <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -2877,12 +2877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2979,12 +2979,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -3081,12 +3081,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3183,12 +3183,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -3285,12 +3285,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3387,12 +3387,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3489,12 +3489,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3591,12 +3591,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3693,12 +3693,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3795,12 +3795,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -3897,12 +3897,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -3999,12 +3999,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -4101,12 +4101,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4203,12 +4203,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -4305,12 +4305,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -4407,12 +4407,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4509,12 +4509,12 @@ <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -4611,12 +4611,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 80d06470a3..39e7328e8c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -10,7 +10,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/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt 0.9</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -46,7 +46,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/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Chrome 19.0</label> @@ -58,7 +58,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Chrome 20.0</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Firefox 6.0</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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -94,7 +94,7 @@ <nb_visits_converted>1</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/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome 11.0</label> @@ -106,7 +106,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -118,6 +118,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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 8723d1a05f..bc93ec3bb8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>6</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/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,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/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</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/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,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/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</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/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 62d091d83d..af7e4f8f92 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -10,7 +10,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/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac</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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android</label> @@ -46,7 +46,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/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Bot</label> @@ -58,7 +58,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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Unknown</label> @@ -70,6 +70,6 @@ <nb_visits_converted>0</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 7cad47e0a1..254ec3889b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -10,7 +10,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/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows 7</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android 2.3</label> @@ -46,7 +46,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/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Windows XP</label> @@ -58,7 +58,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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> @@ -82,7 +82,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/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> @@ -94,6 +94,6 @@ <nb_visits_converted>0</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/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file 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 0879f6fb5b..0d6e1866ed 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>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -216,11 +216,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -337,11 +337,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -458,11 +458,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -610,11 +610,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -762,11 +762,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -906,11 +906,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> 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 d252d03f5d..84b93135bd 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 @@ -81,12 +81,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -233,12 +233,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -354,12 +354,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -506,12 +506,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -627,12 +627,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -779,12 +779,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -892,12 +892,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 2975b07bcb..10c86992ca 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 @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 759645d39d..29273fa92b 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 @@ -112,12 +112,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -235,12 +235,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -389,12 +389,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -526,12 +526,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -649,12 +649,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -772,12 +772,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -885,12 +885,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> 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 2975b07bcb..10c86992ca 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 @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 bd23daaa04..85ba4fcaa9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1014,12 +1014,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1137,12 +1137,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1291,12 +1291,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> 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 84860eba92..d2b191ec2f 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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</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 6f656fdf68..019893396e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</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 84860eba92..d2b191ec2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </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 379e429ee3..b749f9ebe4 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/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</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 4e417535ae..4429d16888 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml index 6f656fdf68..019893396e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml index 84860eba92..d2b191ec2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml index 379e429ee3..b749f9ebe4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_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/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 4e417535ae..4429d16888 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</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 968ffc7d90..da553644d5 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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</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 b8deec1d68..955f9837f9 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 @@ -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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</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 968ffc7d90..da553644d5 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,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </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 04cebec91e..4c8451e2d8 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/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</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 785661d383..d5c916aa6c 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 @@ -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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 6649f123d9..32e79a2c86 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 @@ -54,12 +54,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -240,12 +240,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index b8deec1d68..955f9837f9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml index 968ffc7d90..da553644d5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml index 04cebec91e..4c8451e2d8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_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/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index 785661d383..d5c916aa6c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_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/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 9b0149ac2a..cff7c54d20 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 @@ -43,12 +43,12 @@ <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -148,12 +148,12 @@ <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> 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 4eb429a763..3847bac724 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 @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -139,12 +139,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -230,12 +230,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</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 68837cb7a6..ec4c9be19c 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/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</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/UserSettings/images/browsers/OP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/OP.gif</logo> <min>0</min> <max>1</max> <change>-100%</change> 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 17d9192ba4..e4e40d6f84 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -43,12 +43,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 8ca1417d42..37aa7952b2 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 @@ -4713,7 +4713,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4738,7 +4738,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4763,7 +4763,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4831,7 +4831,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4856,7 +4856,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4881,7 +4881,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera 9.63 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5015,7 +5015,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5040,7 +5040,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5108,7 +5108,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5133,7 +5133,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); 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 89c97c7ba3..4ff4651817 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 @@ -4543,7 +4543,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4568,7 +4568,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4593,7 +4593,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4717,7 +4717,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4742,7 +4742,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4767,7 +4767,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera 9.63 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4889,7 +4889,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4914,7 +4914,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4976,7 +4976,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5001,7 +5001,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 346c1542db..74c05412ef 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 76d48bc7b6..5f2a28ce3e 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 @@ -81,12 +81,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -290,12 +290,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 5ff6e58fba..d7897e50e1 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -157,12 +157,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -485,12 +485,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -699,12 +699,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 dd359fb284..34dfb95a22 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 @@ -6502,7 +6502,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6570,7 +6570,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6704,7 +6704,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6772,7 +6772,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); 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 cf266ddbcc..7402ec0b43 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 @@ -6224,7 +6224,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6408,7 +6408,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6470,7 +6470,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6532,7 +6532,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 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 b48064a09c..cecf0df249 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 @@ -51,12 +51,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -164,12 +164,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -337,12 +337,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 b48064a09c..cecf0df249 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 @@ -51,12 +51,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -164,12 +164,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -337,12 +337,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> 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 845a1a23a9..64217e5250 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 @@ -97,12 +97,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -211,12 +211,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> 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 a968371537..4606699122 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</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 c58f00fa96..2925479cc4 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Android 4.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</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 a968371537..4606699122 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 @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</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 c58f00fa96..2925479cc4 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 @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Android 4.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file |