mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4882 - add Windows 7 to operating system list

Browse Source
This commit is contained in:
e107steved
2010-01-09 10:12:51 +00:00
parent a0f6693d82
commit 04b97e3e3b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_plugins/log/loginfo.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/log/loginfo.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/log/loginfo.php,v $
| $Revision: 1.4 $ | $Revision: 1.5 $
| $Date: 2009-11-18 01:05:47 $ | $Date: 2010-01-09 10:12:49 $
| $Author: e107coders $ | $Author: e107steved $
| |
| File locking added | File locking added
| |
@@ -224,6 +224,7 @@ function getBrowser($agent) {
function getOs($agent) { function getOs($agent) {
$os = array( $os = array(
"windows7" => array('name' => 'Windows 7', 'rule' => 'wi(n|ndows)[ \-]?nt[ /]?6\.1'),
"windowsvista" => array('name' => 'Windows Vista', 'rule' => 'wi(n|ndows)[ \-]?nt[ /]?6\.0'), "windowsvista" => array('name' => 'Windows Vista', 'rule' => 'wi(n|ndows)[ \-]?nt[ /]?6\.0'),
"windows2003" => array('name' => 'Windows 2003', 'rule' => 'wi(n|ndows)[ \-]?(2003|nt[ /]?5\.2)'), "windows2003" => array('name' => 'Windows 2003', 'rule' => 'wi(n|ndows)[ \-]?(2003|nt[ /]?5\.2)'),
"windowsxp" => array('name' => 'Windows XP', 'rule' => 'Windows XP'), "windowsxp" => array('name' => 'Windows XP', 'rule' => 'Windows XP'),
@@ -257,11 +258,16 @@ function getOs($agent) {
"palm" => array('name' => 'PalmOS', 'rule' => 'Palm[ \-]?(Source|OS)[ /]?([0-9.]{1,10})'), "palm" => array('name' => 'PalmOS', 'rule' => 'Palm[ \-]?(Source|OS)[ /]?([0-9.]{1,10})'),
"palm2" => array('name' => 'PalmOS', 'rule' => 'Palm[ \-]?(Source|OS)') "palm2" => array('name' => 'PalmOS', 'rule' => 'Palm[ \-]?(Source|OS)')
); );
foreach($os as $key => $info) { foreach($os as $key => $info)
if (preg_match("#".$info['rule']."#i", $agent, $results)) { {
if(strstr($key, "win")) { if (preg_match("#".$info['rule']."#i", $agent, $results))
{
if(strstr($key, "win"))
{
return ($info['name']); return ($info['name']);
} else { }
else
{
return ($info['name']." ".$results[1]); return ($info['name']." ".$results[1]);
} }
} }