Changeset 17140 for branches/comu-ver2/data/module/Net/UserAgent/Mobile/Common.php

Timestamp:

2008/03/12 21:08:31 (18 years ago)

Author:

adachi

Message:

merge r17127:17138 (update Net_UserAgent_Mobile)

File:

• branches/comu-ver2/data/module/Net/UserAgent/Mobile/Common.php (modified) (12 diffs)

branches/comu-ver2/data/module/Net/UserAgent/Mobile/Common.php

@@ -14 +14 @@
  * @package    Net_UserAgent_Mobile
  * @author     KUBO Atsuhiro <[email protected]>
- * @copyright  2003-2007 KUBO Atsuhiro <[email protected]>
+ * @copyright  2003-2008 KUBO Atsuhiro <[email protected]>
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    CVS: $Id$
  * @since      File available since Release 0.1
  */
+
+require_once dirname(__FILE__) . '/../Mobile.php';
 
 // {{{ Net_UserAgent_Mobile_Common
@@ -31 +33 @@
  * @package    Net_UserAgent_Mobile
  * @author     KUBO Atsuhiro <[email protected]>
- * @copyright  2003-2007 KUBO Atsuhiro <[email protected]>
+ * @copyright  2003-2008 KUBO Atsuhiro <[email protected]>
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 0.30.0
+ * @version    Release: 0.31.0
  * @since      Class available since Release 0.1
  */
@@ -49 +51 @@
      * @var string
      */
-    var $name = '';
+    var $name;
 
     /**
@@ -55 +57 @@
      * @var string
      */
-    var $version = '';
+    var $version;
 
     /**#@-*/
@@ -68 +70 @@
      */
     var $_display;
-
-    /**
-     * Net_UserAgent_Mobile_Request_XXX object
-     * @var object {@link Net_UserAgent_Mobile_Request_Env}
-     */
-    var $_request;
 
     /**
@@ -80 +76 @@
      * @var object
      **/
-    var $_error = null;
+    var $_error;
+
+    /**
+     * The User-Agent string.
+     * @var string
+     * @since Property available since Release 0.31.0
+     **/
+    var $_userAgent;
+
+    /**
+     * The model name of the user agent.
+     *
+     * @var string
+     * @since Property available since Release 0.31.0
+     */
+    var $_model;
+
+    /**
+     * The raw model name of the user agent.
+     *
+     * @var string
+     * @since Property available since Release 0.31.0
+     */
+    var $_rawModel;
 
     /**#@-*/
@@ -94 +113 @@
      * constructor
      *
-     * @param object $request a {@link Net_UserAgent_Mobile_Request_Env}
-     *     object
-     */
-    function Net_UserAgent_Mobile_Common($request)
+     * @param string $userAgent User-Agent string
+     */
+    function Net_UserAgent_Mobile_Common($userAgent)
     {
         parent::PEAR('Net_UserAgent_Mobile_Error');
-        $this->_request = $request;
-        if (Net_UserAgent_Mobile::isError($result = $this->parse())) {
+
+        $result = $this->parse($userAgent);
+        if (Net_UserAgent_Mobile::isError($result)) {
             $this->isError($result);
         }
+
+        $this->_userAgent = $userAgent;
     }
 
@@ -175 +196 @@
     function getUserAgent()
     {
-        return $this->getHeader('User-Agent');
+        return $this->_userAgent;
     }
 
@@ -189 +210 @@
     function getHeader($header)
     {
-        return $this->_request->get($header);
+        return @$_SERVER[ 'HTTP_' . str_replace('-', '_', $header) ];
     }
 
@@ -256 +277 @@
 
     /**
-     * parse HTTP_USER_AGENT string (should be implemented in subclasses)
-     *
+     * Parses HTTP_USER_AGENT string.
+     *
+     * @param string $userAgent User-Agent string
      * @abstract
      */
-    function parse()
-    {
-        die();
-    }
+    function parse($userAgent) {}
 
     // }}}
@@ -420 +439 @@
     {
         die();
+    }
+
+    // }}}
+    // {{{ isSoftBank()
+
+    /**
+     * Returns whether the agent is SoftBank or not.
+     *
+     * @return boolean
+     * @since Method available since Release 0.31.0
+     */
+    function isSoftBank()
+    {
+        return false;
+    }
+
+    // }}}
+    // {{{ isWillcom()
+
+    /**
+     * Returns whether the agent is Willcom or not.
+     *
+     * @return boolean
+     * @since Method available since Release 0.31.0
+     */
+    function isWillcom()
+    {
+        return false;
+    }
+
+    // }}}
+    // {{{ getModel()
+
+    /**
+     * Returns the model name of the user agent.
+     *
+     * @return string
+     * @since Method available since Release 0.31.0
+     */
+    function getModel()
+    {
+        if (is_null($this->_model)) {
+            return $this->_rawModel;
+        } else {
+            return $this->_model;
+        }
+    }
+
+    // }}}
+    // {{{ getRawModel()
+
+    /**
+     * Returns the raw model name of the user agent.
+     *
+     * @return string
+     * @since Method available since Release 0.31.0
+     */
+    function getRawModel()
+    {
+        return $this->_rawModel;
     }
 
@@ -445 +524 @@
  * End:
  */
-?>