diff options
author | sgiehl <stefan@piwik.org> | 2014-12-08 23:02:36 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-12-08 23:02:36 +0300 |
commit | 49577cd232a807024c8835a57d3b790622bb5ff4 (patch) | |
tree | acb4cc24ad19e928719ca0bcae3819773d1d4d8e | |
parent | 0e058f9cb3c6ca8b8331276e96fa56483015e590 (diff) |
refs #3962 - moved os/browser images to DevicesDetection plugin
-rw-r--r-- | plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml | 8 | ||||
-rw-r--r-- | plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml | 4 | ||||
-rw-r--r-- | plugins/DevicesDetection/functions.php | 4 | ||||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AA.gif (renamed from plugins/UserSettings/images/browsers/AA.gif) | bin | 1092 -> 1092 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AB.gif (renamed from plugins/UserSettings/images/browsers/AB.gif) | bin | 1064 -> 1064 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AG.gif (renamed from plugins/UserSettings/images/browsers/AG.gif) | bin | 351 -> 351 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AM.gif (renamed from plugins/UserSettings/images/browsers/AM.gif) | bin | 198 -> 198 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AN.gif (renamed from plugins/UserSettings/images/browsers/AN.gif) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AR.gif (renamed from plugins/UserSettings/images/browsers/AR.gif) | bin | 1057 -> 1057 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AV.gif (renamed from plugins/UserSettings/images/browsers/AV.gif) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/AW.gif (renamed from plugins/UserSettings/images/browsers/AW.gif) | bin | 574 -> 574 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/B2.gif (renamed from plugins/UserSettings/images/browsers/B2.gif) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BB.gif (renamed from plugins/UserSettings/images/browsers/BB.gif) | bin | 576 -> 576 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BD.gif (renamed from plugins/UserSettings/images/browsers/BD.gif) | bin | 1051 -> 1051 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BE.gif (renamed from plugins/UserSettings/images/browsers/BE.gif) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BJ.gif (renamed from plugins/UserSettings/images/browsers/BJ.gif) | bin | 949 -> 949 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BP.gif (renamed from plugins/UserSettings/images/browsers/BP.gif) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BS.gif (renamed from plugins/UserSettings/images/browsers/BS.gif) | bin | 980 -> 980 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/BX.gif (renamed from plugins/UserSettings/images/browsers/BX.gif) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CA.gif (renamed from plugins/UserSettings/images/browsers/CA.gif) | bin | 573 -> 573 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CD.gif (renamed from plugins/UserSettings/images/browsers/CD.gif) | bin | 1045 -> 1045 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CF.gif (renamed from plugins/UserSettings/images/browsers/CF.gif) | bin | 1074 -> 1074 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CH.gif (renamed from plugins/UserSettings/images/browsers/CH.gif) | bin | 1074 -> 1074 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CK.gif (renamed from plugins/UserSettings/images/browsers/CK.gif) | bin | 1024 -> 1024 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CM.gif (renamed from plugins/UserSettings/images/browsers/CM.gif) | bin | 1074 -> 1074 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CN.gif (renamed from plugins/UserSettings/images/browsers/CN.gif) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CO.gif (renamed from plugins/UserSettings/images/browsers/CO.gif) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CP.gif (renamed from plugins/UserSettings/images/browsers/CP.gif) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/CS.gif (renamed from plugins/UserSettings/images/browsers/CS.gif) | bin | 549 -> 549 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/DF.gif (renamed from plugins/UserSettings/images/browsers/DF.gif) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/DI.gif (renamed from plugins/UserSettings/images/browsers/DI.gif) | bin | 1068 -> 1068 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/EL.gif (renamed from plugins/UserSettings/images/browsers/EL.gif) | bin | 90 -> 90 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/EP.gif (renamed from plugins/UserSettings/images/browsers/EP.gif) | bin | 316 -> 316 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/ES.gif (renamed from plugins/UserSettings/images/browsers/ES.gif) | bin | 1013 -> 1013 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FB.gif (renamed from plugins/UserSettings/images/browsers/FB.gif) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FD.gif (renamed from plugins/UserSettings/images/browsers/FD.gif) | bin | 1050 -> 1050 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FE.gif (renamed from plugins/UserSettings/images/browsers/FE.gif) | bin | 550 -> 550 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FF.gif (renamed from plugins/UserSettings/images/browsers/FF.gif) | bin | 197 -> 197 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FL.gif (renamed from plugins/UserSettings/images/browsers/FL.gif) | bin | 1034 -> 1034 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/FN.gif (renamed from plugins/UserSettings/images/browsers/FN.gif) | bin | 1033 -> 1033 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/GA.gif (renamed from plugins/UserSettings/images/browsers/GA.gif) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/GE.gif (renamed from plugins/UserSettings/images/browsers/GE.gif) | bin | 997 -> 997 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/HA.gif (renamed from plugins/UserSettings/images/browsers/HA.gif) | bin | 1009 -> 1009 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/HJ.gif (renamed from plugins/UserSettings/images/browsers/HJ.gif) | bin | 1022 -> 1022 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IA.gif (renamed from plugins/UserSettings/images/browsers/IA.gif) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IB.gif (renamed from plugins/UserSettings/images/browsers/IB.gif) | bin | 168 -> 168 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IC.gif (renamed from plugins/UserSettings/images/browsers/IC.gif) | bin | 131 -> 131 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/ID.gif (renamed from plugins/UserSettings/images/browsers/ID.gif) | bin | 1057 -> 1057 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IE.gif (renamed from plugins/UserSettings/images/browsers/IE.gif) | bin | 999 -> 999 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IM.gif (renamed from plugins/UserSettings/images/browsers/IM.gif) | bin | 999 -> 999 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IR.gif (renamed from plugins/UserSettings/images/browsers/IR.gif) | bin | 610 -> 610 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/IW.gif (renamed from plugins/UserSettings/images/browsers/IW.gif) | bin | 1066 -> 1066 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/KI.gif (renamed from plugins/UserSettings/images/browsers/KI.gif) | bin | 1050 -> 1050 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/KM.gif (renamed from plugins/UserSettings/images/browsers/KM.gif) | bin | 180 -> 180 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/KO.gif (renamed from plugins/UserSettings/images/browsers/KO.gif) | bin | 986 -> 986 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/KP.gif (renamed from plugins/UserSettings/images/browsers/KP.gif) | bin | 1037 -> 1037 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/KZ.gif (renamed from plugins/UserSettings/images/browsers/KZ.gif) | bin | 1061 -> 1061 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/LB.gif (renamed from plugins/UserSettings/images/browsers/LB.gif) | bin | 991 -> 991 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/LG.gif (renamed from plugins/UserSettings/images/browsers/LG.gif) | bin | 1015 -> 1015 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/LI.gif (renamed from plugins/UserSettings/images/browsers/LI.gif) | bin | 104 -> 104 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/LS.gif (renamed from plugins/UserSettings/images/browsers/LS.gif) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/LX.gif (renamed from plugins/UserSettings/images/browsers/LX.gif) | bin | 104 -> 104 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MC.gif (renamed from plugins/UserSettings/images/browsers/MC.gif) | bin | 1023 -> 1023 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MF.gif (renamed from plugins/UserSettings/images/browsers/MF.gif) | bin | 190 -> 190 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MI.gif (renamed from plugins/UserSettings/images/browsers/MI.gif) | bin | 1025 -> 1025 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MO.gif (renamed from plugins/UserSettings/images/browsers/MO.gif) | bin | 192 -> 192 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MS.gif (renamed from plugins/UserSettings/images/browsers/MS.gif) | bin | 1094 -> 1094 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/MX.gif (renamed from plugins/UserSettings/images/browsers/MX.gif) | bin | 985 -> 985 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/NB.gif (renamed from plugins/UserSettings/images/browsers/NB.gif) | bin | 977 -> 977 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/NF.gif (renamed from plugins/UserSettings/images/browsers/NF.gif) | bin | 612 -> 612 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/NL.gif (renamed from plugins/UserSettings/images/browsers/NL.gif) | bin | 1081 -> 1081 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/NP.gif (renamed from plugins/UserSettings/images/browsers/NP.gif) | bin | 1020 -> 1020 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/NS.gif (renamed from plugins/UserSettings/images/browsers/NS.gif) | bin | 98 -> 98 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OB.gif (renamed from plugins/UserSettings/images/browsers/OB.gif) | bin | 1010 -> 1010 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OI.gif (renamed from plugins/UserSettings/images/browsers/OI.gif) | bin | 911 -> 911 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/ON.gif (renamed from plugins/UserSettings/images/browsers/ON.gif) | bin | 635 -> 635 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OP.gif (renamed from plugins/UserSettings/images/browsers/OP.gif) | bin | 987 -> 987 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OR.gif (renamed from plugins/UserSettings/images/browsers/OR.gif) | bin | 1024 -> 1024 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OV.gif (renamed from plugins/UserSettings/images/browsers/OV.gif) | bin | 978 -> 978 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/OW.gif (renamed from plugins/UserSettings/images/browsers/OW.gif) | bin | 197 -> 197 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PL.gif (renamed from plugins/UserSettings/images/browsers/PL.gif) | bin | 1058 -> 1058 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PM.gif (renamed from plugins/UserSettings/images/browsers/PM.gif) | bin | 1082 -> 1082 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PO.gif (renamed from plugins/UserSettings/images/browsers/PO.gif) | bin | 1065 -> 1065 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PU.gif (renamed from plugins/UserSettings/images/browsers/PU.gif) | bin | 1094 -> 1094 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PW.gif (renamed from plugins/UserSettings/images/browsers/PW.gif) | bin | 1082 -> 1082 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/PX.gif (renamed from plugins/UserSettings/images/browsers/PX.gif) | bin | 170 -> 170 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/RK.gif (renamed from plugins/UserSettings/images/browsers/RK.gif) | bin | 1035 -> 1035 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SA.gif (renamed from plugins/UserSettings/images/browsers/SA.gif) | bin | 1008 -> 1008 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SE.gif (renamed from plugins/UserSettings/images/browsers/SE.gif) | bin | 996 -> 996 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SF.gif (renamed from plugins/UserSettings/images/browsers/SF.gif) | bin | 190 -> 190 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SH.gif (renamed from plugins/UserSettings/images/browsers/SH.gif) | bin | 1001 -> 1001 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SL.gif (renamed from plugins/UserSettings/images/browsers/SL.gif) | bin | 900 -> 900 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/SM.gif (renamed from plugins/UserSettings/images/browsers/SM.gif) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/TB.gif (renamed from plugins/UserSettings/images/browsers/TB.gif) | bin | 1014 -> 1014 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/TI.gif (renamed from plugins/UserSettings/images/browsers/TI.gif) | bin | 595 -> 595 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/TZ.gif (renamed from plugins/UserSettings/images/browsers/TZ.gif) | bin | 973 -> 973 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/UC.gif (renamed from plugins/UserSettings/images/browsers/UC.gif) | bin | 994 -> 994 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/UN.gif (renamed from plugins/UserSettings/images/browsers/UN.gif) | bin | 80 -> 80 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/UNK.gif (renamed from plugins/UserSettings/images/browsers/UNK.gif) | bin | 80 -> 80 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/WE.gif (renamed from plugins/UserSettings/images/browsers/WE.gif) | bin | 1012 -> 1012 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/WO.gif (renamed from plugins/UserSettings/images/browsers/WO.gif) | bin | 1065 -> 1065 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/WP.gif (renamed from plugins/UserSettings/images/browsers/WP.gif) | bin | 982 -> 982 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/browsers/YA.gif (renamed from plugins/UserSettings/images/browsers/YA.gif) | bin | 1048 -> 1048 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/3DS.gif (renamed from plugins/UserSettings/images/os/3DS.gif) | bin | 1085 -> 1085 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/AIX.gif (renamed from plugins/UserSettings/images/os/AIX.gif) | bin | 176 -> 176 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/AMG.gif (renamed from plugins/UserSettings/images/os/AMG.gif) | bin | 1001 -> 1001 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/AMI.gif (renamed from plugins/UserSettings/images/os/AMI.gif) | bin | 1055 -> 1055 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/AND.gif (renamed from plugins/UserSettings/images/os/AND.gif) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/ARL.gif (renamed from plugins/UserSettings/images/os/ARL.gif) | bin | 947 -> 947 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/BBX.gif (renamed from plugins/UserSettings/images/os/BBX.gif) | bin | 590 -> 590 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/BEO.gif (renamed from plugins/UserSettings/images/os/BEO.gif) | bin | 1035 -> 1035 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/BLB.gif (renamed from plugins/UserSettings/images/os/BLB.gif) | bin | 576 -> 576 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/BSD.gif (renamed from plugins/UserSettings/images/os/BSD.gif) | bin | 1016 -> 1016 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/BTR.gif (renamed from plugins/UserSettings/images/os/BTR.gif) | bin | 946 -> 946 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/CES.gif (renamed from plugins/UserSettings/images/os/CES.gif) | bin | 1011 -> 1011 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/COS.gif (renamed from plugins/UserSettings/images/os/COS.gif) | bin | 1074 -> 1074 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/DFB.gif (renamed from plugins/UserSettings/images/os/DFB.gif) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/DSI.gif (renamed from plugins/UserSettings/images/os/DSI.gif) | bin | 1076 -> 1076 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/FED.gif (renamed from plugins/UserSettings/images/os/FED.gif) | bin | 1022 -> 1022 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/FOS.gif (renamed from plugins/UserSettings/images/os/FOS.gif) | bin | 197 -> 197 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/GNT.gif (renamed from plugins/UserSettings/images/os/GNT.gif) | bin | 1075 -> 1075 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/GTV.gif (renamed from plugins/UserSettings/images/os/GTV.gif) | bin | 1614 -> 1614 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/HPX.gif (renamed from plugins/UserSettings/images/os/HPX.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/IOS.gif (renamed from plugins/UserSettings/images/os/IOS.gif) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/IPA.gif (renamed from plugins/UserSettings/images/os/IPA.gif) | bin | 587 -> 587 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/IPD.gif (renamed from plugins/UserSettings/images/os/IPD.gif) | bin | 351 -> 351 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/IPH.gif (renamed from plugins/UserSettings/images/os/IPH.gif) | bin | 577 -> 577 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/IRI.gif (renamed from plugins/UserSettings/images/os/IRI.gif) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/KBT.gif (renamed from plugins/UserSettings/images/os/KBT.gif) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/KNO.gif (renamed from plugins/UserSettings/images/os/KNO.gif) | bin | 985 -> 985 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/LBT.gif (renamed from plugins/UserSettings/images/os/LBT.gif) | bin | 951 -> 951 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/LIN.gif (renamed from plugins/UserSettings/images/os/LIN.gif) | bin | 170 -> 170 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/MAC.gif (renamed from plugins/UserSettings/images/os/MAC.gif) | bin | 171 -> 171 bytes | |||
-rwxr-xr-x | plugins/DevicesDetection/images/os/MAE.gif (renamed from plugins/UserSettings/images/os/MAE.gif) | bin | 137 -> 137 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/MDR.gif (renamed from plugins/UserSettings/images/os/MDR.gif) | bin | 918 -> 918 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/MIN.gif (renamed from plugins/UserSettings/images/os/MIN.gif) | bin | 1009 -> 1009 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/NBS.gif (renamed from plugins/UserSettings/images/os/NBS.gif) | bin | 168 -> 168 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/NDS.gif (renamed from plugins/UserSettings/images/os/NDS.gif) | bin | 1061 -> 1061 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/OBS.gif (renamed from plugins/UserSettings/images/os/OBS.gif) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/OS2.gif (renamed from plugins/UserSettings/images/os/OS2.gif) | bin | 162 -> 162 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/POS.gif (renamed from plugins/UserSettings/images/os/POS.gif) | bin | 1060 -> 1060 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/PPY.gif (renamed from plugins/UserSettings/images/os/PPY.gif) | bin | 1037 -> 1037 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/PS3.gif (renamed from plugins/UserSettings/images/os/PS3.gif) | bin | 628 -> 628 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/PSP.gif (renamed from plugins/UserSettings/images/os/PSP.gif) | bin | 592 -> 592 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/PSV.gif (renamed from plugins/UserSettings/images/os/PSV.gif) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/QNX.gif (renamed from plugins/UserSettings/images/os/QNX.gif) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/RHT.gif (renamed from plugins/UserSettings/images/os/RHT.gif) | bin | 952 -> 952 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/ROS.gif (renamed from plugins/UserSettings/images/os/ROS.gif) | bin | 956 -> 956 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SAF.gif (renamed from plugins/UserSettings/images/os/SAF.gif) | bin | 242 -> 242 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SBA.gif (renamed from plugins/UserSettings/images/os/SBA.gif) | bin | 990 -> 990 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SLW.gif (renamed from plugins/UserSettings/images/os/SLW.gif) | bin | 883 -> 883 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SOS.gif (renamed from plugins/UserSettings/images/os/SOS.gif) | bin | 1036 -> 1036 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SSE.gif (renamed from plugins/UserSettings/images/os/SSE.gif) | bin | 1066 -> 1066 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SYL.gif (renamed from plugins/UserSettings/images/os/SYL.gif) | bin | 1017 -> 1017 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/SYM.gif (renamed from plugins/UserSettings/images/os/SYM.gif) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/T64.gif (renamed from plugins/UserSettings/images/os/T64.gif) | bin | 220 -> 220 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/TIZ.gif (renamed from plugins/UserSettings/images/os/TIZ.gif) | bin | 958 -> 958 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/UBT.gif (renamed from plugins/UserSettings/images/os/UBT.gif) | bin | 986 -> 986 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/UNK.gif (renamed from plugins/UserSettings/images/os/UNK.gif) | bin | 80 -> 80 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/VMS.gif (renamed from plugins/UserSettings/images/os/VMS.gif) | bin | 572 -> 572 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W10.gif (renamed from plugins/UserSettings/images/os/W10.gif) | bin | 925 -> 925 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W2K.gif (renamed from plugins/UserSettings/images/os/W2K.gif) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W61.gif (renamed from plugins/UserSettings/images/os/W61.gif) | bin | 1060 -> 1060 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W65.gif (renamed from plugins/UserSettings/images/os/W65.gif) | bin | 1060 -> 1060 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W75.gif (renamed from plugins/UserSettings/images/os/W75.gif) | bin | 1089 -> 1089 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W81.gif (renamed from plugins/UserSettings/images/os/W81.gif) | bin | 925 -> 925 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W95.gif (renamed from plugins/UserSettings/images/os/W95.gif) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/W98.gif (renamed from plugins/UserSettings/images/os/W98.gif) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WCE.gif (renamed from plugins/UserSettings/images/os/WCE.gif) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WI7.gif (renamed from plugins/UserSettings/images/os/WI7.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WI8.gif (renamed from plugins/UserSettings/images/os/WI8.gif) | bin | 925 -> 925 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WII.gif (renamed from plugins/UserSettings/images/os/WII.gif) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WIN.gif (renamed from plugins/UserSettings/images/os/WIN.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WIU.gif (renamed from plugins/UserSettings/images/os/WIU.gif) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WME.gif (renamed from plugins/UserSettings/images/os/WME.gif) | bin | 1025 -> 1025 bytes | |||
-rwxr-xr-x | plugins/DevicesDetection/images/os/WMO.gif (renamed from plugins/UserSettings/images/os/WMO.gif) | bin | 1060 -> 1060 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WNT.gif (renamed from plugins/UserSettings/images/os/WNT.gif) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WOS.gif (renamed from plugins/UserSettings/images/os/WOS.gif) | bin | 70 -> 70 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WP7.gif (renamed from plugins/UserSettings/images/os/WP7.gif) | bin | 1089 -> 1089 bytes | |||
-rwxr-xr-x | plugins/DevicesDetection/images/os/WPH.gif (renamed from plugins/UserSettings/images/os/WPH.gif) | bin | 1089 -> 1089 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WRT.gif (renamed from plugins/UserSettings/images/os/WRT.gif) | bin | 925 -> 925 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WS3.gif (renamed from plugins/UserSettings/images/os/WS3.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WVI.gif (renamed from plugins/UserSettings/images/os/WVI.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/WXP.gif (renamed from plugins/UserSettings/images/os/WXP.gif) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/XBT.gif (renamed from plugins/UserSettings/images/os/XBT.gif) | bin | 968 -> 968 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/XBX.gif (renamed from plugins/UserSettings/images/os/XBX.gif) | bin | 1043 -> 1043 bytes | |||
-rw-r--r-- | plugins/DevicesDetection/images/os/YNS.gif (renamed from plugins/UserSettings/images/os/YNS.gif) | bin | 913 -> 913 bytes | |||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml | 36 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml | 40 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml | 140 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml | 40 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml | 40 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml | 14 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml | 20 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml | 14 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml | 16 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml | 160 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml | 20 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml | 14 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml | 16 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml | 28 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml | 28 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml | 28 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml | 28 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml | 28 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml | 40 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml | 4 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml | 4 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html | 20 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html | 20 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv | bin | 7328 -> 7376 bytes | |||
-rwxr-xr-x | tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rwxr-xr-x | tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html | 8 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html | 8 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml | 12 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml | 8 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml | 6 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml | 6 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml | 6 | ||||
-rw-r--r-- | tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml | 6 |
249 files changed, 513 insertions, 513 deletions
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 7b62e398c2..413ee57f7c 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 7b62e398c2..413ee57f7c 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 7b62e398c2..413ee57f7c 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 7b62e398c2..413ee57f7c 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 7b62e398c2..413ee57f7c 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 da580cc910..d1b95ea9e0 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 c8fe989045..8ab0ffe925 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 Binary files differindex 9b78ba7292..9b78ba7292 100644 --- a/plugins/UserSettings/images/browsers/AA.gif +++ b/plugins/DevicesDetection/images/browsers/AA.gif diff --git a/plugins/UserSettings/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif Binary files differindex 0e277b8e2d..0e277b8e2d 100644 --- a/plugins/UserSettings/images/browsers/AB.gif +++ b/plugins/DevicesDetection/images/browsers/AB.gif diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif Binary files differindex 151b9a33c6..151b9a33c6 100644 --- a/plugins/UserSettings/images/browsers/AG.gif +++ b/plugins/DevicesDetection/images/browsers/AG.gif diff --git a/plugins/UserSettings/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif Binary files differindex f38dd45077..f38dd45077 100644 --- a/plugins/UserSettings/images/browsers/AM.gif +++ b/plugins/DevicesDetection/images/browsers/AM.gif diff --git a/plugins/UserSettings/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif Binary files differindex bf0ade5551..bf0ade5551 100644 --- a/plugins/UserSettings/images/browsers/AN.gif +++ b/plugins/DevicesDetection/images/browsers/AN.gif diff --git a/plugins/UserSettings/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif Binary files differindex 69c79b25a0..69c79b25a0 100644 --- a/plugins/UserSettings/images/browsers/AR.gif +++ b/plugins/DevicesDetection/images/browsers/AR.gif diff --git a/plugins/UserSettings/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif Binary files differindex 2bee0af264..2bee0af264 100644 --- a/plugins/UserSettings/images/browsers/AV.gif +++ b/plugins/DevicesDetection/images/browsers/AV.gif diff --git a/plugins/UserSettings/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif Binary files differindex b7980bce3f..b7980bce3f 100644 --- a/plugins/UserSettings/images/browsers/AW.gif +++ b/plugins/DevicesDetection/images/browsers/AW.gif diff --git a/plugins/UserSettings/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif Binary files differindex dc732a8462..dc732a8462 100644 --- a/plugins/UserSettings/images/browsers/B2.gif +++ b/plugins/DevicesDetection/images/browsers/B2.gif diff --git a/plugins/UserSettings/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif Binary files differindex e8316ef586..e8316ef586 100644 --- a/plugins/UserSettings/images/browsers/BB.gif +++ b/plugins/DevicesDetection/images/browsers/BB.gif diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif Binary files differindex 4f4e740562..4f4e740562 100644 --- a/plugins/UserSettings/images/browsers/BD.gif +++ b/plugins/DevicesDetection/images/browsers/BD.gif diff --git a/plugins/UserSettings/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif Binary files differindex 317112b4ca..317112b4ca 100644 --- a/plugins/UserSettings/images/browsers/BE.gif +++ b/plugins/DevicesDetection/images/browsers/BE.gif diff --git a/plugins/UserSettings/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif Binary files differindex 5324db57b9..5324db57b9 100644 --- a/plugins/UserSettings/images/browsers/BJ.gif +++ b/plugins/DevicesDetection/images/browsers/BJ.gif diff --git a/plugins/UserSettings/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif Binary files differindex dc732a8462..dc732a8462 100644 --- a/plugins/UserSettings/images/browsers/BP.gif +++ b/plugins/DevicesDetection/images/browsers/BP.gif diff --git a/plugins/UserSettings/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif Binary files differindex 6a1d7bd1ed..6a1d7bd1ed 100644 --- a/plugins/UserSettings/images/browsers/BS.gif +++ b/plugins/DevicesDetection/images/browsers/BS.gif diff --git a/plugins/UserSettings/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif Binary files differindex fde79bdaf3..fde79bdaf3 100644 --- a/plugins/UserSettings/images/browsers/BX.gif +++ b/plugins/DevicesDetection/images/browsers/BX.gif diff --git a/plugins/UserSettings/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif Binary files differindex 3018ff3855..3018ff3855 100644 --- a/plugins/UserSettings/images/browsers/CA.gif +++ b/plugins/DevicesDetection/images/browsers/CA.gif diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif Binary files differindex dc98e39307..dc98e39307 100644 --- a/plugins/UserSettings/images/browsers/CD.gif +++ b/plugins/DevicesDetection/images/browsers/CD.gif diff --git a/plugins/UserSettings/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CF.gif +++ b/plugins/DevicesDetection/images/browsers/CF.gif diff --git a/plugins/UserSettings/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CH.gif +++ b/plugins/DevicesDetection/images/browsers/CH.gif diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif Binary files differindex 562a3406d0..562a3406d0 100644 --- a/plugins/UserSettings/images/browsers/CK.gif +++ b/plugins/DevicesDetection/images/browsers/CK.gif diff --git a/plugins/UserSettings/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/browsers/CM.gif +++ b/plugins/DevicesDetection/images/browsers/CM.gif diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif Binary files differindex b3cdc7c202..b3cdc7c202 100644 --- a/plugins/UserSettings/images/browsers/CN.gif +++ b/plugins/DevicesDetection/images/browsers/CN.gif diff --git a/plugins/UserSettings/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif Binary files differindex 98f684c6c0..98f684c6c0 100644 --- a/plugins/UserSettings/images/browsers/CO.gif +++ b/plugins/DevicesDetection/images/browsers/CO.gif diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif Binary files differindex cb0b2db808..cb0b2db808 100644 --- a/plugins/UserSettings/images/browsers/CP.gif +++ b/plugins/DevicesDetection/images/browsers/CP.gif diff --git a/plugins/UserSettings/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif Binary files differindex 10fb8f7bc1..10fb8f7bc1 100644 --- a/plugins/UserSettings/images/browsers/CS.gif +++ b/plugins/DevicesDetection/images/browsers/CS.gif diff --git a/plugins/UserSettings/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif Binary files differindex 56ce414c2f..56ce414c2f 100644 --- a/plugins/UserSettings/images/browsers/DF.gif +++ b/plugins/DevicesDetection/images/browsers/DF.gif diff --git a/plugins/UserSettings/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif Binary files differindex 621d12fc0a..621d12fc0a 100644 --- a/plugins/UserSettings/images/browsers/DI.gif +++ b/plugins/DevicesDetection/images/browsers/DI.gif diff --git a/plugins/UserSettings/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif Binary files differindex f5053e9e0e..f5053e9e0e 100644 --- a/plugins/UserSettings/images/browsers/EL.gif +++ b/plugins/DevicesDetection/images/browsers/EL.gif diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif Binary files differindex 9759cd60ad..9759cd60ad 100644 --- a/plugins/UserSettings/images/browsers/EP.gif +++ b/plugins/DevicesDetection/images/browsers/EP.gif diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif Binary files differindex fad9cac483..fad9cac483 100644 --- a/plugins/UserSettings/images/browsers/ES.gif +++ b/plugins/DevicesDetection/images/browsers/ES.gif diff --git a/plugins/UserSettings/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif Binary files differindex e965479d41..e965479d41 100644 --- a/plugins/UserSettings/images/browsers/FB.gif +++ b/plugins/DevicesDetection/images/browsers/FB.gif diff --git a/plugins/UserSettings/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif Binary files differindex 2265625c6e..2265625c6e 100644 --- a/plugins/UserSettings/images/browsers/FD.gif +++ b/plugins/DevicesDetection/images/browsers/FD.gif diff --git a/plugins/UserSettings/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif Binary files differindex 0613d71812..0613d71812 100644 --- a/plugins/UserSettings/images/browsers/FE.gif +++ b/plugins/DevicesDetection/images/browsers/FE.gif diff --git a/plugins/UserSettings/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif Binary files differindex eb024c408a..eb024c408a 100644 --- a/plugins/UserSettings/images/browsers/FF.gif +++ b/plugins/DevicesDetection/images/browsers/FF.gif diff --git a/plugins/UserSettings/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif Binary files differindex ed58dab179..ed58dab179 100644 --- a/plugins/UserSettings/images/browsers/FL.gif +++ b/plugins/DevicesDetection/images/browsers/FL.gif diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif Binary files differindex 183dced4d7..183dced4d7 100644 --- a/plugins/UserSettings/images/browsers/FN.gif +++ b/plugins/DevicesDetection/images/browsers/FN.gif diff --git a/plugins/UserSettings/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif Binary files differindex 71605dfaeb..71605dfaeb 100644 --- a/plugins/UserSettings/images/browsers/GA.gif +++ b/plugins/DevicesDetection/images/browsers/GA.gif diff --git a/plugins/UserSettings/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif Binary files differindex 53e8f45f93..53e8f45f93 100644 --- a/plugins/UserSettings/images/browsers/GE.gif +++ b/plugins/DevicesDetection/images/browsers/GE.gif diff --git a/plugins/UserSettings/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif Binary files differindex 3eb4ac609b..3eb4ac609b 100644 --- a/plugins/UserSettings/images/browsers/HA.gif +++ b/plugins/DevicesDetection/images/browsers/HA.gif diff --git a/plugins/UserSettings/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif Binary files differindex f599043733..f599043733 100644 --- a/plugins/UserSettings/images/browsers/HJ.gif +++ b/plugins/DevicesDetection/images/browsers/HJ.gif diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif Binary files differindex 83aad8b1c6..83aad8b1c6 100644 --- a/plugins/UserSettings/images/browsers/IA.gif +++ b/plugins/DevicesDetection/images/browsers/IA.gif diff --git a/plugins/UserSettings/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif Binary files differindex ed3f7f7e07..ed3f7f7e07 100644 --- a/plugins/UserSettings/images/browsers/IB.gif +++ b/plugins/DevicesDetection/images/browsers/IB.gif diff --git a/plugins/UserSettings/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif Binary files differindex e3e1b69753..e3e1b69753 100644 --- a/plugins/UserSettings/images/browsers/IC.gif +++ b/plugins/DevicesDetection/images/browsers/IC.gif diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif Binary files differindex b6e614da48..b6e614da48 100644 --- a/plugins/UserSettings/images/browsers/ID.gif +++ b/plugins/DevicesDetection/images/browsers/ID.gif diff --git a/plugins/UserSettings/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif Binary files differindex 26f2f8fe30..26f2f8fe30 100644 --- a/plugins/UserSettings/images/browsers/IE.gif +++ b/plugins/DevicesDetection/images/browsers/IE.gif diff --git a/plugins/UserSettings/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif Binary files differindex 26f2f8fe30..26f2f8fe30 100644 --- a/plugins/UserSettings/images/browsers/IM.gif +++ b/plugins/DevicesDetection/images/browsers/IM.gif diff --git a/plugins/UserSettings/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif Binary files differindex fd58198194..fd58198194 100644 --- a/plugins/UserSettings/images/browsers/IR.gif +++ b/plugins/DevicesDetection/images/browsers/IR.gif diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif Binary files differindex ef1b5c0711..ef1b5c0711 100644 --- a/plugins/UserSettings/images/browsers/IW.gif +++ b/plugins/DevicesDetection/images/browsers/IW.gif diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif Binary files differindex 3be12eac66..3be12eac66 100644 --- a/plugins/UserSettings/images/browsers/KI.gif +++ b/plugins/DevicesDetection/images/browsers/KI.gif diff --git a/plugins/UserSettings/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif Binary files differindex 100e5cbbf5..100e5cbbf5 100644 --- a/plugins/UserSettings/images/browsers/KM.gif +++ b/plugins/DevicesDetection/images/browsers/KM.gif diff --git a/plugins/UserSettings/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif Binary files differindex 359fd78ec4..359fd78ec4 100644 --- a/plugins/UserSettings/images/browsers/KO.gif +++ b/plugins/DevicesDetection/images/browsers/KO.gif diff --git a/plugins/UserSettings/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif Binary files differindex 6d54c7f116..6d54c7f116 100644 --- a/plugins/UserSettings/images/browsers/KP.gif +++ b/plugins/DevicesDetection/images/browsers/KP.gif diff --git a/plugins/UserSettings/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif Binary files differindex 76ea10e03f..76ea10e03f 100644 --- a/plugins/UserSettings/images/browsers/KZ.gif +++ b/plugins/DevicesDetection/images/browsers/KZ.gif diff --git a/plugins/UserSettings/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif Binary files differindex 10379bdd5d..10379bdd5d 100644 --- a/plugins/UserSettings/images/browsers/LB.gif +++ b/plugins/DevicesDetection/images/browsers/LB.gif diff --git a/plugins/UserSettings/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif Binary files differindex ed8e5c0c22..ed8e5c0c22 100644 --- a/plugins/UserSettings/images/browsers/LG.gif +++ b/plugins/DevicesDetection/images/browsers/LG.gif diff --git a/plugins/UserSettings/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif Binary files differindex 0dc31911be..0dc31911be 100644 --- a/plugins/UserSettings/images/browsers/LI.gif +++ b/plugins/DevicesDetection/images/browsers/LI.gif diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif Binary files differindex c5f58ad4f0..c5f58ad4f0 100644 --- a/plugins/UserSettings/images/browsers/LS.gif +++ b/plugins/DevicesDetection/images/browsers/LS.gif diff --git a/plugins/UserSettings/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif Binary files differindex 0dc31911be..0dc31911be 100644 --- a/plugins/UserSettings/images/browsers/LX.gif +++ b/plugins/DevicesDetection/images/browsers/LX.gif diff --git a/plugins/UserSettings/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif Binary files differindex a359a22416..a359a22416 100644 --- a/plugins/UserSettings/images/browsers/MC.gif +++ b/plugins/DevicesDetection/images/browsers/MC.gif diff --git a/plugins/UserSettings/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif Binary files differindex 4d0eef37a7..4d0eef37a7 100644 --- a/plugins/UserSettings/images/browsers/MF.gif +++ b/plugins/DevicesDetection/images/browsers/MF.gif diff --git a/plugins/UserSettings/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif Binary files differindex ab797816ab..ab797816ab 100644 --- a/plugins/UserSettings/images/browsers/MI.gif +++ b/plugins/DevicesDetection/images/browsers/MI.gif diff --git a/plugins/UserSettings/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif Binary files differindex 21fad4d28c..21fad4d28c 100644 --- a/plugins/UserSettings/images/browsers/MO.gif +++ b/plugins/DevicesDetection/images/browsers/MO.gif diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif Binary files differindex cb42ed6892..cb42ed6892 100644 --- a/plugins/UserSettings/images/browsers/MS.gif +++ b/plugins/DevicesDetection/images/browsers/MS.gif diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif Binary files differindex b775666fa7..b775666fa7 100644 --- a/plugins/UserSettings/images/browsers/MX.gif +++ b/plugins/DevicesDetection/images/browsers/MX.gif diff --git a/plugins/UserSettings/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif Binary files differindex 3d87e9f4bc..3d87e9f4bc 100644 --- a/plugins/UserSettings/images/browsers/NB.gif +++ b/plugins/DevicesDetection/images/browsers/NB.gif diff --git a/plugins/UserSettings/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif Binary files differindex 8ad4aff666..8ad4aff666 100644 --- a/plugins/UserSettings/images/browsers/NF.gif +++ b/plugins/DevicesDetection/images/browsers/NF.gif diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif Binary files differindex a319b89783..a319b89783 100644 --- a/plugins/UserSettings/images/browsers/NL.gif +++ b/plugins/DevicesDetection/images/browsers/NL.gif diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif Binary files differindex c18d4d31f5..c18d4d31f5 100644 --- a/plugins/UserSettings/images/browsers/NP.gif +++ b/plugins/DevicesDetection/images/browsers/NP.gif diff --git a/plugins/UserSettings/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif Binary files differindex 5c57cdb283..5c57cdb283 100644 --- a/plugins/UserSettings/images/browsers/NS.gif +++ b/plugins/DevicesDetection/images/browsers/NS.gif diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif Binary files differindex a9c1a6f413..a9c1a6f413 100644 --- a/plugins/UserSettings/images/browsers/OB.gif +++ b/plugins/DevicesDetection/images/browsers/OB.gif diff --git a/plugins/UserSettings/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif Binary files differindex 1f5cb3ee3d..1f5cb3ee3d 100644 --- a/plugins/UserSettings/images/browsers/OI.gif +++ b/plugins/DevicesDetection/images/browsers/OI.gif diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif Binary files differindex 55e2dedb3c..55e2dedb3c 100644 --- a/plugins/UserSettings/images/browsers/ON.gif +++ b/plugins/DevicesDetection/images/browsers/ON.gif diff --git a/plugins/UserSettings/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif Binary files differindex ec422377da..ec422377da 100644 --- a/plugins/UserSettings/images/browsers/OP.gif +++ b/plugins/DevicesDetection/images/browsers/OP.gif diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif Binary files differindex 5b18e64798..5b18e64798 100644 --- a/plugins/UserSettings/images/browsers/OR.gif +++ b/plugins/DevicesDetection/images/browsers/OR.gif diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif Binary files differindex e40a9bc71f..e40a9bc71f 100644 --- a/plugins/UserSettings/images/browsers/OV.gif +++ b/plugins/DevicesDetection/images/browsers/OV.gif diff --git a/plugins/UserSettings/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif Binary files differindex 44067148ab..44067148ab 100644 --- a/plugins/UserSettings/images/browsers/OW.gif +++ b/plugins/DevicesDetection/images/browsers/OW.gif diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif Binary files differindex f8b83f26ad..f8b83f26ad 100644 --- a/plugins/UserSettings/images/browsers/PL.gif +++ b/plugins/DevicesDetection/images/browsers/PL.gif diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif Binary files differindex 69ed94dbaf..69ed94dbaf 100644 --- a/plugins/UserSettings/images/browsers/PM.gif +++ b/plugins/DevicesDetection/images/browsers/PM.gif diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif Binary files differindex 0747f55675..0747f55675 100644 --- a/plugins/UserSettings/images/browsers/PO.gif +++ b/plugins/DevicesDetection/images/browsers/PO.gif diff --git a/plugins/UserSettings/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif Binary files differindex 6319ae15cc..6319ae15cc 100644 --- a/plugins/UserSettings/images/browsers/PU.gif +++ b/plugins/DevicesDetection/images/browsers/PU.gif diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif Binary files differindex 3aae87d27c..3aae87d27c 100644 --- a/plugins/UserSettings/images/browsers/PW.gif +++ b/plugins/DevicesDetection/images/browsers/PW.gif diff --git a/plugins/UserSettings/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif Binary files differindex 386d46e122..386d46e122 100644 --- a/plugins/UserSettings/images/browsers/PX.gif +++ b/plugins/DevicesDetection/images/browsers/PX.gif diff --git a/plugins/UserSettings/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif Binary files differindex 72ee74a38d..72ee74a38d 100644 --- a/plugins/UserSettings/images/browsers/RK.gif +++ b/plugins/DevicesDetection/images/browsers/RK.gif diff --git a/plugins/UserSettings/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif Binary files differindex fb4c89c348..fb4c89c348 100644 --- a/plugins/UserSettings/images/browsers/SA.gif +++ b/plugins/DevicesDetection/images/browsers/SA.gif diff --git a/plugins/UserSettings/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif Binary files differindex 8603442161..8603442161 100644 --- a/plugins/UserSettings/images/browsers/SE.gif +++ b/plugins/DevicesDetection/images/browsers/SE.gif diff --git a/plugins/UserSettings/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif Binary files differindex 4d0eef37a7..4d0eef37a7 100644 --- a/plugins/UserSettings/images/browsers/SF.gif +++ b/plugins/DevicesDetection/images/browsers/SF.gif diff --git a/plugins/UserSettings/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif Binary files differindex 734c53cc43..734c53cc43 100644 --- a/plugins/UserSettings/images/browsers/SH.gif +++ b/plugins/DevicesDetection/images/browsers/SH.gif diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif Binary files differindex 890dd6d070..890dd6d070 100644 --- a/plugins/UserSettings/images/browsers/SL.gif +++ b/plugins/DevicesDetection/images/browsers/SL.gif diff --git a/plugins/UserSettings/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif Binary files differindex 83aad8b1c6..83aad8b1c6 100644 --- a/plugins/UserSettings/images/browsers/SM.gif +++ b/plugins/DevicesDetection/images/browsers/SM.gif diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif Binary files differindex 9c67b76c85..9c67b76c85 100644 --- a/plugins/UserSettings/images/browsers/TB.gif +++ b/plugins/DevicesDetection/images/browsers/TB.gif diff --git a/plugins/UserSettings/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif Binary files differindex 220c1126e3..220c1126e3 100644 --- a/plugins/UserSettings/images/browsers/TI.gif +++ b/plugins/DevicesDetection/images/browsers/TI.gif diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif Binary files differindex ce4524f4f0..ce4524f4f0 100644 --- a/plugins/UserSettings/images/browsers/TZ.gif +++ b/plugins/DevicesDetection/images/browsers/TZ.gif diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif Binary files differindex a2129a88fe..a2129a88fe 100644 --- a/plugins/UserSettings/images/browsers/UC.gif +++ b/plugins/DevicesDetection/images/browsers/UC.gif diff --git a/plugins/UserSettings/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/browsers/UN.gif +++ b/plugins/DevicesDetection/images/browsers/UN.gif diff --git a/plugins/UserSettings/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/browsers/UNK.gif +++ b/plugins/DevicesDetection/images/browsers/UNK.gif diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif Binary files differindex 3f2df63482..3f2df63482 100644 --- a/plugins/UserSettings/images/browsers/WE.gif +++ b/plugins/DevicesDetection/images/browsers/WE.gif diff --git a/plugins/UserSettings/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif Binary files differindex 6638abccb4..6638abccb4 100644 --- a/plugins/UserSettings/images/browsers/WO.gif +++ b/plugins/DevicesDetection/images/browsers/WO.gif diff --git a/plugins/UserSettings/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif Binary files differindex 92d9d20f75..92d9d20f75 100644 --- a/plugins/UserSettings/images/browsers/WP.gif +++ b/plugins/DevicesDetection/images/browsers/WP.gif diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif Binary files differindex 106121224d..106121224d 100644 --- a/plugins/UserSettings/images/browsers/YA.gif +++ b/plugins/DevicesDetection/images/browsers/YA.gif diff --git a/plugins/UserSettings/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif Binary files differindex 39e72e68f5..39e72e68f5 100644 --- a/plugins/UserSettings/images/os/3DS.gif +++ b/plugins/DevicesDetection/images/os/3DS.gif diff --git a/plugins/UserSettings/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif Binary files differindex 1b8d966190..1b8d966190 100644 --- a/plugins/UserSettings/images/os/AIX.gif +++ b/plugins/DevicesDetection/images/os/AIX.gif diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif Binary files differindex 1b9e8a6397..1b9e8a6397 100644 --- a/plugins/UserSettings/images/os/AMG.gif +++ b/plugins/DevicesDetection/images/os/AMG.gif diff --git a/plugins/UserSettings/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif Binary files differindex 00242b215c..00242b215c 100644 --- a/plugins/UserSettings/images/os/AMI.gif +++ b/plugins/DevicesDetection/images/os/AMI.gif diff --git a/plugins/UserSettings/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif Binary files differindex bf0ade5551..bf0ade5551 100644 --- a/plugins/UserSettings/images/os/AND.gif +++ b/plugins/DevicesDetection/images/os/AND.gif diff --git a/plugins/UserSettings/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif Binary files differindex ac92b2de6b..ac92b2de6b 100644 --- a/plugins/UserSettings/images/os/ARL.gif +++ b/plugins/DevicesDetection/images/os/ARL.gif diff --git a/plugins/UserSettings/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif Binary files differindex 295e37eafa..295e37eafa 100644 --- a/plugins/UserSettings/images/os/BBX.gif +++ b/plugins/DevicesDetection/images/os/BBX.gif diff --git a/plugins/UserSettings/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif Binary files differindex e22c9437ed..e22c9437ed 100644 --- a/plugins/UserSettings/images/os/BEO.gif +++ b/plugins/DevicesDetection/images/os/BEO.gif diff --git a/plugins/UserSettings/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif Binary files differindex e8316ef586..e8316ef586 100644 --- a/plugins/UserSettings/images/os/BLB.gif +++ b/plugins/DevicesDetection/images/os/BLB.gif diff --git a/plugins/UserSettings/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif Binary files differindex daeeb84007..daeeb84007 100644 --- a/plugins/UserSettings/images/os/BSD.gif +++ b/plugins/DevicesDetection/images/os/BSD.gif diff --git a/plugins/UserSettings/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif Binary files differindex bdba9fad3f..bdba9fad3f 100644 --- a/plugins/UserSettings/images/os/BTR.gif +++ b/plugins/DevicesDetection/images/os/BTR.gif diff --git a/plugins/UserSettings/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif Binary files differindex 028958c94a..028958c94a 100644 --- a/plugins/UserSettings/images/os/CES.gif +++ b/plugins/DevicesDetection/images/os/CES.gif diff --git a/plugins/UserSettings/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif Binary files differindex 793e0fad3b..793e0fad3b 100644 --- a/plugins/UserSettings/images/os/COS.gif +++ b/plugins/DevicesDetection/images/os/COS.gif diff --git a/plugins/UserSettings/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif Binary files differindex b869c133f4..b869c133f4 100644 --- a/plugins/UserSettings/images/os/DFB.gif +++ b/plugins/DevicesDetection/images/os/DFB.gif diff --git a/plugins/UserSettings/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif Binary files differindex c4030a8f77..c4030a8f77 100644 --- a/plugins/UserSettings/images/os/DSI.gif +++ b/plugins/DevicesDetection/images/os/DSI.gif diff --git a/plugins/UserSettings/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif Binary files differindex 2e49af9d7c..2e49af9d7c 100644 --- a/plugins/UserSettings/images/os/FED.gif +++ b/plugins/DevicesDetection/images/os/FED.gif diff --git a/plugins/UserSettings/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif Binary files differindex eb024c408a..eb024c408a 100644 --- a/plugins/UserSettings/images/os/FOS.gif +++ b/plugins/DevicesDetection/images/os/FOS.gif diff --git a/plugins/UserSettings/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif Binary files differindex 47558caf9a..47558caf9a 100644 --- a/plugins/UserSettings/images/os/GNT.gif +++ b/plugins/DevicesDetection/images/os/GNT.gif diff --git a/plugins/UserSettings/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif Binary files differindex bdc4aefd88..bdc4aefd88 100644 --- a/plugins/UserSettings/images/os/GTV.gif +++ b/plugins/DevicesDetection/images/os/GTV.gif diff --git a/plugins/UserSettings/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif Binary files differindex 96ee1c01c3..96ee1c01c3 100644 --- a/plugins/UserSettings/images/os/HPX.gif +++ b/plugins/DevicesDetection/images/os/HPX.gif diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif Binary files differindex 17ef80cd53..17ef80cd53 100644 --- a/plugins/UserSettings/images/os/IOS.gif +++ b/plugins/DevicesDetection/images/os/IOS.gif diff --git a/plugins/UserSettings/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif Binary files differindex 24a37f246c..24a37f246c 100644 --- a/plugins/UserSettings/images/os/IPA.gif +++ b/plugins/DevicesDetection/images/os/IPA.gif diff --git a/plugins/UserSettings/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif Binary files differindex 117b6d2867..117b6d2867 100644 --- a/plugins/UserSettings/images/os/IPD.gif +++ b/plugins/DevicesDetection/images/os/IPD.gif diff --git a/plugins/UserSettings/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif Binary files differindex 71ff7d7592..71ff7d7592 100644 --- a/plugins/UserSettings/images/os/IPH.gif +++ b/plugins/DevicesDetection/images/os/IPH.gif diff --git a/plugins/UserSettings/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif Binary files differindex 796d547e52..796d547e52 100644 --- a/plugins/UserSettings/images/os/IRI.gif +++ b/plugins/DevicesDetection/images/os/IRI.gif diff --git a/plugins/UserSettings/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif Binary files differindex 28ba33292f..28ba33292f 100644 --- a/plugins/UserSettings/images/os/KBT.gif +++ b/plugins/DevicesDetection/images/os/KBT.gif diff --git a/plugins/UserSettings/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif Binary files differindex 3433a71a5f..3433a71a5f 100644 --- a/plugins/UserSettings/images/os/KNO.gif +++ b/plugins/DevicesDetection/images/os/KNO.gif diff --git a/plugins/UserSettings/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif Binary files differindex 47fad1402a..47fad1402a 100644 --- a/plugins/UserSettings/images/os/LBT.gif +++ b/plugins/DevicesDetection/images/os/LBT.gif diff --git a/plugins/UserSettings/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif Binary files differindex c76dfce8ff..c76dfce8ff 100644 --- a/plugins/UserSettings/images/os/LIN.gif +++ b/plugins/DevicesDetection/images/os/LIN.gif diff --git a/plugins/UserSettings/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif Binary files differindex 1ef41d5c75..1ef41d5c75 100644 --- a/plugins/UserSettings/images/os/MAC.gif +++ b/plugins/DevicesDetection/images/os/MAC.gif diff --git a/plugins/UserSettings/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif Binary files differindex 8573a0dc25..8573a0dc25 100755 --- a/plugins/UserSettings/images/os/MAE.gif +++ b/plugins/DevicesDetection/images/os/MAE.gif diff --git a/plugins/UserSettings/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif Binary files differindex b4d8d5e348..b4d8d5e348 100644 --- a/plugins/UserSettings/images/os/MDR.gif +++ b/plugins/DevicesDetection/images/os/MDR.gif diff --git a/plugins/UserSettings/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif Binary files differindex 71ce560b25..71ce560b25 100644 --- a/plugins/UserSettings/images/os/MIN.gif +++ b/plugins/DevicesDetection/images/os/MIN.gif diff --git a/plugins/UserSettings/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif Binary files differindex d282ad1a44..d282ad1a44 100644 --- a/plugins/UserSettings/images/os/NBS.gif +++ b/plugins/DevicesDetection/images/os/NBS.gif diff --git a/plugins/UserSettings/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif Binary files differindex bca132aad7..bca132aad7 100644 --- a/plugins/UserSettings/images/os/NDS.gif +++ b/plugins/DevicesDetection/images/os/NDS.gif diff --git a/plugins/UserSettings/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif Binary files differindex 993c8a4ebe..993c8a4ebe 100644 --- a/plugins/UserSettings/images/os/OBS.gif +++ b/plugins/DevicesDetection/images/os/OBS.gif diff --git a/plugins/UserSettings/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif Binary files differindex ae96a6972c..ae96a6972c 100644 --- a/plugins/UserSettings/images/os/OS2.gif +++ b/plugins/DevicesDetection/images/os/OS2.gif diff --git a/plugins/UserSettings/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif Binary files differindex f03e0d15f4..f03e0d15f4 100644 --- a/plugins/UserSettings/images/os/POS.gif +++ b/plugins/DevicesDetection/images/os/POS.gif diff --git a/plugins/UserSettings/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif Binary files differindex 20e8ef3291..20e8ef3291 100644 --- a/plugins/UserSettings/images/os/PPY.gif +++ b/plugins/DevicesDetection/images/os/PPY.gif diff --git a/plugins/UserSettings/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif Binary files differindex f087c11cb8..f087c11cb8 100644 --- a/plugins/UserSettings/images/os/PS3.gif +++ b/plugins/DevicesDetection/images/os/PS3.gif diff --git a/plugins/UserSettings/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif Binary files differindex b6003b6498..b6003b6498 100644 --- a/plugins/UserSettings/images/os/PSP.gif +++ b/plugins/DevicesDetection/images/os/PSP.gif diff --git a/plugins/UserSettings/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif Binary files differindex 65b4c23871..65b4c23871 100644 --- a/plugins/UserSettings/images/os/PSV.gif +++ b/plugins/DevicesDetection/images/os/PSV.gif diff --git a/plugins/UserSettings/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif Binary files differindex 9a2a70f5c3..9a2a70f5c3 100644 --- a/plugins/UserSettings/images/os/QNX.gif +++ b/plugins/DevicesDetection/images/os/QNX.gif diff --git a/plugins/UserSettings/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif Binary files differindex 043947cecb..043947cecb 100644 --- a/plugins/UserSettings/images/os/RHT.gif +++ b/plugins/DevicesDetection/images/os/RHT.gif diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif Binary files differindex a445b66182..a445b66182 100644 --- a/plugins/UserSettings/images/os/ROS.gif +++ b/plugins/DevicesDetection/images/os/ROS.gif diff --git a/plugins/UserSettings/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif Binary files differindex e5fe8a8f45..e5fe8a8f45 100644 --- a/plugins/UserSettings/images/os/SAF.gif +++ b/plugins/DevicesDetection/images/os/SAF.gif diff --git a/plugins/UserSettings/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif Binary files differindex 079ccc21d8..079ccc21d8 100644 --- a/plugins/UserSettings/images/os/SBA.gif +++ b/plugins/DevicesDetection/images/os/SBA.gif diff --git a/plugins/UserSettings/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif Binary files differindex cf6f2be297..cf6f2be297 100644 --- a/plugins/UserSettings/images/os/SLW.gif +++ b/plugins/DevicesDetection/images/os/SLW.gif diff --git a/plugins/UserSettings/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif Binary files differindex 34fc3248e4..34fc3248e4 100644 --- a/plugins/UserSettings/images/os/SOS.gif +++ b/plugins/DevicesDetection/images/os/SOS.gif diff --git a/plugins/UserSettings/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif Binary files differindex 3253aa2a75..3253aa2a75 100644 --- a/plugins/UserSettings/images/os/SSE.gif +++ b/plugins/DevicesDetection/images/os/SSE.gif diff --git a/plugins/UserSettings/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif Binary files differindex 27bd023afc..27bd023afc 100644 --- a/plugins/UserSettings/images/os/SYL.gif +++ b/plugins/DevicesDetection/images/os/SYL.gif diff --git a/plugins/UserSettings/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif Binary files differindex cd174dba19..cd174dba19 100644 --- a/plugins/UserSettings/images/os/SYM.gif +++ b/plugins/DevicesDetection/images/os/SYM.gif diff --git a/plugins/UserSettings/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif Binary files differindex 50b64ba9ec..50b64ba9ec 100644 --- a/plugins/UserSettings/images/os/T64.gif +++ b/plugins/DevicesDetection/images/os/T64.gif diff --git a/plugins/UserSettings/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif Binary files differindex 7563a5e31d..7563a5e31d 100644 --- a/plugins/UserSettings/images/os/TIZ.gif +++ b/plugins/DevicesDetection/images/os/TIZ.gif diff --git a/plugins/UserSettings/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif Binary files differindex c4789e0456..c4789e0456 100644 --- a/plugins/UserSettings/images/os/UBT.gif +++ b/plugins/DevicesDetection/images/os/UBT.gif diff --git a/plugins/UserSettings/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif Binary files differindex 2c44083422..2c44083422 100644 --- a/plugins/UserSettings/images/os/UNK.gif +++ b/plugins/DevicesDetection/images/os/UNK.gif diff --git a/plugins/UserSettings/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif Binary files differindex 000d08a36f..000d08a36f 100644 --- a/plugins/UserSettings/images/os/VMS.gif +++ b/plugins/DevicesDetection/images/os/VMS.gif diff --git a/plugins/UserSettings/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/W10.gif +++ b/plugins/DevicesDetection/images/os/W10.gif diff --git a/plugins/UserSettings/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W2K.gif +++ b/plugins/DevicesDetection/images/os/W2K.gif diff --git a/plugins/UserSettings/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif Binary files differindex 773c4d48d1..773c4d48d1 100644 --- a/plugins/UserSettings/images/os/W61.gif +++ b/plugins/DevicesDetection/images/os/W61.gif diff --git a/plugins/UserSettings/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif Binary files differindex 773c4d48d1..773c4d48d1 100644 --- a/plugins/UserSettings/images/os/W65.gif +++ b/plugins/DevicesDetection/images/os/W65.gif diff --git a/plugins/UserSettings/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100644 --- a/plugins/UserSettings/images/os/W75.gif +++ b/plugins/DevicesDetection/images/os/W75.gif diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/W81.gif +++ b/plugins/DevicesDetection/images/os/W81.gif diff --git a/plugins/UserSettings/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W95.gif +++ b/plugins/DevicesDetection/images/os/W95.gif diff --git a/plugins/UserSettings/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/W98.gif +++ b/plugins/DevicesDetection/images/os/W98.gif diff --git a/plugins/UserSettings/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/WCE.gif +++ b/plugins/DevicesDetection/images/os/WCE.gif diff --git a/plugins/UserSettings/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WI7.gif +++ b/plugins/DevicesDetection/images/os/WI7.gif diff --git a/plugins/UserSettings/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/WI8.gif +++ b/plugins/DevicesDetection/images/os/WI8.gif diff --git a/plugins/UserSettings/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif Binary files differindex 7957a9106a..7957a9106a 100644 --- a/plugins/UserSettings/images/os/WII.gif +++ b/plugins/DevicesDetection/images/os/WII.gif diff --git a/plugins/UserSettings/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WIN.gif +++ b/plugins/DevicesDetection/images/os/WIN.gif diff --git a/plugins/UserSettings/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif Binary files differindex 6d7e64e162..6d7e64e162 100644 --- a/plugins/UserSettings/images/os/WIU.gif +++ b/plugins/DevicesDetection/images/os/WIU.gif diff --git a/plugins/UserSettings/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif Binary files differindex 1ba0336426..1ba0336426 100644 --- a/plugins/UserSettings/images/os/WME.gif +++ b/plugins/DevicesDetection/images/os/WME.gif diff --git a/plugins/UserSettings/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif Binary files differindex 773c4d48d1..773c4d48d1 100755 --- a/plugins/UserSettings/images/os/WMO.gif +++ b/plugins/DevicesDetection/images/os/WMO.gif diff --git a/plugins/UserSettings/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif Binary files differindex db610368b9..db610368b9 100644 --- a/plugins/UserSettings/images/os/WNT.gif +++ b/plugins/DevicesDetection/images/os/WNT.gif diff --git a/plugins/UserSettings/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif Binary files differindex 2717d08226..2717d08226 100644 --- a/plugins/UserSettings/images/os/WOS.gif +++ b/plugins/DevicesDetection/images/os/WOS.gif diff --git a/plugins/UserSettings/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100644 --- a/plugins/UserSettings/images/os/WP7.gif +++ b/plugins/DevicesDetection/images/os/WP7.gif diff --git a/plugins/UserSettings/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif Binary files differindex 3ca9cebca0..3ca9cebca0 100755 --- a/plugins/UserSettings/images/os/WPH.gif +++ b/plugins/DevicesDetection/images/os/WPH.gif diff --git a/plugins/UserSettings/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif Binary files differindex 76ffe21587..76ffe21587 100644 --- a/plugins/UserSettings/images/os/WRT.gif +++ b/plugins/DevicesDetection/images/os/WRT.gif diff --git a/plugins/UserSettings/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WS3.gif +++ b/plugins/DevicesDetection/images/os/WS3.gif diff --git a/plugins/UserSettings/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WVI.gif +++ b/plugins/DevicesDetection/images/os/WVI.gif diff --git a/plugins/UserSettings/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif Binary files differindex 486f78064a..486f78064a 100644 --- a/plugins/UserSettings/images/os/WXP.gif +++ b/plugins/DevicesDetection/images/os/WXP.gif diff --git a/plugins/UserSettings/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif Binary files differindex a80d2291cc..a80d2291cc 100644 --- a/plugins/UserSettings/images/os/XBT.gif +++ b/plugins/DevicesDetection/images/os/XBT.gif diff --git a/plugins/UserSettings/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif Binary files differindex a9d567660e..a9d567660e 100644 --- a/plugins/UserSettings/images/os/XBX.gif +++ b/plugins/DevicesDetection/images/os/XBX.gif diff --git a/plugins/UserSettings/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif Binary files differindex 15f4c78e8f..15f4c78e8f 100644 --- a/plugins/UserSettings/images/os/YNS.gif +++ b/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 6140bf8214..c2ce8972b0 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -77,11 +77,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <deviceType>Desktop</deviceType> @@ -171,11 +171,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -265,11 +265,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Chrome 19.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <deviceType>Desktop</deviceType> @@ -359,11 +359,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <deviceType>Desktop</deviceType> @@ -453,11 +453,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <deviceType>Desktop</deviceType> @@ -547,11 +547,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -641,11 +641,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>webkit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browserName>Epiphany 2.30</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <deviceType>Desktop</deviceType> @@ -735,11 +735,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <deviceType>Smartphone</deviceType> @@ -829,11 +829,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 896b4d503f..d34efe28f8 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -186,11 +186,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -298,11 +298,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 6.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <deviceType>Desktop</deviceType> @@ -405,11 +405,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -526,11 +526,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -636,11 +636,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> @@ -734,11 +734,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -838,11 +838,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>ie</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browserName>Internet Explorer 9.0</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <deviceType>Desktop</deviceType> @@ -926,11 +926,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -1030,11 +1030,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Android Browser </browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <deviceType>Smartphone</deviceType> @@ -1128,11 +1128,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Mac OS</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>RockMelt 0.9</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <deviceType>Desktop</deviceType> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 8e3799fa9e..14943c61f2 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1014,12 +1014,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1137,12 +1137,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1291,12 +1291,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1414,12 +1414,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1551,12 +1551,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1688,12 +1688,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -1803,12 +1803,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1926,12 +1926,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2080,12 +2080,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2234,12 +2234,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2349,12 +2349,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2472,12 +2472,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2609,12 +2609,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2746,12 +2746,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2883,12 +2883,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3012,12 +3012,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3135,12 +3135,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3258,12 +3258,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3381,12 +3381,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -3504,12 +3504,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3658,12 +3658,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3812,12 +3812,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3966,12 +3966,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -4112,12 +4112,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -4235,12 +4235,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4358,12 +4358,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4481,12 +4481,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -4604,12 +4604,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index a45e6b00b5..afa050d312 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -148,12 +148,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -316,12 +316,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -416,12 +416,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -751,12 +751,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -851,12 +851,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -947,12 +947,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1111,12 +1111,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1207,12 +1207,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1538,12 +1538,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index a45e6b00b5..afa050d312 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -148,12 +148,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -316,12 +316,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -416,12 +416,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -751,12 +751,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -851,12 +851,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -947,12 +947,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1111,12 +1111,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1207,12 +1207,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1538,12 +1538,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 8723d1a05f..bc93ec3bb8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 80d06470a3..39e7328e8c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt 0.9</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Chrome 19.0</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Chrome 20.0</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Firefox 6.0</label> @@ -82,7 +82,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -94,7 +94,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome 11.0</label> @@ -106,7 +106,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -118,6 +118,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 8723d1a05f..bc93ec3bb8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 62d091d83d..af7e4f8f92 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Bot</label> @@ -58,7 +58,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Unknown</label> @@ -70,6 +70,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 7cad47e0a1..254ec3889b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows 7</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android 2.3</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Windows XP</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> <row> <label>Bot</label> @@ -70,7 +70,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> @@ -82,7 +82,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> @@ -94,6 +94,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 93c0819d6c..5009922ea1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -64,12 +64,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemCode>W81</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/W81.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -200,12 +200,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -311,12 +311,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -455,12 +455,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -568,12 +568,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -692,12 +692,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -823,12 +823,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -943,12 +943,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1055,12 +1055,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1222,12 +1222,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 8</operatingSystem> <operatingSystemCode>WI8</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI8.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1338,12 +1338,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1462,12 +1462,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1744,12 +1744,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1858,12 +1858,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -1973,12 +1973,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -2104,12 +2104,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2227,12 +2227,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2357,12 +2357,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2463,12 +2463,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2569,12 +2569,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -2665,12 +2665,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2771,12 +2771,12 @@ <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -2877,12 +2877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -2979,12 +2979,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -3081,12 +3081,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3183,12 +3183,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -3285,12 +3285,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3387,12 +3387,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3489,12 +3489,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -3591,12 +3591,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3693,12 +3693,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -3795,12 +3795,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -3897,12 +3897,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -3999,12 +3999,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -4101,12 +4101,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4203,12 +4203,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows 7</operatingSystem> <operatingSystemCode>WI7</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -4305,12 +4305,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -4407,12 +4407,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemCode>LIN</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4509,12 +4509,12 @@ <deviceType>Smartphone</deviceType> <operatingSystem>Android</operatingSystem> <operatingSystemCode>AND</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -4611,12 +4611,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Mac</operatingSystem> <operatingSystemCode>MAC</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 80d06470a3..39e7328e8c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt 0.9</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Chrome 19.0</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Chrome 20.0</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Firefox 6.0</label> @@ -82,7 +82,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -94,7 +94,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome 11.0</label> @@ -106,7 +106,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -118,6 +118,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 8723d1a05f..bc93ec3bb8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> @@ -22,7 +22,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 62d091d83d..af7e4f8f92 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Bot</label> @@ -58,7 +58,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Unknown</label> @@ -70,6 +70,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 7cad47e0a1..254ec3889b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Windows 7</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -34,7 +34,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Android 2.3</label> @@ -46,7 +46,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Windows XP</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> <row> <label>Bot</label> @@ -70,7 +70,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> @@ -82,7 +82,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> @@ -94,6 +94,6 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 0879f6fb5b..0d6e1866ed 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,11 +95,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -216,11 +216,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -337,11 +337,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -458,11 +458,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -610,11 +610,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -762,11 +762,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -906,11 +906,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index d252d03f5d..84b93135bd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -81,12 +81,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -233,12 +233,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -354,12 +354,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -506,12 +506,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -627,12 +627,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -779,12 +779,12 @@ <deviceType>Unknown</deviceType> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -892,12 +892,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 2975b07bcb..10c86992ca 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 759645d39d..29273fa92b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -112,12 +112,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -235,12 +235,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -389,12 +389,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -526,12 +526,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -649,12 +649,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -772,12 +772,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -885,12 +885,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 2975b07bcb..10c86992ca 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index bd23daaa04..85ba4fcaa9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -71,12 +71,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -217,12 +217,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -340,12 +340,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -477,12 +477,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -600,12 +600,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -754,12 +754,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -877,12 +877,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1014,12 +1014,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1137,12 +1137,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1291,12 +1291,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index 84860eba92..d2b191ec2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index 6f656fdf68..019893396e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index 84860eba92..d2b191ec2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index 379e429ee3..b749f9ebe4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 4e417535ae..4429d16888 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml index 6f656fdf68..019893396e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml index 84860eba92..d2b191ec2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml index 379e429ee3..b749f9ebe4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml index 4e417535ae..4429d16888 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index 968ffc7d90..da553644d5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index b8deec1d68..955f9837f9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 968ffc7d90..da553644d5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 04cebec91e..4c8451e2d8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 785661d383..d5c916aa6c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 6649f123d9..32e79a2c86 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -54,12 +54,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -240,12 +240,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml index b8deec1d68..955f9837f9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml index 968ffc7d90..da553644d5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml index 04cebec91e..4c8451e2d8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WI7.gif</logo> + <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml index 785661d383..d5c916aa6c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/os/WXP.gif</logo> + <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 9b0149ac2a..cff7c54d20 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -43,12 +43,12 @@ <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -148,12 +148,12 @@ <deviceType>Inconnu</deviceType> <operatingSystem>Bot</operatingSystem> <operatingSystemCode>BOT</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 4eb429a763..3847bac724 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -48,12 +48,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -139,12 +139,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -230,12 +230,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemCode>WVI</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WVI.gif</operatingSystemIcon> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index 68837cb7a6..ec4c9be19c 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -49,7 +49,7 @@ <metrics> <nb_visits_0> <name>Firefox (Visits)</name> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> <min>0</min> <max>1</max> </nb_visits_0> @@ -58,7 +58,7 @@ </nb_visits_1> <nb_visits_2> <name>Opera (Visits)</name> - <logo>plugins/UserSettings/images/browsers/OP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/OP.gif</logo> <min>0</min> <max>1</max> <change>-100%</change> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 17d9192ba4..e4e40d6f84 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -43,12 +43,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 8ca1417d42..37aa7952b2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -4713,7 +4713,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4738,7 +4738,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4763,7 +4763,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4831,7 +4831,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4856,7 +4856,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4881,7 +4881,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera 9.63 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5015,7 +5015,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5040,7 +5040,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5108,7 +5108,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5133,7 +5133,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 89c97c7ba3..4ff4651817 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -4543,7 +4543,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4568,7 +4568,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4593,7 +4593,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4717,7 +4717,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4742,7 +4742,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4767,7 +4767,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/OP.gif'> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> Opera 9.63 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4889,7 +4889,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4914,7 +4914,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -4976,7 +4976,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/UNK.gif'> + <img src='plugins/DevicesDetection/images/os/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -5001,7 +5001,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 346c1542db..74c05412ef 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 76d48bc7b6..5f2a28ce3e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -81,12 +81,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -290,12 +290,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 5ff6e58fba..d7897e50e1 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -157,12 +157,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -485,12 +485,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -699,12 +699,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index dd359fb284..34dfb95a22 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -6502,7 +6502,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6570,7 +6570,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6704,7 +6704,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6772,7 +6772,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index cf266ddbcc..7402ec0b43 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -6224,7 +6224,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6408,7 +6408,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6470,7 +6470,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI7.gif'> + <img src='plugins/DevicesDetection/images/os/WI7.gif'> Windows </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> @@ -6532,7 +6532,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WXP.gif'> + <img src='plugins/DevicesDetection/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index b48064a09c..cecf0df249 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -51,12 +51,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -164,12 +164,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -337,12 +337,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index b48064a09c..cecf0df249 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -51,12 +51,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -164,12 +164,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -337,12 +337,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 845a1a23a9..64217e5250 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -97,12 +97,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -211,12 +211,12 @@ <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index a968371537..4606699122 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index c58f00fa96..2925479cc4 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Android 4.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index a968371537..4606699122 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index c58f00fa96..2925479cc4 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> <label>Android 4.0</label> @@ -22,7 +22,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> <label>Others</label> @@ -34,6 +34,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file |