cvs: pear /Net_UserAgent/tests example.php

jrust Mon Apr 18 13:01:27 2005 EDT Modified files: /pear/Net_UserAgent/tests example.php Log: * Added better support for detecting if we are running from the cli http://cvs.php.net/diff.php/pear/Net_UserAgent/tests/example.php?r1=1.5&r2=1.6&ty=u Index: pear/Net_UserAgent/tests/example.php diff -u pear/Net_UserAgent/tests/example.php:1.5 pear/Net_UserAgent/tests/example.php:1.6 --- pear/Net_UserAgent/tests/example.php:1.5 Thu Mar 11 11:46:45 2004 +++ pear/Net_UserAgent/tests/example.php Mon Apr 18 13:01:25 2005 @@ -8,11 +8,11 @@ static $linefeed; if (!isset($linefeed)) { - if (($sapi = php_sapi_name()) == 'apache' || $sapi == 'cgi') { - $linefeed = '<br />'; + if (in_array(php_sapi_name(), array('cli', 'cgi')) && empty($_SERVER['REMOTE_ADDR'])) { + $linefeed = "\n"; } else { - $linefeed = "\n"; + $linefeed = '<br />'; } } @@ -22,12 +22,12 @@ // }}} -$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr;'; -$browserSearch = array('ie6up', 'ie5', 'ie4', 'gecko', 'ns6up', 'ns4', 'nav', 'safari'); -if (($sapi = php_sapi_name()) != 'apache' && $sapi != 'cgi') { +if (in_array(php_sapi_name(), array('cli', 'cgi')) && empty($_SERVER['REMOTE_ADDR'])) { + $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr;'; Net_UserAgent_Detect::setOption('userAgent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0rc1) Gecko/20020417'); } +$browserSearch = array('ie6up', 'ie5', 'ie4', 'gecko', 'ns6up', 'ns4', 'nav', 'safari'); println('User Agent String: ' . Net_UserAgent_Detect::getUserAgent()); println('Browser String: ' . Net_UserAgent_Detect::getBrowserString()); println('OS String: ' . Net_UserAgent_Detect::getOSString());