Changeset 19823 for branches/version-2_5-dev/data

Timestamp:

2011/01/04 22:10:23 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19822

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Display.php 18986@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2FSC_Display.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110104130612-y5ey6gojq1xmiqo0

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110104131017-gzt42owwlks4rfiw

bzr:revno:

2552

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Display.php ohkouchi@loop-az.jp-20110104130612-y5ey6gojq1xmiqo0

bzr:timestamp:

2011-01-04 22:10:17.061000109 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-04T13:10:17.061000Z

Message:

#787(スマートフォン対応)

• SC_Display::autoSet は使用してなさげなので削除
• SC_Display::detectDevice() を static 参照できるよう修正

File:

• branches/version-2_5-dev/data/class/SC_Display.php (modified) (4 diffs)

branches/version-2_5-dev/data/class/SC_Display.php

@@ -34 +34 @@
     var $device;
 
-    var $autoSet;
-
     /** SC_View インスタンス */
     var $view;
@@ -49 +47 @@
      */
 
-    function SC_Display($hasPrevURL = true, $autoGenerateHttpHeaders = true) {
+    function SC_Display($hasPrevURL = true) {
         $this->response = new SC_Response_Ex();
-        $this->autoSet = $autoGenerateHttpHeaders;
         if ($hasPrevURL) {
             $this->setPrevURL();
@@ -139 +136 @@
     /**
      * 機種を判別する。
+     *
      * SC_Display::MOBILE = ガラケー = 1
      * SC_Display::SMARTPHONE = スマホ = 2
      * SC_Display::PC = PC = 10
-     * ※PHP4の為にconstは使っていません。 1がガラケーで、2がスマホで4がPCです。
-     * @return
+     *
+     * @static
+     * @return integer 端末種別ID
      */
     function detectDevice(){
@@ -149 +148 @@
         $su = new SC_SmartphoneUserAgent();
         $retDevice = 0;
-        if($nu->isMobile()){
-            $retDevice = DEVICE_TYPE_MOBILE;
-        }elseif ($su->isSmartphone()){
-            $retDevice = DEVICE_TYPE_SMARTPHONE;
-        }else{
-            $retDevice = DEVICE_TYPE_PC;
+        if ($nu->isMobile()) {
+            return DEVICE_TYPE_MOBILE;
+        } elseif ($su->isSmartphone()) {
+            return DEVICE_TYPE_SMARTPHONE;
+        } else {
+            return DEVICE_TYPE_PC;
         }
-
-        if($this->autoSet){
-            $this->setDevice($retDevice);
-        }
-        return $retDevice;
     }