Merge remote-tracking branch 'origin/master'

6 files changed, 410 insertions, 28 deletions

diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
index ceb938a095..636efb82ea 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
@@ -220,6 +220,7 @@ class UserAgentParserEnhanced
         'Presto'               => 'PRS',
         'Puppy'                => 'PPY',
         'Red Hat'              => 'RHT',
+        'RISC OS'              => 'ROS',
         'SUSE'                 => 'SSE',
         'Sailfish OS'          => 'SAF',
         'Slackware'            => 'SLW',
@@ -273,6 +274,7 @@ class UserAgentParserEnhanced
         'Google TV'             => array('GTV'),
         'IBM'                   => array('OS2'),
         'iOS'                   => array('IOS'),
+        'RISC OS'               => array('ROS'),
         'Linux'                 => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
         'Mac'                   => array('MAC'),
         'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'),
@@ -374,6 +376,7 @@ class UserAgentParserEnhanced
         'OM' => 'Opera Mobile',
         'OP' => 'Opera',
         'ON' => 'Opera Next',
+        'OR' => 'Oregano',
         'OV' => 'Openwave Mobile Browser',
         'OW' => 'OmniWeb',
         'PL' => 'Palm Blazer',
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
index 86dcbb8d4e..068eddee67 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml
@@ -364,6 +364,11 @@
   name: 'Sleipnir'
   version: '$1'
 
+#Lunascape
+- regex: 'Lunascape(?:[/ ](\d+\.\d+))?'
+  name: 'Lunascape'
+  version: '$1'
+
 #Internet Explorer
 - regex: 'IEMobile[ /](\d+\.\d+)'
   name: 'IE Mobile'
@@ -420,11 +425,6 @@
   name: 'Links'
   version: '$1'
 
-#Lunascape
-- regex: 'Lunascape(?:/(\d+\.\d+))?'
-  name: 'Lunascape'
-  version: '$1'
-
 #Openwave Mobile Browser
 - regex: 'UP.Browser(?:/(\d+\.\d+))?'
   name: 'Openwave Mobile Browser'
@@ -485,7 +485,12 @@
 - regex: 'Obigo|Teleca'
   name: 'Obigo'
   version: ''
-  
+
+#Oregano
+- regex: 'Oregano(?:[ /](\d+\.\d+))?'
+  name: 'Oregano'
+  version: '$1'
+
 #Polaris
 - regex: '(?:Polaris|Embider)(?:/(\d+\.\d+))?'
   name: 'Polaris'
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
index 346eae7ce4..2a4615a05a 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
@@ -323,8 +323,14 @@
 - regex: '(?:Mobile|Tablet);.+Firefox/\d+\.\d+'
   name: 'Firefox OS'
   version: ''
-  
-  
+
+
+##########
+# RISC OS
+##########
+- regex: 'RISC OS(?:-NC)?(?:[ /](\d+\.\d+))?'
+  name: 'RISC OS'
+  version: '$1'
   
 ##########
 # Bada
@@ -379,49 +385,49 @@
   version: '$1'
   
   
-- regex: 'AIX'
+- regex: 'AIX(?:[/ ]?(\d+\.\d+))?'
   name: 'AIX'
-  version: ''
+  version: '$1'
   
   
-- regex: 'HP-UX'
+- regex: 'HP-UX(?:[/ ]?(\d+\.\d+))?'
   name: 'HP-UX'
-  version: ''
+  version: '$1'
   
   
-- regex: 'FreeBSD'
+- regex: 'FreeBSD(?:[/ ]?(\d+\.\d+))?'
   name: 'FreeBSD'
-  version: ''
+  version: '$1'
   
   
-- regex: 'NetBSD'
+- regex: 'NetBSD(?:[/ ]?(\d+\.\d+))?'
   name: 'NetBSD'
-  version: ''
+  version: '$1'
   
   
-- regex: 'OpenBSD'
+- regex: 'OpenBSD(?:[/ ]?(\d+\.\d+))?'
   name: 'OpenBSD'
-  version: ''
+  version: '$1'
   
   
-- regex: 'DragonFly'
+- regex: 'DragonFly(?:[/ ]?(\d+\.\d+))?'
   name: 'DragonFly'
-  version: ''
+  version: '$1'
   
   
-- regex: 'Syllable'
+- regex: 'Syllable(?:[/ ]?(\d+\.\d+))?'
   name: 'Syllable'
-  version: ''
+  version: '$1'
   
   
-- regex: 'IRIX(?: (\d+\.\d+))'
+- regex: 'IRIX(?:[/ ]?(\d+\.\d+))'
   name: 'IRIX'
   version: '$1'
   
   
-- regex: 'OSF1'
+- regex: 'OSF1(?:[/ ]?v?(\d+\.\d+))?'
   name: 'OSF1'
-  version: ''
+  version: '$1'
   
   
   
diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/UserSettings/images/browsers/OR.gif
new file mode 100644
index 0000000000..5b18e64798
--- /dev/null
+++ b/plugins/UserSettings/images/browsers/OR.gif
diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/UserSettings/images/os/ROS.gif
new file mode 100644
index 0000000000..a445b66182
--- /dev/null
+++ b/plugins/UserSettings/images/os/ROS.gif
diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
index 99abee8617..9cf363e7ad 100644
--- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
+++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
@@ -15939,7 +15939,7 @@
   os:
     name: OSF1
     short_name: T64
-    version:
+    version: 5.1
   browser:
     name: UNK
     short_name: UNK
@@ -17328,7 +17328,7 @@
   os_family: Android
   browser_family: Opera
 -
-  user_agent: Mozilla/5.0 (X11; U; Linux x86_64; fa-ir) AppleWebKit/534.35 (KHTML, like Gecko)  Chrome/11.0.696.65 Safari/534.35 Puffin/2.10977AP
+  user_agent: 'Mozilla/5.0 (X11; U; Linux x86_64; fa-ir) AppleWebKit/534.35 (KHTML, like Gecko)  Chrome/11.0.696.65 Safari/534.35 Puffin/2.10977AP'
   os:
     name: Linux
     short_name: LIN
@@ -17342,4 +17342,372 @@
     brand: 
     model: 
   os_family: Linux
-  browser_family: 
\ No newline at end of file
+  browser_family: Unknown
+-
+  user_agent: 'Mozilla/5.0 (Linux; U; Android 4.0.4; fa-ir) AppleWebKit/534.35 (KHTML, like Gecko)  Chrome/11.0.696.65 Safari/534.35 Puffin/2.10990AP Mobile'
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0
+  browser:
+    name: Puffin
+    short_name: PU
+    version: 2.10990
+  device:
+    type: 
+    brand: 
+    model: 
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla 5.0 (Linux; U; Android 2.3.5; zh-cn; ZTE U793 Build MocorDroid2.3.5) UC AppleWebKit 534.31 (KHTML, like Gecko) Mobile Safari 534.31
+  os:
+    name: Android
+    short_name: AND
+    version: 2.3
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: ZT
+    model: U793
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla 5.0 (Linux; U; Android 2.3.6; zh-cn; ZTE U790 Build GRK39F) UC AppleWebKit 534.31 (KHTML, like Gecko) Mobile Safari 534.31
+  os:
+    name: Android
+    short_name: AND
+    version: 2.3
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: ZT
+    model: U790
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla 5.0 (Linux; U; Android 4.1.2; en-us; HUAWEI G610-C00 Build HuaweiG610-C00) UC AppleWebKit 534.31 (KHTML, like Gecko) Mobile Safari 534.31
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: HU
+    model: G610
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla 5.0 (Linux; U; Android 4.1.2; zh-cn; SCH-I829 Build JZO54K) UC AppleWebKit 534.31 (KHTML, like Gecko) Mobile Safari 534.31
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: SA
+    model: SCH-I829
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: 'Mozilla/1.10 [en] (Compatible; RISC OS 3.70; Oregano 1.10)'
+  os:
+    name: RISC OS
+    short_name: ROS
+    version: 3.70
+  browser:
+    name: Oregano
+    short_name: OR
+    version: 1.10
+  device:
+    type: 
+    brand: 
+    model: 
+  os_family: RISC OS
+  browser_family: Unknown
+-
+  user_agent: Mozilla/2.0 (compatible; MSIE 3.02; Update a; AOL 3.0; Windows 95)
+  os:
+    name: Windows 95
+    short_name: W95
+    version: 95
+  browser:
+    name: Internet Explorer
+    short_name: IE
+    version: 3.02
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Windows
+  browser_family: Internet Explorer
+-
+  user_agent: Mozilla/2.02Gold (Win95; I)
+  os:
+    name: Windows 95
+    short_name: W95
+    version: 95
+  browser:
+    name: UNK
+    short_name: UNK
+    version: UNK
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Windows
+  browser_family: Unknown
+-
+  user_agent: Mozilla/3.0 (WorldGate Gazelle 3.5.1 build 11; FreeBSD2.2.8-STABLE)
+  os:
+    name: FreeBSD
+    short_name: BSD
+    version: 2.2
+  browser:
+    name: UNK
+    short_name: UNK
+    version: UNK
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Unix
+  browser_family: Unknown
+-
+  user_agent: Mozilla/3.0 (X11; I; OSF1 V4.0 alpha)
+  os:
+    name: OSF1
+    short_name: T64
+    version: 4.0
+  browser:
+    name: UNK
+    short_name: UNK
+    version: UNK
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Unix
+  browser_family: Unknown
+-
+  user_agent: Mozilla/3.01Gold (X11; I; SunOS 5.5.1 sun4m)
+  os:
+    name: Solaris
+    short_name: SOS
+    version: 5.5
+  browser:
+    name: UNK
+    short_name: UNK
+    version: UNK
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Unix
+  browser_family: Unknown
+-
+  user_agent: Mozilla/3.04 (compatible; NCBrowser/2.35; ANTFresco/2.17; RISC OS-NC 5.13 Laz1UK1309)
+  os:
+    name: RISC OS
+    short_name: ROS
+    version: 5.13
+  browser:
+    name: UNK
+    short_name: UNK
+    version: UNK
+  device:
+    type:
+    brand:
+    model:
+  os_family: RISC OS
+  browser_family: Unknown
+-
+  user_agent: 'Mozilla/4.0 (compatible: MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; WpsLondonTest; SAMSUNG; SGH-i917)'
+  os:
+    name: Windows Phone
+    short_name: WPH
+    version: 7.0
+  browser:
+    name: IE Mobile
+    short_name: IM
+    version: 7.0
+  device:
+    type: smartphone
+    brand: SA
+    model: SGH-i917
+  os_family: Windows Mobile
+  browser_family: Internet Explorer
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 4.01; Digital AlphaServer 1000A 4/233; Windows NT; Powered By 64-Bit Alpha Processor)
+  os:
+    name: Windows NT
+    short_name: WNT
+    version: NT
+  browser:
+    name: Internet Explorer
+    short_name: IE
+    version: 4.01
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Windows
+  browser_family: Internet Explorer
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 4.01; Mac_PowerPC)
+  os:
+    name: Mac
+    short_name: MAC
+    version:
+  browser:
+    name: Internet Explorer
+    short_name: IE
+    version: 4.01
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Mac
+  browser_family: Internet Explorer
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 4.01; Windows NT Windows CE)
+  os:
+    name: Windows CE
+    short_name: WCE
+    version:
+  browser:
+    name: Internet Explorer
+    short_name: IE
+    version: 4.01
+  device:
+    type:
+    brand:
+    model:
+  os_family: Windows Mobile
+  browser_family: Internet Explorer
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 5.0; SunOS 5.10 sun4u; X11)
+  os:
+    name: Solaris
+    short_name: SOS
+    version: 5.10
+  browser:
+    name: Internet Explorer
+    short_name: IE
+    version: 5.0
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Unix
+  browser_family: Internet Explorer
+-
+  user_agent: 'Mozilla/4.0 (compatible; MSIE 5.0; Windows 2000) Opera 6.0 [en]'
+  os:
+    name: Windows 2000
+    short_name: W2K
+    version: 2000
+  browser:
+    name: Opera
+    short_name: OP
+    version: 6.0
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Windows
+  browser_family: Opera
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/Palm-D050; Blazer/4.3) 16;320x320
+  os:
+    name: palmOS
+    short_name: POS
+    version:
+  browser:
+    name: Palm Blazer
+    short_name: PL
+    version: 4.3
+  device:
+    type: smartphone
+    brand: PM
+    model: D050
+  os_family: Other Mobile
+  browser_family: Unknown
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; .NET CLR 1.1.4322; Lunascape 2.1.3)
+  os:
+    name: Windows 2000
+    short_name: W2K
+    version: 2000
+  browser:
+    name: Lunascape
+    short_name: LS
+    version: 2.1
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Windows
+  browser_family: Unknown
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 8.00
+  os:
+    name: Windows XP
+    short_name: WXP
+    version: XP
+  browser:
+    name: Opera
+    short_name: OP
+    version: 8.00
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Windows
+  browser_family: Opera
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; chromeframe/32.0.1700.76; .NET CLR 2.0.50727)
+  os:
+    name: Windows XP
+    short_name: WXP
+    version: XP
+  browser:
+    name: Chrome Frame
+    short_name: CF
+    version: 32.0
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Windows
+  browser_family: Chrome
+-
+  user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; Maxthon/3.0)
+  os:
+    name: Windows XP
+    short_name: WXP
+    version: XP
+  browser:
+    name: Maxthon
+    short_name: MX
+    version: 3.0
+  device:
+    type: desktop
+    brand: 
+    model: 
+  os_family: Windows
+  browser_family: Unknown
\ No newline at end of file