Changeset 19810

Timestamp:

2011/01/02 16:01:35 (13 years ago)

Author:

fukuda

Message:

#880(mobile/sphoneディレクトリを削除)に対応。まずmobileのみ意図通りの動作になるように一部コミット(unsupportedディレクトリ）

Location:

branches/version-2_5-dev

Files:

• data/class/helper/SC_Helper_Mobile.php (modified) (2 diffs)
• data/class/pages/unsupported/LC_Page_Unsupported.php (modified) (2 diffs)
• html/install/sql/insert_data.sql (modified) (1 diff)
• html/unsupported (moved) (moved from branches/version-2_5-dev/html/mobile/unsupported)

branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php

@@ -37 +37 @@
     /**
      * EC-CUBE がサポートする携帯端末かどうかをチェックする。
-     * 非対応端末の場合は /mobile/unsupported/ へリダイレクトする。
+     * 非対応端末の場合は /unsupported/ へリダイレクトする。
      *
      * @return void
@@ -43 +43 @@
     function lfMobileCheckCompatibility() {
         if (!SC_MobileUserAgent::isSupported()) {
-            header('Location: ' . URL_PATH . 'mobile/unsupported/' . DIR_INDEX_URL);
+            header('Location: ' . URL_PATH . 'unsupported/' . DIR_INDEX_URL);
             exit;
         }

branches/version-2_5-dev/data/class/pages/unsupported/LC_Page_Unsupported.php

@@ -44 +44 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = TEMPLATE_REALDIR . 'mobile/unsupported/index.tpl';
+        $this->tpl_title = '未対応デバイス';
     }
 
@@ -53 +53 @@
      */
     function process() {
-        $objView = new SC_MobileView();
-
-        $objView->assignobj($this);
-        $objView->display($this->tpl_mainpage);
+        parent::process();
+        $this->action();
+        $this->sendResponse();
     }
 
+    function action() {}
+    
     /**
      * デストラクタ.

branches/version-2_5-dev/html/install/sql/insert_data.sql

@@ -595 +595 @@
 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 25, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 26, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 27, '非対応デバイス', 'unsupported/index.php', NULL, NULL, 'unsupported/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 
 INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, 'クレジット', 0, NULL, 5, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);