diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..413ee57f7c63f21321fcf1cc0598c71f7fc730d5 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,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>
@@ -144,12 +144,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/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..413ee57f7c63f21321fcf1cc0598c71f7fc730d5 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -46,12 +46,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>
@@ -144,12 +144,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/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..413ee57f7c63f21321fcf1cc0598c71f7fc730d5 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,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>
@@ -144,12 +144,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/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..413ee57f7c63f21321fcf1cc0598c71f7fc730d5 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,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>
@@ -144,12 +144,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/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c20705bced1dcca8867da337beb65b1b..413ee57f7c63f21321fcf1cc0598c71f7fc730d5 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -46,12 +46,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>
@@ -144,12 +144,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/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
index da580cc910c8c2813c1da76dacb5d96ea3280535..d1b95ea9e0f7dc32825266e432977a2f0e117229 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -119,12 +119,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/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index c8fe989045396c2cb502b2e8a2b415e0f4802a85..8ab0ffe9251ab7d7654f511be71cb47b71ce201d 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -80,7 +80,7 @@ function getBrowserName($label)
*/
function getBrowserLogo($short)
{
- $path = 'plugins/UserSettings/images/browsers/%s.gif';
+ $path = 'plugins/DevicesDetection/images/browsers/%s.gif';
// If name is given instead of short code, try to find matching shortcode
if (strlen($short) > 2) {
@@ -258,7 +258,7 @@ function _mapLegacyOsShortCodes($shortCode)
*/
function getOsLogo($short)
{
- $path = 'plugins/UserSettings/images/os/%s.gif';
+ $path = 'plugins/DevicesDetection/images/os/%s.gif';
$short = _mapLegacyOsShortCodes($short);
diff --git a/plugins/UserSettings/images/browsers/AA.gif b/plugins/DevicesDetection/images/browsers/AA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AA.gif
rename to plugins/DevicesDetection/images/browsers/AA.gif
diff --git a/plugins/UserSettings/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AB.gif
rename to plugins/DevicesDetection/images/browsers/AB.gif
diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AG.gif
rename to plugins/DevicesDetection/images/browsers/AG.gif
diff --git a/plugins/UserSettings/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AM.gif
rename to plugins/DevicesDetection/images/browsers/AM.gif
diff --git a/plugins/UserSettings/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AN.gif
rename to plugins/DevicesDetection/images/browsers/AN.gif
diff --git a/plugins/UserSettings/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AR.gif
rename to plugins/DevicesDetection/images/browsers/AR.gif
diff --git a/plugins/UserSettings/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AV.gif
rename to plugins/DevicesDetection/images/browsers/AV.gif
diff --git a/plugins/UserSettings/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/AW.gif
rename to plugins/DevicesDetection/images/browsers/AW.gif
diff --git a/plugins/UserSettings/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/B2.gif
rename to plugins/DevicesDetection/images/browsers/B2.gif
diff --git a/plugins/UserSettings/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BB.gif
rename to plugins/DevicesDetection/images/browsers/BB.gif
diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BD.gif
rename to plugins/DevicesDetection/images/browsers/BD.gif
diff --git a/plugins/UserSettings/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BE.gif
rename to plugins/DevicesDetection/images/browsers/BE.gif
diff --git a/plugins/UserSettings/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BJ.gif
rename to plugins/DevicesDetection/images/browsers/BJ.gif
diff --git a/plugins/UserSettings/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BP.gif
rename to plugins/DevicesDetection/images/browsers/BP.gif
diff --git a/plugins/UserSettings/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BS.gif
rename to plugins/DevicesDetection/images/browsers/BS.gif
diff --git a/plugins/UserSettings/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/BX.gif
rename to plugins/DevicesDetection/images/browsers/BX.gif
diff --git a/plugins/UserSettings/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CA.gif
rename to plugins/DevicesDetection/images/browsers/CA.gif
diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CD.gif
rename to plugins/DevicesDetection/images/browsers/CD.gif
diff --git a/plugins/UserSettings/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CF.gif
rename to plugins/DevicesDetection/images/browsers/CF.gif
diff --git a/plugins/UserSettings/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CH.gif
rename to plugins/DevicesDetection/images/browsers/CH.gif
diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CK.gif
rename to plugins/DevicesDetection/images/browsers/CK.gif
diff --git a/plugins/UserSettings/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CM.gif
rename to plugins/DevicesDetection/images/browsers/CM.gif
diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CN.gif
rename to plugins/DevicesDetection/images/browsers/CN.gif
diff --git a/plugins/UserSettings/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CO.gif
rename to plugins/DevicesDetection/images/browsers/CO.gif
diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CP.gif
rename to plugins/DevicesDetection/images/browsers/CP.gif
diff --git a/plugins/UserSettings/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/CS.gif
rename to plugins/DevicesDetection/images/browsers/CS.gif
diff --git a/plugins/UserSettings/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/DF.gif
rename to plugins/DevicesDetection/images/browsers/DF.gif
diff --git a/plugins/UserSettings/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/DI.gif
rename to plugins/DevicesDetection/images/browsers/DI.gif
diff --git a/plugins/UserSettings/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/EL.gif
rename to plugins/DevicesDetection/images/browsers/EL.gif
diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/EP.gif
rename to plugins/DevicesDetection/images/browsers/EP.gif
diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ES.gif
rename to plugins/DevicesDetection/images/browsers/ES.gif
diff --git a/plugins/UserSettings/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FB.gif
rename to plugins/DevicesDetection/images/browsers/FB.gif
diff --git a/plugins/UserSettings/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FD.gif
rename to plugins/DevicesDetection/images/browsers/FD.gif
diff --git a/plugins/UserSettings/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FE.gif
rename to plugins/DevicesDetection/images/browsers/FE.gif
diff --git a/plugins/UserSettings/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FF.gif
rename to plugins/DevicesDetection/images/browsers/FF.gif
diff --git a/plugins/UserSettings/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FL.gif
rename to plugins/DevicesDetection/images/browsers/FL.gif
diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/FN.gif
rename to plugins/DevicesDetection/images/browsers/FN.gif
diff --git a/plugins/UserSettings/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/GA.gif
rename to plugins/DevicesDetection/images/browsers/GA.gif
diff --git a/plugins/UserSettings/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/GE.gif
rename to plugins/DevicesDetection/images/browsers/GE.gif
diff --git a/plugins/UserSettings/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/HA.gif
rename to plugins/DevicesDetection/images/browsers/HA.gif
diff --git a/plugins/UserSettings/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/HJ.gif
rename to plugins/DevicesDetection/images/browsers/HJ.gif
diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IA.gif
rename to plugins/DevicesDetection/images/browsers/IA.gif
diff --git a/plugins/UserSettings/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IB.gif
rename to plugins/DevicesDetection/images/browsers/IB.gif
diff --git a/plugins/UserSettings/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IC.gif
rename to plugins/DevicesDetection/images/browsers/IC.gif
diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ID.gif
rename to plugins/DevicesDetection/images/browsers/ID.gif
diff --git a/plugins/UserSettings/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IE.gif
rename to plugins/DevicesDetection/images/browsers/IE.gif
diff --git a/plugins/UserSettings/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IM.gif
rename to plugins/DevicesDetection/images/browsers/IM.gif
diff --git a/plugins/UserSettings/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IR.gif
rename to plugins/DevicesDetection/images/browsers/IR.gif
diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/IW.gif
rename to plugins/DevicesDetection/images/browsers/IW.gif
diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KI.gif
rename to plugins/DevicesDetection/images/browsers/KI.gif
diff --git a/plugins/UserSettings/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KM.gif
rename to plugins/DevicesDetection/images/browsers/KM.gif
diff --git a/plugins/UserSettings/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KO.gif
rename to plugins/DevicesDetection/images/browsers/KO.gif
diff --git a/plugins/UserSettings/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KP.gif
rename to plugins/DevicesDetection/images/browsers/KP.gif
diff --git a/plugins/UserSettings/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/KZ.gif
rename to plugins/DevicesDetection/images/browsers/KZ.gif
diff --git a/plugins/UserSettings/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LB.gif
rename to plugins/DevicesDetection/images/browsers/LB.gif
diff --git a/plugins/UserSettings/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LG.gif
rename to plugins/DevicesDetection/images/browsers/LG.gif
diff --git a/plugins/UserSettings/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LI.gif
rename to plugins/DevicesDetection/images/browsers/LI.gif
diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LS.gif
rename to plugins/DevicesDetection/images/browsers/LS.gif
diff --git a/plugins/UserSettings/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/LX.gif
rename to plugins/DevicesDetection/images/browsers/LX.gif
diff --git a/plugins/UserSettings/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MC.gif
rename to plugins/DevicesDetection/images/browsers/MC.gif
diff --git a/plugins/UserSettings/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MF.gif
rename to plugins/DevicesDetection/images/browsers/MF.gif
diff --git a/plugins/UserSettings/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MI.gif
rename to plugins/DevicesDetection/images/browsers/MI.gif
diff --git a/plugins/UserSettings/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MO.gif
rename to plugins/DevicesDetection/images/browsers/MO.gif
diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MS.gif
rename to plugins/DevicesDetection/images/browsers/MS.gif
diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/MX.gif
rename to plugins/DevicesDetection/images/browsers/MX.gif
diff --git a/plugins/UserSettings/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NB.gif
rename to plugins/DevicesDetection/images/browsers/NB.gif
diff --git a/plugins/UserSettings/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NF.gif
rename to plugins/DevicesDetection/images/browsers/NF.gif
diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NL.gif
rename to plugins/DevicesDetection/images/browsers/NL.gif
diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NP.gif
rename to plugins/DevicesDetection/images/browsers/NP.gif
diff --git a/plugins/UserSettings/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/NS.gif
rename to plugins/DevicesDetection/images/browsers/NS.gif
diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OB.gif
rename to plugins/DevicesDetection/images/browsers/OB.gif
diff --git a/plugins/UserSettings/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OI.gif
rename to plugins/DevicesDetection/images/browsers/OI.gif
diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/ON.gif
rename to plugins/DevicesDetection/images/browsers/ON.gif
diff --git a/plugins/UserSettings/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OP.gif
rename to plugins/DevicesDetection/images/browsers/OP.gif
diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OR.gif
rename to plugins/DevicesDetection/images/browsers/OR.gif
diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OV.gif
rename to plugins/DevicesDetection/images/browsers/OV.gif
diff --git a/plugins/UserSettings/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/OW.gif
rename to plugins/DevicesDetection/images/browsers/OW.gif
diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PL.gif
rename to plugins/DevicesDetection/images/browsers/PL.gif
diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PM.gif
rename to plugins/DevicesDetection/images/browsers/PM.gif
diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PO.gif
rename to plugins/DevicesDetection/images/browsers/PO.gif
diff --git a/plugins/UserSettings/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PU.gif
rename to plugins/DevicesDetection/images/browsers/PU.gif
diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PW.gif
rename to plugins/DevicesDetection/images/browsers/PW.gif
diff --git a/plugins/UserSettings/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/PX.gif
rename to plugins/DevicesDetection/images/browsers/PX.gif
diff --git a/plugins/UserSettings/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/RK.gif
rename to plugins/DevicesDetection/images/browsers/RK.gif
diff --git a/plugins/UserSettings/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SA.gif
rename to plugins/DevicesDetection/images/browsers/SA.gif
diff --git a/plugins/UserSettings/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SE.gif
rename to plugins/DevicesDetection/images/browsers/SE.gif
diff --git a/plugins/UserSettings/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SF.gif
rename to plugins/DevicesDetection/images/browsers/SF.gif
diff --git a/plugins/UserSettings/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SH.gif
rename to plugins/DevicesDetection/images/browsers/SH.gif
diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SL.gif
rename to plugins/DevicesDetection/images/browsers/SL.gif
diff --git a/plugins/UserSettings/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/SM.gif
rename to plugins/DevicesDetection/images/browsers/SM.gif
diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TB.gif
rename to plugins/DevicesDetection/images/browsers/TB.gif
diff --git a/plugins/UserSettings/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TI.gif
rename to plugins/DevicesDetection/images/browsers/TI.gif
diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/TZ.gif
rename to plugins/DevicesDetection/images/browsers/TZ.gif
diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UC.gif
rename to plugins/DevicesDetection/images/browsers/UC.gif
diff --git a/plugins/UserSettings/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UN.gif
rename to plugins/DevicesDetection/images/browsers/UN.gif
diff --git a/plugins/UserSettings/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/UNK.gif
rename to plugins/DevicesDetection/images/browsers/UNK.gif
diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WE.gif
rename to plugins/DevicesDetection/images/browsers/WE.gif
diff --git a/plugins/UserSettings/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WO.gif
rename to plugins/DevicesDetection/images/browsers/WO.gif
diff --git a/plugins/UserSettings/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/WP.gif
rename to plugins/DevicesDetection/images/browsers/WP.gif
diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif
similarity index 100%
rename from plugins/UserSettings/images/browsers/YA.gif
rename to plugins/DevicesDetection/images/browsers/YA.gif
diff --git a/plugins/UserSettings/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/3DS.gif
rename to plugins/DevicesDetection/images/os/3DS.gif
diff --git a/plugins/UserSettings/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AIX.gif
rename to plugins/DevicesDetection/images/os/AIX.gif
diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AMG.gif
rename to plugins/DevicesDetection/images/os/AMG.gif
diff --git a/plugins/UserSettings/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AMI.gif
rename to plugins/DevicesDetection/images/os/AMI.gif
diff --git a/plugins/UserSettings/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif
similarity index 100%
rename from plugins/UserSettings/images/os/AND.gif
rename to plugins/DevicesDetection/images/os/AND.gif
diff --git a/plugins/UserSettings/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif
similarity index 100%
rename from plugins/UserSettings/images/os/ARL.gif
rename to plugins/DevicesDetection/images/os/ARL.gif
diff --git a/plugins/UserSettings/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BBX.gif
rename to plugins/DevicesDetection/images/os/BBX.gif
diff --git a/plugins/UserSettings/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BEO.gif
rename to plugins/DevicesDetection/images/os/BEO.gif
diff --git a/plugins/UserSettings/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BLB.gif
rename to plugins/DevicesDetection/images/os/BLB.gif
diff --git a/plugins/UserSettings/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BSD.gif
rename to plugins/DevicesDetection/images/os/BSD.gif
diff --git a/plugins/UserSettings/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif
similarity index 100%
rename from plugins/UserSettings/images/os/BTR.gif
rename to plugins/DevicesDetection/images/os/BTR.gif
diff --git a/plugins/UserSettings/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif
similarity index 100%
rename from plugins/UserSettings/images/os/CES.gif
rename to plugins/DevicesDetection/images/os/CES.gif
diff --git a/plugins/UserSettings/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/COS.gif
rename to plugins/DevicesDetection/images/os/COS.gif
diff --git a/plugins/UserSettings/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif
similarity index 100%
rename from plugins/UserSettings/images/os/DFB.gif
rename to plugins/DevicesDetection/images/os/DFB.gif
diff --git a/plugins/UserSettings/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/DSI.gif
rename to plugins/DevicesDetection/images/os/DSI.gif
diff --git a/plugins/UserSettings/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif
similarity index 100%
rename from plugins/UserSettings/images/os/FED.gif
rename to plugins/DevicesDetection/images/os/FED.gif
diff --git a/plugins/UserSettings/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/FOS.gif
rename to plugins/DevicesDetection/images/os/FOS.gif
diff --git a/plugins/UserSettings/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/GNT.gif
rename to plugins/DevicesDetection/images/os/GNT.gif
diff --git a/plugins/UserSettings/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif
similarity index 100%
rename from plugins/UserSettings/images/os/GTV.gif
rename to plugins/DevicesDetection/images/os/GTV.gif
diff --git a/plugins/UserSettings/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/HPX.gif
rename to plugins/DevicesDetection/images/os/HPX.gif
diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IOS.gif
rename to plugins/DevicesDetection/images/os/IOS.gif
diff --git a/plugins/UserSettings/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPA.gif
rename to plugins/DevicesDetection/images/os/IPA.gif
diff --git a/plugins/UserSettings/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPD.gif
rename to plugins/DevicesDetection/images/os/IPD.gif
diff --git a/plugins/UserSettings/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IPH.gif
rename to plugins/DevicesDetection/images/os/IPH.gif
diff --git a/plugins/UserSettings/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/IRI.gif
rename to plugins/DevicesDetection/images/os/IRI.gif
diff --git a/plugins/UserSettings/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/KBT.gif
rename to plugins/DevicesDetection/images/os/KBT.gif
diff --git a/plugins/UserSettings/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/KNO.gif
rename to plugins/DevicesDetection/images/os/KNO.gif
diff --git a/plugins/UserSettings/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/LBT.gif
rename to plugins/DevicesDetection/images/os/LBT.gif
diff --git a/plugins/UserSettings/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/LIN.gif
rename to plugins/DevicesDetection/images/os/LIN.gif
diff --git a/plugins/UserSettings/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MAC.gif
rename to plugins/DevicesDetection/images/os/MAC.gif
diff --git a/plugins/UserSettings/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MAE.gif
rename to plugins/DevicesDetection/images/os/MAE.gif
diff --git a/plugins/UserSettings/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MDR.gif
rename to plugins/DevicesDetection/images/os/MDR.gif
diff --git a/plugins/UserSettings/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/MIN.gif
rename to plugins/DevicesDetection/images/os/MIN.gif
diff --git a/plugins/UserSettings/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/NBS.gif
rename to plugins/DevicesDetection/images/os/NBS.gif
diff --git a/plugins/UserSettings/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/NDS.gif
rename to plugins/DevicesDetection/images/os/NDS.gif
diff --git a/plugins/UserSettings/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/OBS.gif
rename to plugins/DevicesDetection/images/os/OBS.gif
diff --git a/plugins/UserSettings/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif
similarity index 100%
rename from plugins/UserSettings/images/os/OS2.gif
rename to plugins/DevicesDetection/images/os/OS2.gif
diff --git a/plugins/UserSettings/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/POS.gif
rename to plugins/DevicesDetection/images/os/POS.gif
diff --git a/plugins/UserSettings/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PPY.gif
rename to plugins/DevicesDetection/images/os/PPY.gif
diff --git a/plugins/UserSettings/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PS3.gif
rename to plugins/DevicesDetection/images/os/PS3.gif
diff --git a/plugins/UserSettings/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PSP.gif
rename to plugins/DevicesDetection/images/os/PSP.gif
diff --git a/plugins/UserSettings/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif
similarity index 100%
rename from plugins/UserSettings/images/os/PSV.gif
rename to plugins/DevicesDetection/images/os/PSV.gif
diff --git a/plugins/UserSettings/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/QNX.gif
rename to plugins/DevicesDetection/images/os/QNX.gif
diff --git a/plugins/UserSettings/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/RHT.gif
rename to plugins/DevicesDetection/images/os/RHT.gif
diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/ROS.gif
rename to plugins/DevicesDetection/images/os/ROS.gif
diff --git a/plugins/UserSettings/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SAF.gif
rename to plugins/DevicesDetection/images/os/SAF.gif
diff --git a/plugins/UserSettings/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SBA.gif
rename to plugins/DevicesDetection/images/os/SBA.gif
diff --git a/plugins/UserSettings/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SLW.gif
rename to plugins/DevicesDetection/images/os/SLW.gif
diff --git a/plugins/UserSettings/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SOS.gif
rename to plugins/DevicesDetection/images/os/SOS.gif
diff --git a/plugins/UserSettings/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SSE.gif
rename to plugins/DevicesDetection/images/os/SSE.gif
diff --git a/plugins/UserSettings/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SYL.gif
rename to plugins/DevicesDetection/images/os/SYL.gif
diff --git a/plugins/UserSettings/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif
similarity index 100%
rename from plugins/UserSettings/images/os/SYM.gif
rename to plugins/DevicesDetection/images/os/SYM.gif
diff --git a/plugins/UserSettings/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif
similarity index 100%
rename from plugins/UserSettings/images/os/T64.gif
rename to plugins/DevicesDetection/images/os/T64.gif
diff --git a/plugins/UserSettings/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif
similarity index 100%
rename from plugins/UserSettings/images/os/TIZ.gif
rename to plugins/DevicesDetection/images/os/TIZ.gif
diff --git a/plugins/UserSettings/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/UBT.gif
rename to plugins/DevicesDetection/images/os/UBT.gif
diff --git a/plugins/UserSettings/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif
similarity index 100%
rename from plugins/UserSettings/images/os/UNK.gif
rename to plugins/DevicesDetection/images/os/UNK.gif
diff --git a/plugins/UserSettings/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/VMS.gif
rename to plugins/DevicesDetection/images/os/VMS.gif
diff --git a/plugins/UserSettings/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W10.gif
rename to plugins/DevicesDetection/images/os/W10.gif
diff --git a/plugins/UserSettings/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W2K.gif
rename to plugins/DevicesDetection/images/os/W2K.gif
diff --git a/plugins/UserSettings/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W61.gif
rename to plugins/DevicesDetection/images/os/W61.gif
diff --git a/plugins/UserSettings/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W65.gif
rename to plugins/DevicesDetection/images/os/W65.gif
diff --git a/plugins/UserSettings/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W75.gif
rename to plugins/DevicesDetection/images/os/W75.gif
diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W81.gif
rename to plugins/DevicesDetection/images/os/W81.gif
diff --git a/plugins/UserSettings/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W95.gif
rename to plugins/DevicesDetection/images/os/W95.gif
diff --git a/plugins/UserSettings/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif
similarity index 100%
rename from plugins/UserSettings/images/os/W98.gif
rename to plugins/DevicesDetection/images/os/W98.gif
diff --git a/plugins/UserSettings/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WCE.gif
rename to plugins/DevicesDetection/images/os/WCE.gif
diff --git a/plugins/UserSettings/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WI7.gif
rename to plugins/DevicesDetection/images/os/WI7.gif
diff --git a/plugins/UserSettings/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WI8.gif
rename to plugins/DevicesDetection/images/os/WI8.gif
diff --git a/plugins/UserSettings/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WII.gif
rename to plugins/DevicesDetection/images/os/WII.gif
diff --git a/plugins/UserSettings/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WIN.gif
rename to plugins/DevicesDetection/images/os/WIN.gif
diff --git a/plugins/UserSettings/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WIU.gif
rename to plugins/DevicesDetection/images/os/WIU.gif
diff --git a/plugins/UserSettings/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WME.gif
rename to plugins/DevicesDetection/images/os/WME.gif
diff --git a/plugins/UserSettings/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WMO.gif
rename to plugins/DevicesDetection/images/os/WMO.gif
diff --git a/plugins/UserSettings/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WNT.gif
rename to plugins/DevicesDetection/images/os/WNT.gif
diff --git a/plugins/UserSettings/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WOS.gif
rename to plugins/DevicesDetection/images/os/WOS.gif
diff --git a/plugins/UserSettings/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WP7.gif
rename to plugins/DevicesDetection/images/os/WP7.gif
diff --git a/plugins/UserSettings/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WPH.gif
rename to plugins/DevicesDetection/images/os/WPH.gif
diff --git a/plugins/UserSettings/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WRT.gif
rename to plugins/DevicesDetection/images/os/WRT.gif
diff --git a/plugins/UserSettings/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WS3.gif
rename to plugins/DevicesDetection/images/os/WS3.gif
diff --git a/plugins/UserSettings/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WVI.gif
rename to plugins/DevicesDetection/images/os/WVI.gif
diff --git a/plugins/UserSettings/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif
similarity index 100%
rename from plugins/UserSettings/images/os/WXP.gif
rename to plugins/DevicesDetection/images/os/WXP.gif
diff --git a/plugins/UserSettings/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif
similarity index 100%
rename from plugins/UserSettings/images/os/XBT.gif
rename to plugins/DevicesDetection/images/os/XBT.gif
diff --git a/plugins/UserSettings/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif
similarity index 100%
rename from plugins/UserSettings/images/os/XBX.gif
rename to plugins/DevicesDetection/images/os/XBX.gif
diff --git a/plugins/UserSettings/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif
similarity index 100%
rename from plugins/UserSettings/images/os/YNS.gif
rename to plugins/DevicesDetection/images/os/YNS.gif
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 6140bf8214577a11d910e697b4cba7d97d51077b..c2ce8972b098c2ad34d9779c837c9d5bd94c9da7 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 896b4d503fbc400e1b52ef1f756e287cd92c5904..d34efe28f802bc7dc701f29e7b76cf3467a4bced 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 8e3799fa9eeedb3c495ab4f914468279b7fa76f4..14943c61f2966bd59670b3da5a88c05e6130138d 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 a45e6b00b5f9502ee57fde3f0fc051387ab9654b..afa050d312ea3f67d612db4f3fa603359af25ede 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 a45e6b00b5f9502ee57fde3f0fc051387ab9654b..afa050d312ea3f67d612db4f3fa603359af25ede 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 8723d1a05faee3de0fc4ce4543784203bc248ba3..bc93ec3bb8a95b83f31f4820c10104b81a392a23 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 80d06470a3e8fc868ddc0e174315fd41484cdc1a..39e7328e8c76291e6951e69d3e7808dc5fd15509 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 8723d1a05faee3de0fc4ce4543784203bc248ba3..bc93ec3bb8a95b83f31f4820c10104b81a392a23 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 62d091d83d23e9cf46ed1816ec6957e5a35d484e..af7e4f8f924246c7c6567ea77d24a8812f895f56 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 7cad47e0a130bf0d60a92b7dcf353fb4ca176efd..254ec3889b3396a65ecc381e6fa70123673f76d9 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 93c0819d6cf324f382406089a718d158f7db978a..5009922ea1ac29236ef63aac3da9b1e8fd68440f 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 80d06470a3e8fc868ddc0e174315fd41484cdc1a..39e7328e8c76291e6951e69d3e7808dc5fd15509 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 8723d1a05faee3de0fc4ce4543784203bc248ba3..bc93ec3bb8a95b83f31f4820c10104b81a392a23 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 62d091d83d23e9cf46ed1816ec6957e5a35d484e..af7e4f8f924246c7c6567ea77d24a8812f895f56 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 7cad47e0a130bf0d60a92b7dcf353fb4ca176efd..254ec3889b3396a65ecc381e6fa70123673f76d9 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 0879f6fb5b842c36e9abab231b14d7012112274d..0d6e1866eddf3da3c9bb8202257258bb95f25748 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 d252d03f5d2622d73f459a9665c230efb0286df8..84b93135bd65448b3d6e53813f026f6faf961b22 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 2975b07bcb9130a86d41f69db929294eb8ea5460..10c86992caa15c9188b66844a2ece9b288195510 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 759645d39df54a656052c9b7a4aee8e9fe121bce..29273fa92bd57f2b0d9a7e829b3151fd3f1dca5d 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 2975b07bcb9130a86d41f69db929294eb8ea5460..10c86992caa15c9188b66844a2ece9b288195510 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 bd23daaa0429b62de553f3bb30db73b6f8e726b5..85ba4fcaa9e8f37b5a735344c1ca7fc7cafcbe5c 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 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 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 6f656fdf684c09928aa6548f45a6c4b650694d11..019893396e997e2635e7d036a6a36ed779d1fc0f 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 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 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 379e429ee3a8435028f4cbcb4044d2fc294c8498..b749f9ebe43cfaab2e489f927314c3424498341a 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 4e417535ae556a2a037f12607a85814303f504d7..4429d16888099f15e94909d215975c1ff7ad4658 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 6f656fdf684c09928aa6548f45a6c4b650694d11..019893396e997e2635e7d036a6a36ed779d1fc0f 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 84860eba92c41f254e96dccc3b707c34a79d3d58..d2b191ec2f6fd906fc2d02701e61d8357a40e708 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 379e429ee3a8435028f4cbcb4044d2fc294c8498..b749f9ebe43cfaab2e489f927314c3424498341a 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 4e417535ae556a2a037f12607a85814303f504d7..4429d16888099f15e94909d215975c1ff7ad4658 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 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 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 b8deec1d68873a611027d1f0a4e3c35ca9729fb2..955f9837f9473fef5327dc68d8b21e9116a4e08a 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 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 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 04cebec91e67db63635af9cdd3222d7adf1ab153..4c8451e2d8c7e18f8f2a528b75b2b513107d531a 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 785661d383ef5ea632fc9df19673bb92e0695801..d5c916aa6c873f07a8a54b9ea373ace5c62e98b5 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 6649f123d99f5e39d7f983ccbb1b9bc2741d76d5..32e79a2c86c60e1a17a54722d04927a4ab5f8b81 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 b8deec1d68873a611027d1f0a4e3c35ca9729fb2..955f9837f9473fef5327dc68d8b21e9116a4e08a 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 968ffc7d9000aeabe68b0e96625672fa5f8da026..da553644d5ad88ba29e452872eebcb0e52058df1 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 04cebec91e67db63635af9cdd3222d7adf1ab153..4c8451e2d8c7e18f8f2a528b75b2b513107d531a 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 785661d383ef5ea632fc9df19673bb92e0695801..d5c916aa6c873f07a8a54b9ea373ace5c62e98b5 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 9b0149ac2a0d47c75b8b363a629bcac3c7bc443c..cff7c54d200f27a06e5fbaaf2fb44f2e19ff06e1 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 4eb429a7633131ad521b257930ba1619f18bd51d..3847bac724a0913003b4ef380d863bfff2281cb6 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 68837cb7a6458e9ffb9aff18df9a8295729aa974..ec4c9be19cbd1c0fe58aae24f71fa949bc223cd3 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 17d9192ba422cc3aa77bb288ccf81c31518a0361..e4e40d6f8484b03a9e9d59b62b4a207d3c1d4a84 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 8ca1417d42f5b16f957a7366870249d66706cc94..37aa7952b2ab43952af0709311a9446685cfd9d7 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 89c97c7ba3d1c99e99e005e6069806fdc0eb5d94..4ff46518174155ebe24cf838956fa029b30f950d 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
index 346c1542dbf3c6c843ee17754e575ec5c71d7ca7..74c05412efe173753065c333ec7aa19d9ecffe03 100644
Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ
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 76d48bc7b6e95c2460ff65f2a273c31e6543d057..5f2a28ce3e5843b2bebf8ada5fe330a72b9a02ee 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 5ff6e58fbae68f83283f4537564934bc9ba61a2f..d7897e50e1e8acda914b27801121168630d9c593 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 dd359fb284ae509e2d31aea7325d1b99c2d0bce6..34dfb95a2278379bd157e678224b2260113f1037 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 cf266ddbcc89f350a93556093a72305ead59a663..7402ec0b43370b4690578ce645de5a27bff79b7b 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 b48064a09c9980a724ac7fcf19c71d1489c36c06..cecf0df2493937653d1bd298deaa77f04cd866ff 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 b48064a09c9980a724ac7fcf19c71d1489c36c06..cecf0df2493937653d1bd298deaa77f04cd866ff 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 845a1a23a9e41e3d5bbabfcbcb2d274db7250f28..64217e52508f31e65a3446e47a007b368079c3a8 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 a9683715379b2eb37e617e98f589e36d9f55910c..4606699122a64d042c95a71d831197883b60f83d 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 c58f00fa96ce13bc9a8567c34751dbfd4f38732a..2925479cc4d955997f3157eb4b445a293be35b14 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 a9683715379b2eb37e617e98f589e36d9f55910c..4606699122a64d042c95a71d831197883b60f83d 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 c58f00fa96ce13bc9a8567c34751dbfd4f38732a..2925479cc4d955997f3157eb4b445a293be35b14 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