From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Jun 2015 21:59:38 +0000 (+0200)
Subject: Patch from Aaron van Geffen  to add support for newer versions of OS X
X-Git-Tag: AWSTATS_7_5~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c171f2c03116b65aa11f0d37e0f7b3d5609f7b;p=thirdparty%2FAWStats.git

Patch from Aaron van Geffen  to add support for newer versions of OS X
and Window.
---

diff --git a/wwwroot/cgi-bin/lib/operating_systems.pm b/wwwroot/cgi-bin/lib/operating_systems.pm
index c8f7a553..27c3fb81 100644
--- a/wwwroot/cgi-bin/lib/operating_systems.pm
+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
@@ -35,6 +35,7 @@
 'windows[_+ ]?2008', 'windows[_+ ]nt[_+ ]6\.1', # Must be before windows_nt_6
 'windows[_+ ]?2012', 'windows[_+ ]nt[_+ ]6\.2', # Must be before windows_nt_6 = windows 8
 'windows[_+ ]nt[_+ ]6\.3', # Must be before windows_nt_6 = windows 8.1 
+'windows[_+ ]nt[_+ ]10', # Windows 10
 'windows[_+ ]?vista', 'windows[_+ ]nt[_+ ]6',
 'windows[_+ ]?2003','windows[_+ ]nt[_+ ]5\.2',	# Must be before windows_nt_5
 'windows[_+ ]xp','windows[_+ ]nt[_+ ]5\.1',		# Must be before windows_nt_5
@@ -54,6 +55,8 @@
 'ipad',
 'ipod',
 # Macintosh OS family
+'mac[_+ ]os[_+ ]x[_+ ]10[_\.]11',
+'mac[_+ ]os[_+ ]x[_+ ]10[_\.]10',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7',
@@ -148,6 +151,7 @@
 'windows[_+ ]?2008','win2008','windows[_+ ]nt[_+ ]6\.1','win7',
 'windows[_+ ]?2012','win2012','windows[_+ ]nt[_+ ]6\.2','win8',
 'windows[_+ ]nt[_+ ]6\.3','win8.1',
+'windows[_+ ]nt[_+ ]10','win10',
 'windows[_+ ]?vista','winvista','windows[_+ ]nt[_+ ]6','winvista',
 'windows[_+ ]?2003','win2003','windows[_+ ]nt[_+ ]5\.2','win2003',
 'windows[_+ ]xp','winxp','windows[_+ ]nt[_+ ]5\.1','winxp', 'syndirella', 'winxp',
@@ -170,6 +174,8 @@
 '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[_\.]11','macosx11',
+'mac[_+ ]os[_+ ]x[_+ ]10[_\.]10','macosx10',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]9','macosx9',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]8','macosx8',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]7','macosx7',
@@ -247,6 +253,7 @@
 #-----------------------------------------------------------
 %OSHashLib      = (
 # Windows family OS
+'win10','<a href="http://www.microsoft.com/windows10/" title="Windows 10 home page [new window]" target="_blank">Windows 10</a>',
 'win8.1','<a href="http://www.microsoft.com/windows8/" title="Windows 8.1 home page [new window]" target="_blank">Windows 8.1</a>',
 'win8','<a href="http://www.microsoft.com/windows8/" title="Windows 8 home page [new window]" target="_blank">Windows 8</a>',
 'win7','<a href="http://windows.microsoft.com/en-US/windows7/products/home/" title="Windows 7 home page [new window]" target="_blank">Windows 7</a>',
@@ -267,7 +274,9 @@
 'winunknown','Windows (unknown version)',
 'winxbox','<a href="http://www.xbox.com/" title="Microsoft XBOX home page [new window]" target="_blank">Microsoft XBOX</a>',
 # Macintosh OS
-'macosx9','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.9</a>',
+'macosx11','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.11 El Capitan</a>',
+'macosx10','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.10 Yosemite</a>',
+'macosx9','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.9 Mavericks</a>',
 'macosx8','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.8 Mountain Lion</a>',
 'macosx7','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.7 Lion</a>',
 'macosx6','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank">Mac OS X 10.6 Snow Leopard</a>',
@@ -354,4 +363,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
diff --git a/wwwroot/icon/os/macosx10.png b/wwwroot/icon/os/macosx10.png
new file mode 100644
index 00000000..777f3505
Binary files /dev/null and b/wwwroot/icon/os/macosx10.png differ
diff --git a/wwwroot/icon/os/macosx11.png b/wwwroot/icon/os/macosx11.png
new file mode 100644
index 00000000..777f3505
Binary files /dev/null and b/wwwroot/icon/os/macosx11.png differ
diff --git a/wwwroot/icon/os/win10.png b/wwwroot/icon/os/win10.png
new file mode 100644
index 00000000..03ba9006
Binary files /dev/null and b/wwwroot/icon/os/win10.png differ
diff --git a/wwwroot/icon/os/win80.png b/wwwroot/icon/os/win80.png
new file mode 100644
index 00000000..03ba9006
Binary files /dev/null and b/wwwroot/icon/os/win80.png differ
diff --git a/wwwroot/icon/os/win81.png b/wwwroot/icon/os/win81.png
new file mode 100644
index 00000000..03ba9006
Binary files /dev/null and b/wwwroot/icon/os/win81.png differ