cvs: pear /Net_UserAgent Detect.php

jrust Mon Apr 18 13:16:22 2005 EDT Modified files: /pear/Net_UserAgent Detect.php Log: * Adding support for aol8 * Removing a bunch of needless parentheses (should be slight speed improvement)

http://cvs.php.net/diff.php/pear/Net_UserAgent/Detect.php?r1=1.15&r2=1.16&ty=u Index: pear/Net_UserAgent/Detect.php diff -u pear/Net_UserAgent/Detect.php:1.15 pear/Net_UserAgent/Detect.php:1.16 --- pear/Net_UserAgent/Detect.php:1.15 Mon Apr 18 13:02:24 2005 +++ pear/Net_UserAgent/Detect.php Mon Apr 18 13:16:20 2005 @@ -18,7 +18,7 @@ // | Jason Rust <jrust@php.net> | // +----------------------------------------------------------------------+ -// $Id: Detect.php,v 1.15 2005/04/18 17:02:24 jrust Exp $ +// $Id: Detect.php,v 1.16 2005/04/18 17:16:20 jrust Exp $ // }}} // {{{ constants @@ -122,12 +122,12 @@ // Array that stores all of the flags for the vendor and version // of the different browsers $browser = &Net_UserAgent_Detect::_getStaticProperty('browser'); - $browser = array_flip(array('ns', 'ns2', 'ns3', 'ns4', 'ns4up', 'nav', 'ns6', 'ns6up', 'gecko', 'ie', 'ie3', 'ie4', 'ie4up', 'ie5', 'ie5_5', 'ie5up', 'ie6', 'ie6up', 'opera', 'opera2', 'opera3', 'opera4', 'opera5', 'opera5up', 'aol', 'aol3', 'aol4', 'aol5', 'aol6', 'aol7', 'webtv', 'aoltv', 'tvnavigator', 'hotjava', 'hotjava3', 'hotjava3up', 'konq', 'safari', 'netgem', 'webdav')); + $browser = array_flip(array('ns', 'ns2', 'ns3', 'ns4', 'ns4up', 'nav', 'ns6', 'ns6up', 'firefox', 'firefox0.x', 'firefox1.x', 'gecko', 'ie', 'ie3', 'ie4', 'ie4up', 'ie5', 'ie5_5', 'ie5up', 'ie6', 'ie6up', 'opera', 'opera2', 'opera3', 'opera4', 'opera5', 'opera6', 'opera7', 'opera5up', 'opera6up', 'opera7up', 'aol', 'aol3', 'aol4', 'aol5', 'aol6', 'aol7', 'aol8', 'webtv', 'aoltv', 'tvnavigator', 'hotjava', 'hotjava3', 'hotjava3up', 'konq', 'safari', 'netgem', 'webdav')); // Array that stores all of the flags for the operating systems, // and in some cases the versions of those operating systems (windows) $os = &Net_UserAgent_Detect::_getStaticProperty('os'); - $os = array_flip(array('win', 'win95', 'win16', 'win31', 'win9x', 'win98', 'winme', 'win2k', 'winxp', 'winnt', 'os2', 'mac', 'mac68k', 'macppc', 'linux', 'unix', 'vms', 'sun', 'sun4', 'sun5', 'suni86', 'irix', 'irix5', 'irix6', 'hpux', 'hpux9', 'hpux10', 'aix', 'aix1', 'aix2', 'aix3', 'aix4', 'sco', 'unixware', 'mpras', 'reliant', 'dec', 'sinix', 'freebsd', 'bsd')); + $os = array_flip(array('win', 'win95', 'win16', 'win31', 'win9x', 'win98', 'winme', 'win2k', 'winxp', 'winnt', 'win2003', 'os2', 'mac', 'mac68k', 'macppc', 'linux', 'unix', 'vms', 'sun', 'sun4', 'sun5', 'suni86', 'irix', 'irix5', 'irix6', 'hpux', 'hpux9', 'hpux10', 'aix', 'aix1', 'aix2', 'aix3', 'aix4', 'sco', 'unixware', 'mpras', 'reliant', 'dec', 'sinix', 'freebsd', 'bsd')); // Array which stores known issues with the given client that can // be used for on the fly tweaking so that the client may recieve @@ -227,9 +227,9 @@ if ($detectFlags[NET_USERAGENT_DETECT_ALL] || $detectFlags[NET_USERAGENT_DETECT_BROWSER]) { $browser['webdav'] = ($agt == 'microsoft data access internet publishing provider dav' || $agt == 'microsoft data access internet publishing provider protocol discovery'); $browser['konq'] = $browser['safari'] = (strpos($agt, 'konqueror') !== false || strpos($agt, 'safari') !== false); - $browser['text'] = (strpos($agt, 'links') !== false) || (strpos($agt, 'lynx') !== false) || (strpos($agt, 'w3m') !== false); - $browser['ns'] = (strpos($agt, 'mozilla') !== false) && !(strpos($agt, 'spoofer') !== false) && !(strpos($agt, 'compatible') !== false) && !(strpos($agt, 'hotjava') !== false) && !(strpos($agt, 'opera') !== false) && !(strpos($agt, 'webtv') !== false) ? 1 : 0; - $browser['netgem'] = (strpos($agt, 'netgem') !== false); + $browser['text'] = strpos($agt, 'links') !== false || strpos($agt, 'lynx') !== false || strpos($agt, 'w3m') !== false; + $browser['ns'] = strpos($agt, 'mozilla') !== false && !(strpos($agt, 'spoofer') !== false) && !(strpos($agt, 'compatible') !== false) && !(strpos($agt, 'hotjava') !== false) && !(strpos($agt, 'opera') !== false) && !(strpos($agt, 'webtv') !== false) ? 1 : 0; + $browser['netgem'] = strpos($agt, 'netgem') !== false; $browser['ns2'] = $browser['ns'] && $majorVersion == 2; $browser['ns3'] = $browser['ns'] && $majorVersion == 3; $browser['ns4'] = $browser['ns'] && $majorVersion == 4; @@ -238,11 +238,11 @@ $browser['nav'] = $browser['ns'] && $majorVersion < 5; $browser['ns6'] = !$browser['konq'] && $browser['ns'] && $majorVersion == 5; $browser['ns6up'] = $browser['ns6'] && $majorVersion >= 5; - $browser['gecko'] = (strpos($agt, 'gecko') !== false && !$browser['konq']); + $browser['gecko'] = strpos($agt, 'gecko') !== false && !$browser['konq']; $browser['firefox'] = $browser['gecko'] && strpos($agt, 'firefox') !== false; $browser['firefox0.x'] = $browser['firefox'] && strpos($agt, 'firefox/0.') !== false; $browser['firefox1.x'] = $browser['firefox'] && strpos($agt, 'firefox/1.') !== false; - $browser['ie'] = (strpos($agt, 'msie') !== false) && !(strpos($agt, 'opera') !== false); + $browser['ie'] = strpos($agt, 'msie') !== false && !(strpos($agt, 'opera') !== false); $browser['ie3'] = $browser['ie'] && $majorVersion < 4; $browser['ie4'] = $browser['ie'] && $majorVersion == 4 && (strpos($agt, 'msie 4') !== false); $browser['ie4up'] = $browser['ie'] && !$browser['ie3']; @@ -250,28 +250,29 @@ $browser['ie5_5'] = $browser['ie4up'] && (strpos($agt, 'msie 5.5') !== false); $browser['ie5up'] = $browser['ie4up'] && !$browser['ie3'] && !$browser['ie4']; $browser['ie5_5up'] = $browser['ie5up'] && !$browser['ie5']; - $browser['ie6'] = (strpos($agt, 'msie 6') !== false); + $browser['ie6'] = strpos($agt, 'msie 6') !== false; $browser['ie6up'] = $browser['ie5up'] && !$browser['ie5'] && !$browser['ie5_5']; - $browser['opera'] = (strpos($agt, 'opera') !== false); - $browser['opera2'] = (strpos($agt, 'opera 2') !== false) || (strpos($agt, 'opera/2') !== false); - $browser['opera3'] = (strpos($agt, 'opera 3') !== false) || (strpos($agt, 'opera/3') !== false); - $browser['opera4'] = (strpos($agt, 'opera 4') !== false) || (strpos($agt, 'opera/4') !== false); - $browser['opera5'] = (strpos($agt, 'opera 5') !== false) || (strpos($agt, 'opera/5') !== false); - $browser['opera6'] = (strpos($agt, 'opera 6') !== false) || (strpos($agt, 'opera/6') !== false); - $browser['opera7'] = (strpos($agt, 'opera 7') !== false) || (strpos($agt, 'opera/7') !== false); + $browser['opera'] = strpos($agt, 'opera') !== false; + $browser['opera2'] = strpos($agt, 'opera 2') !== false || strpos($agt, 'opera/2') !== false; + $browser['opera3'] = strpos($agt, 'opera 3') !== false || strpos($agt, 'opera/3') !== false; + $browser['opera4'] = strpos($agt, 'opera 4') !== false || strpos($agt, 'opera/4') !== false; + $browser['opera5'] = strpos($agt, 'opera 5') !== false || strpos($agt, 'opera/5') !== false; + $browser['opera6'] = strpos($agt, 'opera 6') !== false || strpos($agt, 'opera/6') !== false; + $browser['opera7'] = strpos($agt, 'opera 7') !== false || strpos($agt, 'opera/7') !== false; $browser['opera5up'] = $browser['opera'] && !$browser['opera2'] && !$browser['opera3'] && !$browser['opera4']; $browser['opera6up'] = $browser['opera'] && !$browser['opera2'] && !$browser['opera3'] && !$browser['opera4'] && !$browser['opera5']; $browser['opera7up'] = $browser['opera'] && !$browser['opera2'] && !$browser['opera3'] && !$browser['opera4'] && !$browser['opera5'] && !$browser['opera6']; - $browser['aol'] = (strpos($agt, 'aol') !== false); + $browser['aol'] = strpos($agt, 'aol') !== false; $browser['aol3'] = $browser['aol'] && $browser['ie3']; $browser['aol4'] = $browser['aol'] && $browser['ie4']; - $browser['aol5'] = (strpos($agt, 'aol 5') !== false); - $browser['aol6'] = (strpos($agt, 'aol 6') !== false); - $browser['aol7'] = (strpos($agt, 'aol 7') !== false); - $browser['webtv'] = (strpos($agt, 'webtv') !== false); - $browser['aoltv'] = $browser['tvnavigator'] = (strpos($agt, 'navio') !== false) || (strpos($agt, 'navio_aoltv') !== false); - $browser['hotjava'] = (strpos($agt, 'hotjava') !== false); + $browser['aol5'] = strpos($agt, 'aol 5') !== false; + $browser['aol6'] = strpos($agt, 'aol 6') !== false; + $browser['aol7'] = strpos($agt, 'aol 7') !== false || strpos($agt, 'aol7') !== false; + $browser['aol8'] = strpos($agt, 'aol 8') !== false || strpos($agt, 'aol8') !== false; + $browser['webtv'] = strpos($agt, 'webtv') !== false; + $browser['aoltv'] = $browser['tvnavigator'] = strpos($agt, 'navio') !== false || strpos($agt, 'navio_aoltv') !== false; + $browser['hotjava'] = strpos($agt, 'hotjava') !== false; $browser['hotjava3'] = $browser['hotjava'] && $majorVersion == 3; $browser['hotjava3up'] = $browser['hotjava'] && $majorVersion >= 3; } @@ -305,48 +306,48 @@ /** OS Check **/ if ($detectFlags[NET_USERAGENT_DETECT_ALL] || $detectFlags[NET_USERAGENT_DETECT_OS]) { - $os['win'] = (strpos($agt, 'win') !== false) || (strpos($agt, '16bit') !== false); - $os['win95'] = (strpos($agt, 'win95') !== false) || (strpos($agt, 'windows 95') !== false); - $os['win16'] = (strpos($agt, 'win16') !== false) || (strpos($agt, '16bit') !== false) || (strpos($agt, 'windows 3.1') !== false) || (strpos($agt, 'windows 16-bit') !== false); - $os['win31'] = (strpos($agt, 'windows 3.1') !== false) || (strpos($agt, 'win16') !== false) || (strpos($agt, 'windows 16-bit') !== false); - $os['winme'] = (strpos($agt, 'win 9x 4.90') !== false); - $os['win2k'] = (strpos($agt, 'windows nt 5.0') !== false); - $os['winxp'] = (strpos($agt, 'windows nt 5.1') !== false); - $os['win2003'] = (strpos($agt, 'windows nt 5.2') !== false); - $os['win98'] = (strpos($agt, 'win98') !== false) || (strpos($agt, 'windows 98') !== false); + $os['win'] = strpos($agt, 'win') !== false || strpos($agt, '16bit') !== false; + $os['win95'] = strpos($agt, 'win95') !== false || strpos($agt, 'windows 95') !== false; + $os['win16'] = strpos($agt, 'win16') !== false || strpos($agt, '16bit') !== false || strpos($agt, 'windows 3.1') !== false || strpos($agt, 'windows 16-bit') !== false; + $os['win31'] = strpos($agt, 'windows 3.1') !== false || strpos($agt, 'win16') !== false || strpos($agt, 'windows 16-bit') !== false; + $os['winme'] = strpos($agt, 'win 9x 4.90') !== false; + $os['win2k'] = strpos($agt, 'windows nt 5.0') !== false; + $os['winxp'] = strpos($agt, 'windows nt 5.1') !== false; + $os['win2003'] = strpos($agt, 'windows nt 5.2') !== false; + $os['win98'] = strpos($agt, 'win98') !== false || strpos($agt, 'windows 98') !== false; $os['win9x'] = $os['win95'] || $os['win98']; - $os['winnt'] = ((strpos($agt, 'winnt') !== false) || (strpos($agt, 'windows nt') !== false)) && (strpos($agt, 'windows nt 5') === false); - $os['win32'] = $os['win95'] || $os['winnt'] || $os['win98'] || $majorVersion >= 4 && (strpos($agt, 'win32') !== false) || (strpos($agt, '32bit') !== false); - $os['os2'] = (strpos($agt, 'os/2') !== false) || (strpos($agt, 'ibm-webexplorer') !== false); - $os['mac'] = (strpos($agt, 'mac') !== false); - $os['mac68k'] = $os['mac'] && ((strpos($agt, '68k') !== false) || (strpos($agt, '68000') !== false)); - $os['macppc'] = $os['mac'] && ((strpos($agt, 'ppc') !== false) || (strpos($agt, 'powerpc') !== false)); - $os['sun'] = (strpos($agt, 'sunos') !== false); - $os['sun4'] = (strpos($agt, 'sunos 4') !== false); - $os['sun5'] = (strpos($agt, 'sunos 5') !== false); - $os['suni86'] = $os['sun'] && (strpos($agt, 'i86') !== false); - $os['irix'] = (strpos($agt, 'irix') !== false); - $os['irix5'] = (strpos($agt, 'irix 5') !== false); - $os['irix6'] = (strpos($agt, 'irix 6') !== false) || (strpos($agt, 'irix6') !== false); - $os['hpux'] = (strpos($agt, 'hp-ux') !== false); - $os['hpux9'] = $os['hpux'] && (strpos($agt, '09.') !== false); - $os['hpux10'] = $os['hpux'] && (strpos($agt, '10.') !== false); - $os['aix'] = (strpos($agt, 'aix') !== false); - $os['aix1'] = (strpos($agt, 'aix 1') !== false); - $os['aix2'] = (strpos($agt, 'aix 2') !== false); - $os['aix3'] = (strpos($agt, 'aix 3') !== false); - $os['aix4'] = (strpos($agt, 'aix 4') !== false); - $os['linux'] = (strpos($agt, 'inux') !== false); - $os['sco'] = (strpos($agt, 'sco') !== false) || (strpos($agt, 'unix_sv') !== false); - $os['unixware'] = (strpos($agt, 'unix_system_v') !== false); - $os['mpras'] = (strpos($agt, 'ncr') !== false); - $os['reliant'] = (strpos($agt, 'reliant') !== false); - $os['dec'] = (strpos($agt, 'dec') !== false) || (strpos($agt, 'osf1') !== false) || (strpos($agt, 'dec_alpha') !== false) || (strpos($agt, 'alphaserver') !== false) || (strpos($agt, 'ultrix') !== false) || (strpos($agt, 'alphastation') !== false); - $os['sinix'] = (strpos($agt, 'sinix') !== false); - $os['freebsd'] = (strpos($agt, 'freebsd') !== false); - $os['bsd'] = (strpos($agt, 'bsd') !== false); - $os['unix'] = (strpos($agt, 'x11') !== false) || (strpos($agt, 'unix') !== false) || $os['sun'] || $os['irix'] || $os['hpux'] || $os['sco'] || $os['unixware'] || $os['mpras'] || $os['reliant'] || $os['dec'] || $os['sinix'] || $os['aix'] || $os['linux'] || $os['bsd'] || $os['freebsd']; - $os['vms'] = (strpos($agt, 'vax') !== false) || (strpos($agt, 'openvms') !== false); + $os['winnt'] = (strpos($agt, 'winnt') !== false || strpos($agt, 'windows nt') !== false) && strpos($agt, 'windows nt 5') === false; + $os['win32'] = $os['win95'] || $os['winnt'] || $os['win98'] || $majorVersion >= 4 && strpos($agt, 'win32') !== false || strpos($agt, '32bit') !== false; + $os['os2'] = strpos($agt, 'os/2') !== false || strpos($agt, 'ibm-webexplorer') !== false; + $os['mac'] = strpos($agt, 'mac') !== false; + $os['mac68k'] = $os['mac'] && (strpos($agt, '68k') !== false || strpos($agt, '68000') !== false); + $os['macppc'] = $os['mac'] && (strpos($agt, 'ppc') !== false || strpos($agt, 'powerpc') !== false); + $os['sun'] = strpos($agt, 'sunos') !== false; + $os['sun4'] = strpos($agt, 'sunos 4') !== false; + $os['sun5'] = strpos($agt, 'sunos 5') !== false; + $os['suni86'] = $os['sun'] && strpos($agt, 'i86') !== false; + $os['irix'] = strpos($agt, 'irix') !== false; + $os['irix5'] = strpos($agt, 'irix 5') !== false; + $os['irix6'] = strpos($agt, 'irix 6') !== false || strpos($agt, 'irix6') !== false; + $os['hpux'] = strpos($agt, 'hp-ux') !== false; + $os['hpux9'] = $os['hpux'] && strpos($agt, '09.') !== false; + $os['hpux10'] = $os['hpux'] && strpos($agt, '10.') !== false; + $os['aix'] = strpos($agt, 'aix') !== false; + $os['aix1'] = strpos($agt, 'aix 1') !== false; + $os['aix2'] = strpos($agt, 'aix 2') !== false; + $os['aix3'] = strpos($agt, 'aix 3') !== false; + $os['aix4'] = strpos($agt, 'aix 4') !== false; + $os['linux'] = strpos($agt, 'inux') !== false; + $os['sco'] = strpos($agt, 'sco') !== false || strpos($agt, 'unix_sv') !== false; + $os['unixware'] = strpos($agt, 'unix_system_v') !== false; + $os['mpras'] = strpos($agt, 'ncr') !== false; + $os['reliant'] = strpos($agt, 'reliant') !== false; + $os['dec'] = strpos($agt, 'dec') !== false || strpos($agt, 'osf1') !== false || strpos($agt, 'dec_alpha') !== false || strpos($agt, 'alphaserver') !== false || strpos($agt, 'ultrix') !== false || strpos($agt, 'alphastation') !== false; + $os['sinix'] = strpos($agt, 'sinix') !== false; + $os['freebsd'] = strpos($agt, 'freebsd') !== false; + $os['bsd'] = strpos($agt, 'bsd') !== false; + $os['unix'] = strpos($agt, 'x11') !== false || strpos($agt, 'unix') !== false || $os['sun'] || $os['irix'] || $os['hpux'] || $os['sco'] || $os['unixware'] || $os['mpras'] || $os['reliant'] || $os['dec'] || $os['sinix'] || $os['aix'] || $os['linux'] || $os['bsd'] || $os['freebsd']; + $os['vms'] = strpos($agt, 'vax') !== false || strpos($agt, 'openvms') !== false; } // Setup the quirks