diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml index 0a4d2a6669c5fecdbe8c665e88b7d54fbbe24646..9ab3bc4c1cf8309669235035413783568be90915 100644 --- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml @@ -264,6 +264,18 @@ - regex: 'IEMobile[ /](\d+\.\d+)' name: IE Mobile version: '$1' +- regex: 'MSIE.*Trident/4.0' + name: Internet Explorer + version: 8.0 +- regex: 'MSIE.*Trident/5.0' + name: Internet Explorer + version: 9.0 +- regex: 'MSIE.*Trident/6.0' + name: Internet Explorer + version: 10.0 +- regex: 'MSIE.*Trident/7.0' + name: Internet Explorer + version: 11.0 - regex: 'MSIE (\d+\.\d+).*XBLWP7' name: IE Mobile version: '$1' diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 8b5e89a8129651beb3ff71549858493195fb483f..1435ae4e38b2c930cba89f99139d1fc488cbdb43 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -11,6 +11,17 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> + <row> + <label>Internet Explorer 9.0</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + </row> <row> <label>RockMelt 0.9</label> <nb_visits>5</nb_visits> @@ -22,17 +33,6 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> - <row> - <label>Internet Explorer 10.6</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>3</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - </row> <row> <label>Chrome 19.0</label> <nb_visits>2</nb_visits> @@ -66,17 +66,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> - <row> - <label>Internet Explorer 10.0</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - </row> <row> <label>Mobile Safari 4.0</label> <nb_visits>2</nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 80c151f57ae59aa9561fe369a37e030ad38a957e..068785de87d71bc56c9a41c26779297d4aa7ac72 100755 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -12,6 +12,18 @@ <logo>plugins/UserSettings/images/browsers/EP.gif</logo> <shortLabel>Epiphany 2.30</shortLabel> </row> + <row> + <label>Internet Explorer 9.0</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <shortLabel>Internet Explorer 9.0</shortLabel> + </row> <row> <label>RockMelt 0.9</label> <nb_visits>5</nb_visits> @@ -24,18 +36,6 @@ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>RockMelt 0.9</shortLabel> </row> - <row> - <label>Internet Explorer 10.6</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>3</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 10.6</shortLabel> - </row> <row> <label>Chrome 19.0</label> <nb_visits>2</nb_visits> @@ -72,18 +72,6 @@ <logo>plugins/UserSettings/images/browsers/FF.gif</logo> <shortLabel>Firefox 6.0</shortLabel> </row> - <row> - <label>Internet Explorer 10.0</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> - <shortLabel>Internet Explorer 10.0</shortLabel> - </row> <row> <label>Mobile Safari 4.0</label> <nb_visits>2</nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 6997bcb7dbabad5cd21537af4447168397db9546..b3ff3fb0a41675c172c01af58991ed58e2b27814 100755 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -11,17 +11,6 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> - <row> - <label>RockMelt</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - </row> <row> <label>Internet Explorer</label> <nb_visits>6</nb_visits> @@ -33,6 +22,17 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> + <row> + <label>RockMelt</label> + <nb_visits>5</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + </row> <row> <label>Chrome</label> <nb_visits>5</nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml index cfbb9b7786aef26fe560d1cd10fd0fd6cb2a6c91..72b45410308eefa5d83830a26f41f62c255bd0d9 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml @@ -13,25 +13,25 @@ <shortLabel>Firefox 6.0</shortLabel> </row> <row> - <label>Chrome 3.0</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> + <label>Internet Explorer 9.0</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_actions>15</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 3.0</shortLabel> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> - <nb_uniq_visitors>10</nb_uniq_visitors> - <nb_visits>50</nb_visits> - <nb_actions>50</nb_actions> + <nb_uniq_visitors>9</nb_uniq_visitors> + <nb_visits>45</nb_visits> + <nb_actions>45</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>50</bounce_count> + <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>-1</shortLabel> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml index cfbb9b7786aef26fe560d1cd10fd0fd6cb2a6c91..72b45410308eefa5d83830a26f41f62c255bd0d9 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml @@ -13,25 +13,25 @@ <shortLabel>Firefox 6.0</shortLabel> </row> <row> - <label>Chrome 3.0</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>10</nb_visits> - <nb_actions>10</nb_actions> + <label>Internet Explorer 9.0</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>15</nb_visits> + <nb_actions>15</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>10</bounce_count> + <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 3.0</shortLabel> + <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <shortLabel>Internet Explorer 9.0</shortLabel> </row> <row> <label>Others</label> - <nb_uniq_visitors>10</nb_uniq_visitors> - <nb_visits>50</nb_visits> - <nb_actions>50</nb_actions> + <nb_uniq_visitors>9</nb_uniq_visitors> + <nb_visits>45</nb_visits> + <nb_actions>45</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>50</bounce_count> + <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>-1</shortLabel>