Changeset 18786 for branches/version-2_5-dev/html/install/index.php

Timestamp:

2010/08/18 12:42:44 (14 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/admin/contents/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcontents%2Fsubnavi.tpl
data/class/SC_CampaignSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CampaignSession.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/column_comment.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcolumn_comment.sql
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
html/install/sql/table_comment.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Ftable_comment.sql

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100818034225-loyoujma8pjbxn2u

bzr:revno:

2269

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

data/Smarty/templates/default/admin/contents/subnavi.tpl ohkouchi@loop-az.jp-20100614082324-fsyp4ss6t8s1l9hk
data/class/SC_CampaignSession.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
html/install/index.php ohkouchi@loop-az.jp-20100804045224-nsulc26bh1ttqfrb
html/install/sql/column_comment.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
html/install/sql/create_table_mysql.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18778
html/install/sql/create_table_pgsql.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
html/install/sql/drop_table.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18777
html/install/sql/insert_data.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18783
html/install/sql/table_comment.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/comu-ver2:18235

bzr:text-revisions:

data/Smarty/templates/default/admin/contents/subnavi.tpl ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
data/class/SC_CampaignSession.php ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/index.php ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/column_comment.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/drop_table.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981
html/install/sql/table_comment.sql ohkouchi@loop-az.jp-20100818033838-mjtat0sdmbsu0981

bzr:timestamp:

2010-08-18 12:42:25.005000114 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-18T03:42:25.005000Z

Message:

非推奨機能の削除(#793)

• キャンペーン機能
• アンケート機能
• html/test 以下の不要と思われるプログラム
• 未使用テーブルの削除
  • dtb_user_regist
  • dtb_customer_mail_temp
  • dtb_mailmaga_template
  • mtb_srank

File:

• branches/version-2_5-dev/html/install/index.php (modified) (6 diffs)

branches/version-2_5-dev/html/install/index.php

@@ -131 +131 @@
     $objPage->arrErr = lfAddTable("dtb_session", $dsn);         // セッション管理テーブル
     $objPage->arrErr = lfAddTable("dtb_module", $dsn);          // モジュール管理テーブル
-    $objPage->arrErr = lfAddTable("dtb_campaign_order", $dsn);  // キャンペーン受注テーブル
     $objPage->arrErr = lfAddTable("dtb_mobile_kara_mail", $dsn);    // 空メール管理テーブル
     $objPage->arrErr = lfAddTable("dtb_mobile_ext_session_id", $dsn);   // セッションID管理テーブル
@@ -226 +225 @@
     lfDropTable("dtb_module", $dsn);
     lfDropTable("dtb_session", $dsn);
-    lfDropTable("dtb_campaign_order", $dsn);
     lfDropTable("dtb_mobile_ext_session_id", $dsn);
     lfDropTable("dtb_mobile_kara_mail", $dsn);
@@ -898 +896 @@
     $objDb->sfColumnExists("dtb_order", "memo09", "text", $dsn, true);
     $objDb->sfColumnExists("dtb_order", "memo10", "text", $dsn, true);
-    $objDb->sfColumnExists("dtb_order", "campaign_id", "int4", $dsn, true);
 
     // 受注一時テーブル
@@ -930 +927 @@
     $objDb->sfColumnExists("dtb_payment", "memo10", "text", $dsn, true);
 
-    // キャンペーンテーブル
-    $objDb->sfColumnExists("dtb_campaign", "directory_name", "text NOT NULL", $dsn, true);
-    $objDb->sfColumnExists("dtb_campaign", "limit_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
-    $objDb->sfColumnExists("dtb_campaign", "total_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
-    $objDb->sfColumnExists("dtb_campaign", "orverlapping_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
-    $objDb->sfColumnExists("dtb_campaign", "cart_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
-    $objDb->sfColumnExists("dtb_campaign", "deliv_free_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
-
     // 顧客
     $objDb->sfColumnExists("dtb_customer", "mailmaga_flg", "int2", $dsn, true);
@@ -946 +935 @@
         $objDb->sfIndexExists("dtb_customer", "mobile_phone_id", "dtb_customer_mobile_phone_id_key", 64, $dsn, true);
     }
-
-    // 顧客メール
-    if ($objDBParam->getValue('db_type') == 'mysql') {
-        $objDb->sfColumnExists("dtb_customer_mail", "secret_key", "varchar(50) unique", $dsn, true);
-    } else {
-        $objDb->sfColumnExists("dtb_customer_mail", "secret_key", "text unique", $dsn, true);
-    }
-}
 
 // データの追加（既にデータが存在する場合は作成しない）
@@ -962 +943 @@
         lfInsertCSVData(1,'category_id','カテゴリID',53,'now()','now()', $dsn);
         lfInsertCSVData(4,'order_id','注文番号',1,'now()','now()', $dsn);
-        lfInsertCSVData(4,'campaign_id','キャンペーンID',2,'now()','now()', $dsn);
         lfInsertCSVData(4,'customer_id','顧客ID',3,'now()','now()', $dsn);
         lfInsertCSVData(4,'message','要望等',4,'now()','now()', $dsn);