From: eldy <>
Date: Sat, 24 Aug 2013 16:10:33 +0000 (+0000)
Subject: New: #877 Windows 8 + iOS Support in AWStats
X-Git-Tag: AWSTATS_7_3~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c27a0b0f77da6f21bfcbda26bbf47df4a8e2aad6;p=thirdparty%2FAWStats.git
New: #877 Windows 8 + iOS Support in AWStats
---
diff --git a/wwwroot/cgi-bin/lib/operating_systems.pm b/wwwroot/cgi-bin/lib/operating_systems.pm
index b97f122c..f3bbb898 100644
--- a/wwwroot/cgi-bin/lib/operating_systems.pm
+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
@@ -11,12 +11,15 @@
# Included documentation link to Distribution home pages.
# - added links for each operating systems.
+# 2013-01-08 Joe CC Ho - added iOS, Windows 8 and Windows Phone.
+
#package AWSOS;
# Relocated from main file for easier editing
%OSFamily = (
'win' => 'Windows',
'mac' => 'Macintosh',
+ 'ios' => 'iOS',
'linux' => 'Linux',
'bsd' => 'BSD'
);
@@ -37,11 +40,19 @@
'windows[_+ ]xp','windows[_+ ]nt[_+ ]5\.1', # Must be before windows_nt_5
'windows[_+ ]me','win[_+ ]9x', # Must be before windows_98
'windows[_+ ]?2000','windows[_+ ]nt[_+ ]5',
+'windows[_+ ]phone',
'winnt','windows[_+ \-]?nt','win32',
'win(.*)98',
'win(.*)95',
'win(.*)16','windows[_+ ]3', # This works for windows_31 and windows_3.1
'win(.*)ce',
+# iOS family
+#'iphone[_+ ]os', #Must be Before Mac OS Family
+#'ipad[_+ ]os', #Must be Before Mac OS Family
+#'ipod[_+ ]os', #Must be Before Mac OS Family
+'iphone',
+'ipad',
+'ipod',
# Macintosh OS family
'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9',
'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8',
@@ -106,7 +117,6 @@
'cp/m',
'crayos',
'dreamcast',
-'iphone[_+ ]os',
'risc[_+ ]?os',
'symbian',
'webtv',
@@ -143,6 +153,7 @@
'windows[_+ ]me','winme','win[_+ ]9x','winme',
'windows[_+ ]?2000','win2000','windows[_+ ]nt[_+ ]5','win2000',
'winnt','winnt','windows[_+ \-]?nt','winnt','win32','winnt',
+'windows[_+ ]phone','winphone',
'win(.*)98','win98',
'win(.*)95','win95',
'win(.*)16','win16','windows[_+ ]3','win16',
@@ -150,6 +161,13 @@
'microsoft','winunknown',
'msie[_+ ]','winunknown',
'ms[_+ ]frontpage','winunknown',
+# iOS family
+#'iphone[_+ ]os','ios_iphone', #Must be Before Mac OS Family
+#'ipad[_+ ]os','ios_ipad', #Must be Before Mac OS Family
+#'ipod[_+ ]os','ios_ipod', #Must be Before Mac OS Family
+'iphone','ios_iphone', #Must be Before Mac OS Family
+'ipad','ios_ipad', #Must be Before Mac OS Family
+'ipod','ios_ipod', #Must be Before Mac OS Family
# Macintosh OS family
'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9','macosx9',
'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8','macosx8',
@@ -214,7 +232,6 @@
'cp/m','cp/m',
'crayos','crayos',
'dreamcast','dreamcast',
-'iphone[_+ ]os','ios',
'risc[_+ ]?os','riscos',
'symbian','symbian',
'webtv','webtv',
@@ -229,7 +246,7 @@
#-----------------------------------------------------------
%OSHashLib = (
# Windows family OS
-'win8','Windows 8',
+'win8','Windows 8',
'win7','Windows 7',
'winlong','Windows Vista (LongHorn)',
'win2008','Windows 2008',
@@ -244,6 +261,7 @@
'win95','Windows 95',
'win16','Windows 3.xx',
'wince','Windows Mobile',
+'winphone','Windows Phone',
'winunknown','Windows (unknown version)',
'winxbox','Microsoft XBOX',
# Macintosh OS
@@ -293,6 +311,10 @@
'osf','OSF Unix',
'hp\-ux','HP UX',
'unix','Unknown Unix system',
+# iOS
+'ios_iphone','iOS (iPhone)',
+'ios_ipad','iOS (iPad)',
+'ios_ipod','iOS (iPod)',
# Other famous OS
'beos','BeOS',
'os/2','OS/2',
@@ -311,7 +333,6 @@
'cp/m','CP/M',
'crayos','CrayOS',
'dreamcast','Dreamcast',
-'ios','iOS (iPhone/iPod/iPad/...)',
'riscos','RISC OS',
'symbian','Symbian OS',
'webtv','WebTV',
@@ -331,4 +352,4 @@
# OEM Service Release 2.5 4.03.1214* (4.00.950C) 8/24/96-11/18/97
# Windows 98 retail, OEM 4.10.1998 5/11/98
# Windows 98 Second Edition 4.10.2222A 4/23/99
-# Windows Me 4.90.3000
+# Windows Me 4.90.3000
\ No newline at end of file