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

Timestamp:

2010/12/03 12:29:57 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2435

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-12-03 12:29:53.193000078 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-03T03:29:53.193000Z

Message:

• #628(未使用処理・定義などの削除)
  • dtb_order テーブルの loan_result, credit_result, credit_msg, conveni_data, cell01, cell02, cell03 を削除
• #627(ソース整形・ソースコメントの改善)
  • mtb_constants.rank の項番修正
• #792(ダウンロード販売機能)
  • dtb_order.payment_date を datetime に変更
• #787(スマートフォン対応)
  • mtb_device_type 追加
  • 端末種別の定数を追加
• #859(モバイル・PCどちらからの注文か受注データで識別できるようにする)
  • dtb_order.device_type_id, dtb_order_temp.device_type_id を追加

File:

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

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

@@ -45 +45 @@
      * const('MOBILE',1);
      * const('SMARTPHONE',2);
-     * const('PC',4);
-     * const('ADMIN',8);
+     * const('PC',10);
+     * const('ADMIN',99);
      */
 
@@ -72 +72 @@
     function prepare($page, $is_admin = false){
         if(!$this->deviceSeted || !is_null($this->view)){
-            $device = ($is_admin) ? 8 : $this->detectDevice();
+            $device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice();
             $this->setDevice($device);
         }
@@ -112 +112 @@
      * Enter description here ...
      */
-    function setDevice($device=4){
+    function setDevice($device = DEVICE_TYPE_PC){
 
         switch ($device){
-            case 1:
+            case DEVICE_TYPE_MOBILE:
                 $this->response->setContentType("text/html");
                 $this->setView(new SC_MobileView());
                 break;
-            case 2:
+            case DEVICE_TYPE_SMARTPHONE:
                 $this->setView(new SC_SmartphoneView());
                 break;
-            case 4:
+            case DEVICE_TYPE_PC:
                 $this->setView(new SC_SiteView());
                 break;
-            case 8:
+            case DEVICE_TYPE_ADMIN:
                 $this->setView(new SC_AdminView());
         }
@@ -142 +142 @@
      * SC_Display::MOBILE = ガラケー = 1
      * SC_Display::SMARTPHONE = スマホ = 2
-     * SC_Display::PC = PC = 4
+     * SC_Display::PC = PC = 10
      * ※PHP4の為にconstは使っていません。 1がガラケーで、2がスマホで4がPCです。
      * @return
@@ -151 +151 @@
         $retDevice = 0;
         if($nu->isMobile()){
-            $retDevice = 1;
+            $retDevice = DEVICE_TYPE_MOBILE;
         }elseif ($su->isSmartphone()){
-            $retDevice = 2;
+            $retDevice = DEVICE_TYPE_SMARTPHONE;
         }else{
-            $retDevice = 4;
+            $retDevice = DEVICE_TYPE_PC;
         }