cvs: pear /Net_UserAgent Detect.php /Net_UserAgent/tests example.php
| From: | Jason Rust | Date: | Mon, 18 Apr 2005 18:32:51 +0000 |
| Subject: | cvs: pear /Net_UserAgent Detect.php /Net_UserAgent/tests example.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-31291@lists.php.net to get a copy of this message | ||
jrust Mon Apr 18 14:32:51 2005 EDT
Modified files:
/pear/Net_UserAgent Detect.php
/pear/Net_UserAgent/tests example.php
Log:
* Simplify hasAcceptType()
http://cvs.php.net/diff.php/pear/Net_UserAgent/Detect.php?r1=1.18&r2=1.19&ty=u
Index: pear/Net_UserAgent/Detect.php
diff -u pear/Net_UserAgent/Detect.php:1.18 pear/Net_UserAgent/Detect.php:1.19
--- pear/Net_UserAgent/Detect.php:1.18 Mon Apr 18 14:15:16 2005
+++ pear/Net_UserAgent/Detect.php Mon Apr 18 14:32:50 2005
@@ -18,7 +18,7 @@
// | Jason Rust <jrust@php.net> |
// +----------------------------------------------------------------------+
-// $Id: Detect.php,v 1.18 2005/04/18 18:15:16 jrust Exp $
+// $Id: Detect.php,v 1.19 2005/04/18 18:32:50 jrust Exp $
// }}}
// {{{ constants
@@ -881,16 +881,7 @@
*/
function hasAcceptType($in_value, $in_type)
{
- Net_UserAgent_Detect::detect();
- $type = strtolower($in_type);
-
- if ($type == 'mimetype' || $type == 'language' || $type ==
'charset' || $type == 'encoding') {
- $typeArray = &Net_UserAgent_Detect::_getStaticProperty($type);
- return !empty($typeArray[$in_value]);
- }
- else {
- return false;
- }
+ return (bool) Net_UserAgent_Detect::getAcceptType((array) $in_value, $in_type);
}
// }}}
http://cvs.php.net/diff.php/pear/Net_UserAgent/tests/example.php?r1=1.7&r2=1.8&ty=u
Index: pear/Net_UserAgent/tests/example.php
diff -u pear/Net_UserAgent/tests/example.php:1.7 pear/Net_UserAgent/tests/example.php:1.8
--- pear/Net_UserAgent/tests/example.php:1.7 Mon Apr 18 14:02:15 2005
+++ pear/Net_UserAgent/tests/example.php Mon Apr 18 14:32:50 2005
@@ -24,7 +24,7 @@
if (in_array(php_sapi_name(), array('cli', 'cgi')) &&
empty($_SERVER['REMOTE_ADDR'])) {
Net_UserAgent_Detect::setOption('re-evaluate', true);
- foreach (array('en' => 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0rc1)
Gecko/20020417',
+ foreach (array('en-us' => 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0rc1)
Gecko/20020417',
'fr' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2;
SV1; .NET CLR 1.1.4322)') as $lang => $brwsr) {
putenv("HTTP_ACCEPT_LANGUAGE=$lang");
Net_UserAgent_Detect::setOption('userAgent', $brwsr);
@@ -47,7 +47,7 @@
println('Has "popups disabled" quirk: ' .
(Net_UserAgent_Detect::hasQuirk('popups_disabled') ? 'Yes' : 'No'));
println('Has "dom" feature: ' .
(Net_UserAgent_Detect::hasFeature('dom') ? 'Yes' : 'No'));
println('Javascript version: ' .
Net_UserAgent_Detect::getFeature('javascript'));
- $languages = array('fr', 'de', 'en');
+ $languages = array('fr', 'de', 'en-us');
println('Accept Language: ' . Net_UserAgent_Detect::getAcceptType($languages,
'language'));
}
?>