tweet_live: comparison web/lib/Zend/Http/UserAgent/Mobile.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Http
 * @subpackage UserAgent
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 require_once 'Zend/Http/UserAgent/AbstractDevice.php';
 * Mobile browser type matcher
 *
 * @category   Zend
 * @package    Zend_Http
 * @subpackage UserAgent
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Http_UserAgent_Mobile extends Zend_Http_UserAgent_AbstractDevice
 {
-const DEFAULT_FEATURES_ADAPTER_CLASSNAME = 'Zend_Http_UserAgent_Features_Adapter_WurflApi';
+const DEFAULT_FEATURES_ADAPTER_CLASSNAME = 'Zend_Http_UserAgent_Features_Adapter_Browscap';
-const DEFAULT_FEATURES_ADAPTER_PATH = 'Zend/Http/UserAgent/Features/Adapter/WurflApi.php';
+const DEFAULT_FEATURES_ADAPTER_PATH = 'Zend/Http/UserAgent/Features/Adapter/Browscap.php';
 /**
 * User Agent Signatures
 *
 * @var array
 */
 protected static $_uaSignatures = array(
 'iphone',
 'ipod',
 'ipad',
 'android',
 'blackberry',
 'opera mini',
 'opera mobi',
 'palm',
 'palmos',
 'elaine',
 'windows ce',
-' ppc',
+'icab',
 '_mms',
 'ahong',
 'archos',
 'armv',
 'astel',
 'avantgo',
 'benq',
 'blazer',
 'brew',
 'com2',
 'compal',
 'danger',
 'pocket',
 'docomo',
 'epoc',
 'ericsson',
 'eudoraweb',
 'hiptop',
 'htc-',
 'htc_',
 'iemobile',
-'ipad',
+'iris',
-'iris',
+'j-phone',
-'j-phone',
+'kddi',
-'kddi',
+'kindle',
-'kindle',
+'lg ',
-'lg ',
+'lg-',
-'lg-',
+'lg/',
-'lg/',
+'lg;lx',
-'lg;lx',
+'lge vx',
-'lge vx',
+'lge',
-'lge',
+'lge-',
-'lge-',
+'lge-cx',
-'lge-cx',
+'lge-lx',
-'lge-lx',
+'lge-mx',
-'lge-mx',
+'linux armv',
-'linux armv',
+'maemo',
-'maemo',
+'midp',
-'midp',
+'mini 9.5',
-'mini 9.5',
+'minimo',
-'minimo',
+'mob-x',
-'mob-x',
+'mobi',
-'mobi',
+'mobile',
-'mobile',
+'mobilephone',
-'mobilephone',
+'mot 24',
-'mot 24',
+'mot-',
-'mot-',
+'motorola',
-'motorola',
+'n410',
-'n410',
+'netfront',
-'netfront',
+'nintendo wii',
-'nintendo wii',
+'nintendo',
-'nintendo',
+'nitro',
-'nitro',
+'nokia',
-'nokia',
+'novarra-vision',
-'novarra-vision',
+'nuvifone',
-'nuvifone',
+'openweb',
-'openweb',
+'opwv',
-'opwv',
+'palmsource',
-'palmsource',
+'pdxgw',
-'pdxgw',
+'phone',
-'phone',
+'playstation',
-'playstation',
+'polaris',
-'polaris',
+'portalmmm',
-'portalmmm',
+'qt embedded',
-'qt embedded',
+'reqwirelessweb',
-'reqwirelessweb',
+'sagem',
-'sagem',
+'sam-r',
-'sam-r',
+'samsu',
-'samsu',
+'samsung',
-'samsung',
+'sec-',
-'sec-',
+'sec-sgh',
-'sec-sgh',
+'semc-browser',
-'semc-browser',
+'series60',
-'series60',
+'series70',
-'series70',
+'series80',
-'series80',
+'series90',
-'series90',
+'sharp',
-'sharp',
+'sie-m',
-'sie-m',
+'sie-s',
-'sie-s',
+'smartphone',
-'smartphone',
+'sony cmd',
-'sony cmd',
+'sonyericsson',
-'sonyericsson',
+'sprint',
-'sprint',
+'spv',
-'spv',
+'symbian os',
-'symbian os',
+'symbian',
-'symbian',
+'symbianos',
-'symbianos',
+'telco',
-'telco',
+'teleca',
-'teleca',
+'treo',
-'treo',
+'up.browser',
-'up.browser',
+'up.link',
-'up.link',
+'vodafone',
-'vodafone',
+'vodaphone',
-'vodaphone',
+'webos',
-'webos',
+'wml',
-'webpro',
+'windows phone os 7',
-'windows phone os 7',
+'wireless',
-'wireless',
+'wm5 pie',
-'wm5 pie',
+'wms pie',
-'wms pie',
 'xiino',
 'wap',
 'up/',
 'psion',
 'j2me',
 /**
 * @var array
 */
 protected static $_haTerms = array(
 'midp',
 'wml',
 'vnd.rim',
 'vnd.wap',
+'j2me',
 );
 /**
 * first 4 letters of mobile User Agent chains
 *
 * @var array
 */
 protected static $_uaBegin = array(
 'w3c ',
 'acs-',
 'alav',
 'alca',
 'amoi',
 'audi',
 'avan',
 'benq',
 'bird',
 'blac',
 'blaz',
 'brew',
 'cell',
 'cldc',
 'cmd-',
 'dang',
 'doco',
 'eric',
 'hipt',
 'inno',
 'ipaq',
 'java',
 'jigs',
 'kddi',
 'keji',
 'leno',
 'lg-c',
 'lg-d',
 'lg-g',
 'lge-',
 'maui',
 'maxo',
 'midp',
 'mits',
 'mmef',
 'mobi',
 'mot-',
 'moto',
 'mwbp',
 'nec-',
 'newt',
 'noki',
-'oper',
+'palm',
-'palm',
+'pana',
-'pana',
+'pant',
-'pant',
+'phil',
-'phil',
+'play',
-'play',
+'port',
-'port',
+'prox',
-'prox',
+'qwap',
-'qwap',
+'sage',
-'sage',
+'sams',
-'sams',
+'sany',
-'sany',
+'sch-',
-'sch-',
+'sec-',
-'sec-',
+'send',
-'send',
+'seri',
-'seri',
+'sgh-',
-'sgh-',
+'shar',
-'shar',
+'sie-',
-'sie-',
+'siem',
-'siem',
+'smal',
-'smal',
+'smar',
-'smar',
+'sony',
-'sony',
+'sph-',
-'sph-',
+'symb',
-'symb',
+'t-mo',
-'t-mo',
+'teli',
-'teli',
+'tim-',
-'tim-',
+'tosh',
-'tosh',
+'tsm-',
-'tsm-',
+'upg1',
-'upg1',
+'upsi',
-'upsi',
+'vk-v',
-'vk-v',
+'voda',
-'voda',
+'wap-',
-'wap-',
+'wapa',
-'wapa',
+'wapi',
-'wapi',
+'wapp',
-'wapp',
+'wapr',
-'wapr',
+'webc',
-'webc',
+'winw',
 'winw',
-'winw',
+'xda',
-'xda',
 'xda-',
 );
 /**
 * Comparison of the UserAgent chain and User Agent signatures
 if (strpos(strtolower(str_replace(' ', '', $server['all_http'])), 'operam') !== false) {
 // Opera Mini or Opera Mobi
 return true;
 }
 }
 if (isset($server['http_x_wap_profile']) || isset($server['http_profile'])) {
 return true;
 }
-if (self::_matchAgentAgainstSignatures($userAgent, self::$_haTerms)) {
+if (isset($server['http_accept'])) {
-return true;
+if (self::_matchAgentAgainstSignatures($server['http_accept'], self::$_haTerms)) {
+return true;
+}
 }
 if (self::userAgentStart($userAgent)) {
 return true;
 }
 return false;
 }
 /**
 * Retrieve beginning clause of user agent
 *
 * @param  string $userAgent
 * @return string
 */
 public static function userAgentStart($userAgent)
 {
 $mobile_ua = strtolower(substr($userAgent, 0, 4));
 return (in_array($mobile_ua, self::$_uaBegin));
 }
 /**
 * Constructor
 * @return string
 */
 protected function _defineFeatures()
 {
 $this->setFeature('is_wireless_device', false, 'product_info');
 parent::_defineFeatures();
 if (isset($this->_aFeatures["mobile_browser"])) {
 $this->setFeature("browser_name", $this->_aFeatures["mobile_browser"]);
 $this->_browser = $this->_aFeatures["mobile_browser"];
 }
 if (isset($this->_aFeatures["mobile_browser_version"])) {
 $this->setFeature("browser_version", $this->_aFeatures["mobile_browser_version"]);
 $this->_browserVersion = $this->_aFeatures["mobile_browser_version"];
 }
 // markup
 if ($this->getFeature('device_os') == 'iPhone OS'
 || $this->getFeature('device_os_token') == 'iPhone OS'
 ) {
 $this->setFeature('markup', 'iphone');
 } else {
 $this->setFeature('markup', $this->getMarkupLanguage($this->getFeature('preferred_markup')));
 }
 // image format
 $this->_images = array();
 if ($this->getFeature('png')) {
 $this->_images[] = 'png';
 }
 if ($this->getFeature('jpg')) {
 $this->_images[] = 'jpg';
 $this->_images[] = 'gif';
 }
 if ($this->getFeature('wbmp')) {
 $this->_images[] = 'wbmp';
 }
 return $this->_aFeatures;
 }
 /**
 * Determine markup language expected

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c