refs #20 - added detection for microsoft outlook

matomo-org · Jun 26, 2014 · 2a5f44c · 2a5f44c
1 parent 146d214
commit 2a5f44c
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 100 deletions.
diff --git a/Tests/Parser/Client/fixtures/pim.yml b/Tests/Parser/Client/fixtures/pim.yml
@@ -4,6 +4,12 @@
     type: pim
     name: Outlook Express
     version: 7.0
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Win64; x64; Trident/7.0; .NET CLR 2.0.50727; SLCC2; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; InfoPath.3; .NET CLR 1.1.4322; FDM; Tablet PC 2.0; .NET4.0E; Microsoft Outlook 14.0.7113; ms-office; MSOffice 14)
+  client:
+    type: pim
+    name: Microsoft Outlook
+    version: 14.0.7113
 -
   user_agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130330 Thunderbird/17.0.5
   client:

diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml
@@ -425,7 +425,7 @@
   os_family: Unix
   browser_family: Unknown
 - 
-  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.7) Gecko/2009031915 Gentoo Firefox/3.0.7
+  user_agent: Mozilla/5.0 (X11; U; Gentoo x86_64; de-DE) Firefox/26.0
   os:
     name: Gentoo
     short_name: GNT
@@ -434,15 +434,15 @@
     type: browser
     name: Firefox
     short_name: FF
-    version: 3.0.7
+    version: 26.0
   device:
     type: desktop
     brand:
     model:
   os_family: GNU/Linux
   browser_family: Firefox
 - 
-  user_agent: Mozilla/5.0 (X11; U; Gentoo x86_64; de-DE) Firefox/26.0
+  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.7) Gecko/2009031915 Gentoo Firefox/3.0.7
   os:
     name: Gentoo
     short_name: GNT
@@ -451,7 +451,7 @@
     type: browser
     name: Firefox
     short_name: FF
-    version: 26.0
+    version: 3.0.7
   device:
     type: desktop
     brand:
@@ -1428,11 +1428,11 @@
   os_family: Unix
   browser_family: Unknown
 - 
-  user_agent: Mozilla/3.01Gold (X11; I; SunOS 5.5.1 sun4m)
+  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100215 Solaris/10.1 (GNU) Superswan/3.5.8 (Byte/me)
   os:
     name: Solaris
     short_name: SOS
-    version: 5.5.1
+    version: 10.1
   client:
     type: UNK
     name: UNK
@@ -1445,11 +1445,11 @@
   os_family: Unix
   browser_family: Unknown
 - 
-  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100215 Solaris/10.1 (GNU) Superswan/3.5.8 (Byte/me)
+  user_agent: Mozilla/3.01Gold (X11; I; SunOS 5.5.1 sun4m)
   os:
     name: Solaris
     short_name: SOS
-    version: 10.1
+    version: 5.5.1
   client:
     type: UNK
     name: UNK
@@ -2073,6 +2073,40 @@
     model:
   os_family: Windows
   browser_family: Unknown
+- 
+  user_agent: Microsoft Office/14.0 (Windows NT 6.1; Microsoft Outlook 14.0.6106; Pro; ms-office; MSOffice 14)
+  os:
+    name: Windows 7
+    short_name: WI7
+    version: 7
+  client:
+    type: pim
+    name: Microsoft Outlook
+    short_name: UNK
+    version: 14.0.6106
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Windows
+  browser_family: Unknown
+- 
+  user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Win64; x64; Trident/7.0; .NET CLR 2.0.50727; SLCC2; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; InfoPath.3; .NET CLR 1.1.4322; FDM; Tablet PC 2.0; .NET4.0E; Microsoft Outlook 14.0.7113; ms-office; MSOffice 14)
+  os:
+    name: Windows 7
+    short_name: WI7
+    version: 7
+  client:
+    type: pim
+    name: Microsoft Outlook
+    short_name: UNK
+    version: 14.0.7113
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Windows
+  browser_family: Unknown
 - 
   user_agent: Opera/9.80 (Windows NT 6.1; WOW64) Presto/2.12.388 Version/12.16
   os:
@@ -2516,7 +2550,7 @@
   os_family: Windows
   browser_family: Unknown
 - 
-  user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.9.1.6) Gecko/20091201 (WEB.DE/1.5) Firefox/3.5.6 (.NET CLR 3.5.30729)
+  user_agent: Mozilla/5.0 (Windows NT 6.0; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0
   os:
     name: Windows Vista
     short_name: WVI
@@ -2525,15 +2559,15 @@
     type: browser
     name: Firefox
     short_name: FF
-    version: 3.5.6
+    version: 18.0
   device:
     type: desktop
     brand:
     model:
   os_family: Windows
   browser_family: Firefox
 - 
-  user_agent: Mozilla/5.0 (Windows NT 6.0; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0
+  user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.9.1.6) Gecko/20091201 (WEB.DE/1.5) Firefox/3.5.6 (.NET CLR 3.5.30729)
   os:
     name: Windows Vista
     short_name: WVI
@@ -2542,7 +2576,7 @@
     type: browser
     name: Firefox
     short_name: FF
-    version: 18.0
+    version: 3.5.6
   device:
     type: desktop
     brand: